Title: [87728] trunk/Source/WebKit/chromium
- Revision
- 87728
- Author
- [email protected]
- Date
- 2011-05-31 09:05:31 -0700 (Tue, 31 May 2011)
Log Message
2011-05-31 Cary Clark <[email protected]>
Reviewed by Eric Seidel.
Allow Chromium porting layer to use Skia on Mac.
https://bugs.webkit.org/show_bug.cgi?id=61548
* public/WebCommon.h:
Don't allow WebKit to use CG if it is already using Skia.
* src/PlatformBridge.cpp:
(WebCore::PlatformBridge::paintScrollbarThumb):
Allow scrollbar thumb draw to take WebCanvas.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (87727 => 87728)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-05-31 15:38:37 UTC (rev 87727)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-05-31 16:05:31 UTC (rev 87728)
@@ -1,3 +1,17 @@
+2011-05-31 Cary Clark <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Allow Chromium porting layer to use Skia on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=61548
+
+ * public/WebCommon.h:
+ Don't allow WebKit to use CG if it is already using Skia.
+
+ * src/PlatformBridge.cpp:
+ (WebCore::PlatformBridge::paintScrollbarThumb):
+ Allow scrollbar thumb draw to take WebCanvas.
+
2011-05-27 Jochen Eisinger <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/WebKit/chromium/public/WebCommon.h (87727 => 87728)
--- trunk/Source/WebKit/chromium/public/WebCommon.h 2011-05-31 15:38:37 UTC (rev 87727)
+++ trunk/Source/WebKit/chromium/public/WebCommon.h 2011-05-31 16:05:31 UTC (rev 87728)
@@ -47,7 +47,7 @@
#endif
#if !defined(WEBKIT_USING_CG)
- #if defined(__APPLE__)
+ #if defined(__APPLE__) && !WEBKIT_USING_SKIA
#define WEBKIT_USING_CG 1
#else
#define WEBKIT_USING_CG 0
Modified: trunk/Source/WebKit/chromium/src/PlatformBridge.cpp (87727 => 87728)
--- trunk/Source/WebKit/chromium/src/PlatformBridge.cpp 2011-05-31 15:38:37 UTC (rev 87727)
+++ trunk/Source/WebKit/chromium/src/PlatformBridge.cpp 2011-05-31 16:05:31 UTC (rev 87728)
@@ -796,8 +796,13 @@
webThemeScrollbarInfo.visibleSize = scrollbarInfo.visibleSize;
webThemeScrollbarInfo.totalSize = scrollbarInfo.totalSize;
+#if WEBKIT_USING_SKIA
+ WebKit::WebCanvas* webCanvas = gc->platformContext()->canvas();
+#else
+ WebKit::WebCanvas* webCanvas = gc->platformContext();
+#endif
webKitClient()->themeEngine()->paintScrollbarThumb(
- gc->platformContext(),
+ webCanvas,
static_cast<WebThemeEngine::State>(state),
static_cast<WebThemeEngine::Size>(size),
rect,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
