Changeset 49946 in webkit

Timestamp:

Oct 22, 2009 10:48:45 AM (14 years ago)

Author:

atwilson@chromium.org

Message:

Fixes Chromium Mac pasteboard handling to flow through the same code paths as other platforms.

Patch by Avi Drissman <​avi@chromium.org> on 2009-10-22
Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=30591

• platform/chromium/ChromiumBridge.h:
• platform/chromium/PasteboardChromium.cpp:

(WebCore::Pasteboard::writeImage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ChromiumBridge.h (modified) (2 diffs)
• platform/chromium/PasteboardChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-22  Avi Drissman  <avi@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Fixes Chromium Mac pasteboard handling to flow through the same code paths as other platforms.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30591
+
+        * platform/chromium/ChromiumBridge.h:
+        * platform/chromium/PasteboardChromium.cpp:
+        (WebCore::Pasteboard::writeImage):
+
 2009-10-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/platform/chromium/ChromiumBridge.h

@@ -33 +33 @@
 
 #include "FileSystem.h"
+#include "ImageSource.h"
 #include "LinkHash.h"
 #include "PassRefPtr.h"
 #include "PasteboardPrivate.h"
-
-class NativeImageSkia;
 
 typedef struct NPObject NPObject;
@@ -79 +78 @@
         static void clipboardWritePlainText(const String&);
         static void clipboardWriteURL(const KURL&, const String&);
-        static void clipboardWriteImage(const NativeImageSkia*, const KURL&, const String&);
+        static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
 
         // Cookies ------------------------------------------------------------

trunk/WebCore/platform/chromium/PasteboardChromium.cpp

@@ -148 +148 @@
     KURL url = urlString.isEmpty() ? KURL() : node->document()->completeURL(deprecatedParseURL(urlString));
 
-    NativeImageSkia* bitmap = 0;
-#if !PLATFORM(CG)
-    bitmap = image->nativeImageForCurrentFrame();
-#endif
+    NativeImagePtr bitmap = image->nativeImageForCurrentFrame();
     ChromiumBridge::clipboardWriteImage(bitmap, url, title);
 }