Bug 33955: When copying an image only copy the image contents to the clipboard

browser/base/content/browser-context.inc

@@ -219,7 +219,7 @@
 #ifdef CONTEXT_COPY_IMAGE_CONTENTS
       <menuitem id="context-copyimage-contents"
                 data-l10n-id="main-context-menu-image-copy"
-                oncommand="goDoCommand('cmd_copyImage');"/>
+                oncommand="goDoCommand('cmd_copyImageContents');"/>
 #endif
       <menuitem id="context-copyimage"
                 data-l10n-id="main-context-menu-image-copy-link"

dom/base/nsCopySupport.cpp

@@ -501,7 +501,7 @@ nsresult nsCopySupport::ImageCopy(nsIImageLoadingContent* aImageElement,
       trans->SetReferrerInfo(referrerInfo);
     }
 
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(BASE_BROWSER_VERSION)
     rv = AppendImagePromise(trans, imgRequest, aImageElement);
     NS_ENSURE_SUCCESS(rv, rv);
 #endif