Title: [147436] trunk/Source/WebCore
- Revision
- 147436
- Author
- [email protected]
- Date
- 2013-04-02 08:24:48 -0700 (Tue, 02 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147435 => 147436)
--- trunk/Source/WebCore/ChangeLog 2013-04-02 15:21:54 UTC (rev 147435)
+++ trunk/Source/WebCore/ChangeLog 2013-04-02 15:24:48 UTC (rev 147436)
@@ -1,3 +1,17 @@
+2013-04-02 Alexandre Elias <[email protected]>
+
+ 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 <[email protected]>
Hang when calling setCurrentTime on SVG with cyclic animation dependency chain
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (147435 => 147436)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2013-04-02 15:21:54 UTC (rev 147435)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2013-04-02 15:24:48 UTC (rev 147436)
@@ -916,11 +916,7 @@
return;
}
-#if OS(ANDROID)
- graphicsLayer->setDrawsContent(false);
-#else
graphicsLayer->setDrawsContent(true);
-#endif
graphicsLayer->setNeedsDisplay();
}
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (147435 => 147436)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-04-02 15:21:54 UTC (rev 147435)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-04-02 15:24:48 UTC (rev 147436)
@@ -1089,11 +1089,7 @@
if (layer->hasContentsLayer())
layer->setContentsRect(IntRect(IntPoint(), hBar->frameRect().size()));
}
-#if OS(ANDROID)
- layer->setDrawsContent(false);
-#else
layer->setDrawsContent(hBar && !layer->hasContentsLayer());
-#endif
}
if (GraphicsLayer* layer = layerForVerticalScrollbar()) {
@@ -1104,11 +1100,7 @@
if (layer->hasContentsLayer())
layer->setContentsRect(IntRect(IntPoint(), vBar->frameRect().size()));
}
-#if OS(ANDROID)
- layer->setDrawsContent(false);
-#else
layer->setDrawsContent(vBar && !layer->hasContentsLayer());
-#endif
}
if (GraphicsLayer* layer = layerForScrollCorner()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
