Title: [161780] trunk/Source/WebCore
- Revision
- 161780
- Author
- [email protected]
- Date
- 2014-01-11 12:59:15 -0800 (Sat, 11 Jan 2014)
Log Message
Fix updateScrollingLayerWithClient() for iOS.
* rendering/RenderLayerCompositor.cpp:
(WebCore::updateScrollingLayerWithClient):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161779 => 161780)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 20:59:14 UTC (rev 161779)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 20:59:15 UTC (rev 161780)
@@ -1,5 +1,12 @@
2014-01-11 Simon Fraser <[email protected]>
+ Fix updateScrollingLayerWithClient() for iOS.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::updateScrollingLayerWithClient):
+
+2014-01-11 Simon Fraser <[email protected]>
+
Unfork GraphicsContext::drawNativeImage for iOS
https://bugs.webkit.org/show_bug.cgi?id=126824
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (161779 => 161780)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-11 20:59:14 UTC (rev 161779)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-11 20:59:15 UTC (rev 161780)
@@ -462,13 +462,13 @@
if (!client)
return;
- RenderLayerBacking* backing = layer->backing();
+ RenderLayerBacking* backing = layer.backing();
ASSERT(backing);
- bool allowHorizontalScrollbar = !scrollbarHasDisplayNone(layer->horizontalScrollbar());
- bool allowVerticalScrollbar = !scrollbarHasDisplayNone(layer->verticalScrollbar());
- client->addOrUpdateScrollingLayer(layer->renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer(),
- IntSize(layer->scrollWidth(), layer->scrollHeight()), allowHorizontalScrollbar, allowVerticalScrollbar);
+ bool allowHorizontalScrollbar = !scrollbarHasDisplayNone(layer.horizontalScrollbar());
+ bool allowVerticalScrollbar = !scrollbarHasDisplayNone(layer.verticalScrollbar());
+ client->addOrUpdateScrollingLayer(layer.renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer(),
+ IntSize(layer.scrollWidth(), layer.scrollHeight()), allowHorizontalScrollbar, allowVerticalScrollbar);
}
void RenderLayerCompositor::updateCustomLayersAfterFlush()
@@ -3482,7 +3482,7 @@
}
#if PLATFORM(IOS)
-typedef HashMap<PlatformLayer*, std::unique_ptr<ViewportConstraints>> LayerMap;
+typedef HashMap<PlatformLayer*, OwnPtr<ViewportConstraints>> LayerMap;
typedef HashMap<PlatformLayer*, PlatformLayer*> StickyContainerMap;
void RenderLayerCompositor::registerAllViewportConstrainedLayers()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
