Changeset 87728 in webkit

Timestamp:

May 31, 2011 9:05:31 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-31 Cary Clark <​caryclark@google.com>

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.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebCommon.h (modified) (1 diff)
• src/PlatformBridge.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-31  Cary Clark  <caryclark@google.com>
+
+        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  <jochen@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebCommon.h

@@ -48 +48 @@
 
 #if !defined(WEBKIT_USING_CG)
-    #if defined(__APPLE__)
+    #if defined(__APPLE__) && !WEBKIT_USING_SKIA
         #define WEBKIT_USING_CG 1
     #else

trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

@@ -797 +797 @@
     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),