Bug 1689992: part 0) Factor nsClipboard::IsImageType out. r=masayuki

Differential Revision: https://phabricator.services.mozilla.com/D105277
dothq · Feb 19, 2021 · 373e080 · 373e080
1 parent 2d8d6ed
commit 373e080
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/widget/cocoa/nsClipboard.h b/widget/cocoa/nsClipboard.h
@@ -34,6 +34,7 @@ class nsClipboard : public nsIClipboard {
   static NSDictionary* PasteboardDictFromTransferable(nsITransferable* aTransferable);
   // aPasteboardType is being retained and needs to be released by the caller.
   static bool IsStringType(const nsCString& aMIMEType, NSString** aPasteboardType);
+  static bool IsImageType(const nsACString& aMIMEType);
   static NSString* WrapHtmlForSystemPasteboard(NSString* aString);
   static nsresult TransferableFromPasteboard(nsITransferable* aTransferable, NSPasteboard* pboard);
 

diff --git a/widget/cocoa/nsClipboard.mm b/widget/cocoa/nsClipboard.mm
@@ -505,9 +505,7 @@ + (NSString*)stringFromPboardType:(NSString*)aType {
         }
         [pasteboardOutputDict setObject:nativeData forKey:customType];
       }
-    } else if (flavorStr.EqualsLiteral(kPNGImageMime) || flavorStr.EqualsLiteral(kJPEGImageMime) ||
-               flavorStr.EqualsLiteral(kJPGImageMime) || flavorStr.EqualsLiteral(kGIFImageMime) ||
-               flavorStr.EqualsLiteral(kNativeImageMime)) {
+    } else if (nsClipboard::IsImageType(flavorStr)) {
       nsCOMPtr<nsISupports> transferSupports;
       rv = aTransferable->GetTransferData(flavorStr.get(), getter_AddRefs(transferSupports));
       if (NS_FAILED(rv)) {
@@ -656,6 +654,13 @@ + (NSString*)stringFromPboardType:(NSString*)aType {
   }
 }
 
+// static
+bool nsClipboard::IsImageType(const nsACString& aMIMEType) {
+  return aMIMEType.EqualsLiteral(kPNGImageMime) || aMIMEType.EqualsLiteral(kJPEGImageMime) ||
+         aMIMEType.EqualsLiteral(kJPGImageMime) || aMIMEType.EqualsLiteral(kGIFImageMime) ||
+         aMIMEType.EqualsLiteral(kNativeImageMime);
+}
+
 NSString* nsClipboard::WrapHtmlForSystemPasteboard(NSString* aString) {
   NSString* wrapped = [NSString
       stringWithFormat:@"<html>"