Title: [93343] trunk/Source/WebCore
Revision
93343
Author
carycl...@google.com
Date
2011-08-18 13:22:52 -0700 (Thu, 18 Aug 2011)

Log Message

Fix rubber band gutter drawing for Skia on Chromium Mac
https://bugs.webkit.org/show_bug.cgi?id=66478

Reviewed by James Robinson.

No new tests. The Skia on Chromium Mac platform has
not been enabled.

This break was detected at compile time; there is no
behavior change.

* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::ScrollbarThemeChromiumMac::ScrollbarThemeChromiumMac):
Convert the CGImage into an SkBitmap if Skia is present.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (93342 => 93343)


--- trunk/Source/WebCore/ChangeLog	2011-08-18 20:22:47 UTC (rev 93342)
+++ trunk/Source/WebCore/ChangeLog	2011-08-18 20:22:52 UTC (rev 93343)
@@ -1,3 +1,20 @@
+2011-08-18  Cary Clark  <carycl...@google.com>
+
+        Fix rubber band gutter drawing for Skia on Chromium Mac
+        https://bugs.webkit.org/show_bug.cgi?id=66478
+
+        Reviewed by James Robinson.
+
+        No new tests. The Skia on Chromium Mac platform has
+        not been enabled.
+
+        This break was detected at compile time; there is no
+        behavior change.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::ScrollbarThemeChromiumMac):
+        Convert the CGImage into an SkBitmap if Skia is present.
+
 2011-08-18  Julien Chaffraix  <jchaffr...@webkit.org>
 
         Implement a faster path for painting tables with overflowing cells

Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm (93342 => 93343)


--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm	2011-08-18 20:22:47 UTC (rev 93342)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm	2011-08-18 20:22:52 UTC (rev 93343)
@@ -42,6 +42,7 @@
 #include <wtf/UnusedParam.h>
 
 #if USE(SKIA)
+#include "BitmapImageSingleFrameSkia.h"
 #include "PlatformContextSkia.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
@@ -203,7 +204,12 @@
                 if (tiffData) {
                     CGImageSourceRef imageSource = CGImageSourceCreateWithData((CFDataRef)tiffData, NULL);
                     CGImageRef cgImage = CGImageSourceCreateImageAtIndex(imageSource, 0, NULL);
+#if USE(SKIA)
+                    SkBitmap bitmap = gfx::CGImageToSkBitmap(cgImage);
+                    RefPtr<Image> patternImage = BitmapImageSingleFrameSkia::create(bitmap, false);
+#else
                     RefPtr<Image> patternImage = BitmapImage::create(cgImage);
+#endif                    
                     m_overhangPattern = Pattern::create(patternImage, true, true);
                 }
             }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to