Changeset 89147 in webkit

Timestamp:

Jun 17, 2011 11:13:46 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-17 Cary Clark <​caryclark@google.com>

Reviewed by Mihai Parparita.

Exclude isCALayerContext check if building Chrome to use Skia on Mac.
​https://bugs.webkit.org/show_bug.cgi?id=62859

No new tests. This change does not affect existing functionality.

• platform/chromium/ScrollbarThemeChromiumMac.mm: (WebCore::ScrollbarThemeChromiumMac::paint): Add a conditional to always set drawing into layer to false if Skia is the WebKit rendering engine. Once USE(SKIA) is enabled, this condition can be removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ScrollbarThemeChromiumMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-17  Cary Clark  <caryclark@google.com>
+
+        Reviewed by Mihai Parparita.
+
+        Exclude isCALayerContext check if building Chrome to use Skia on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=62859
+
+        No new tests. This change does not affect existing functionality.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+        Add a conditional to always set drawing into layer to false if
+        Skia is the WebKit rendering engine. Once USE(SKIA) is enabled,
+        this condition can be removed.
+
 2011-06-17  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm

@@ -472 +472 @@
 
         ScrollAnimatorChromiumMac* scrollAnimator = static_cast<ScrollAnimatorChromiumMac*>(scrollbar->scrollableArea()->scrollAnimator());
+#if !USE(SKIA)
         scrollAnimator->setIsDrawingIntoLayer(context->isCALayerContext());
+#else
+        scrollAnimator->setIsDrawingIntoLayer(false);
+#endif
 
         wkSetScrollbarPainterKnobStyle(painterForScrollbar(scrollbar), toScrollbarPainterKnobStyle(scrollbar->scrollableArea()->recommendedScrollbarOverlayStyle()));