Changeset 147436 in webkit

Timestamp:

Apr 2, 2013 8:24:48 AM (11 years ago)

Author:

aelias@chromium.org

Message:

Unreviewed, rolling out r147389.
​http://trac.webkit.org/changeset/147389
​https://bugs.webkit.org/show_bug.cgi?id=113738

r147389 was temporary patch for Chromium branch management, needs
revert.

• platform/ScrollView.cpp:

(WebCore::positionScrollbarLayer):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::positionOverflowControlsLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollView.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-02  Alexandre Elias  <aelias@chromium.org>
+
+        Unreviewed, rolling out r147389.
+        http://trac.webkit.org/changeset/147389
+        https://bugs.webkit.org/show_bug.cgi?id=113738
+
+        r147389 was temporary patch for Chromium branch management, needs
+        revert.
+
+        * platform/ScrollView.cpp:
+        (WebCore::positionScrollbarLayer):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::positionOverflowControlsLayers):
+
 2013-04-02  David Vest  <davve@opera.com>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -917 +917 @@
     }
 
-#if OS(ANDROID)
-    graphicsLayer->setDrawsContent(false);
-#else
     graphicsLayer->setDrawsContent(true);
-#endif
     graphicsLayer->setNeedsDisplay();
 }

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1090 +1090 @@
                 layer->setContentsRect(IntRect(IntPoint(), hBar->frameRect().size()));
         }
-#if OS(ANDROID)
-        layer->setDrawsContent(false);
-#else
         layer->setDrawsContent(hBar && !layer->hasContentsLayer());
-#endif
     }
     
@@ -1105 +1101 @@
                 layer->setContentsRect(IntRect(IntPoint(), vBar->frameRect().size()));
         }
-#if OS(ANDROID)
-        layer->setDrawsContent(false);
-#else
         layer->setDrawsContent(vBar && !layer->hasContentsLayer());
-#endif
     }