Title: [161798] trunk/Source/WebCore
- Revision
- 161798
- Author
- ddkil...@apple.com
- Date
- 2014-01-11 20:56:31 -0800 (Sat, 11 Jan 2014)
Log Message
[iOS] Fix build of RenderLayerCompositor::registerAllViewportConstrainedLayers()
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
Fix use of std::make_unique<>() and add an adoptPtr() call.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161797 => 161798)
--- trunk/Source/WebCore/ChangeLog 2014-01-12 04:33:34 UTC (rev 161797)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 04:56:31 UTC (rev 161798)
@@ -1,3 +1,11 @@
+2014-01-11 David Kilzer <ddkil...@apple.com>
+
+ [iOS] Fix build of RenderLayerCompositor::registerAllViewportConstrainedLayers()
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
+ Fix use of std::make_unique<>() and add an adoptPtr() call.
+
2014-01-11 Alexey Proskuryakov <a...@apple.com>
[Mac] [Windows] Stop scheduling network requests in WebCore
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (161797 => 161798)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-12 04:33:34 UTC (rev 161797)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-12 04:56:31 UTC (rev 161798)
@@ -3500,16 +3500,16 @@
std::unique_ptr<ViewportConstraints> constraints;
if (layer.renderer().isStickyPositioned()) {
- constraints = std::make_unique<ViewportConstraints>(new StickyPositionViewportConstraints(computeStickyViewportConstraints(layer)));
+ constraints = std::make_unique<StickyPositionViewportConstraints>(computeStickyViewportConstraints(layer));
const RenderLayer* enclosingTouchScrollableLayer = nullptr;
if (isStickyInAcceleratedScrollingLayerOrViewport(layer, &enclosingTouchScrollableLayer) && enclosingTouchScrollableLayer) {
ASSERT(enclosingTouchScrollableLayer->isComposited());
stickyContainerMap.add(layer.backing()->graphicsLayer()->platformLayer(), enclosingTouchScrollableLayer->backing()->scrollingLayer()->platformLayer());
}
} else
- constraints = std::make_unique<ViewportConstraints>(new FixedPositionViewportConstraints(computeFixedViewportConstraints(layer)));
+ constraints = std::make_unique<FixedPositionViewportConstraints>(computeFixedViewportConstraints(layer));
- layerMap.add(layer.backing()->graphicsLayer()->platformLayer(), constraints.release());
+ layerMap.add(layer.backing()->graphicsLayer()->platformLayer(), adoptPtr(constraints.release()));
}
if (ChromeClient* client = this->chromeClient())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
