<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166489] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166489">166489</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-03-31 03:12:49 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move Source/WebCore/rendering/ code to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=129664
Reviewed by Anders Carlsson.
Replace uses of OwnPtr and PassOwnPtr in code under Source/WebCore/rendering/ with std::unique_ptr.
* platform/graphics/FloatPolygon.cpp:
(WebCore::FloatPolygon::FloatPolygon):
* platform/graphics/FloatPolygon.h:
* rendering/ClipPathOperation.h:
* rendering/FlowThreadController.cpp:
(WebCore::FlowThreadController::ensureRenderFlowThreadWithName):
* rendering/FlowThreadController.h:
* rendering/HitTestLocation.h:
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::HitTestResult):
(WebCore::HitTestResult::operator=):
(WebCore::HitTestResult::rectBasedTestResult):
(WebCore::HitTestResult::mutableRectBasedTestResult):
* rendering/HitTestResult.h:
* rendering/HitTestingTransformState.cpp:
* rendering/ImageQualityController.h:
* rendering/RenderBlock.cpp:
(WebCore::removeBlockFromDescendantAndContainerMaps):
(WebCore::RenderBlock::finishDelayUpdateScrollInfo):
(WebCore::RenderBlock::addContinuationWithOutline):
(WebCore::RenderBlock::paintContinuationOutlines):
(WebCore::RenderBlock::insertIntoTrackedRendererMaps):
(WebCore::RenderBlock::removeFromTrackedRendererMaps):
(WebCore::RenderBlock::setComputedColumnCountAndWidth):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::createFloatingObjects):
* rendering/RenderBlockFlow.h:
* rendering/RenderBoxRegionInfo.h:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::styleDidChange):
* rendering/RenderButton.h:
* rendering/RenderCounter.cpp:
(WebCore::makeCounterNode):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::updateAllLayerToRegionMappings):
(WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
* rendering/RenderFlowThread.h:
* rendering/RenderGeometryMap.cpp:
(WebCore::RenderGeometryMap::push):
(WebCore::RenderGeometryMap::pushView):
* rendering/RenderGeometryMap.h:
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::GridIterator::nextEmptyGridArea):
(WebCore::RenderGrid::placeItemsOnGrid):
(WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
(WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
(WebCore::RenderGrid::resolveGridPositionsFromStyle):
(WebCore::RenderGrid::resolveGridPositionAgainstOppositePosition):
(WebCore::RenderGrid::resolveNamedGridLinePositionAgainstOppositePosition):
(WebCore::RenderGrid::resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition):
(WebCore::RenderGrid::resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition):
* rendering/RenderGrid.h:
* rendering/RenderImageResource.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateDescendantsAreContiguousInStackingOrder):
(WebCore::RenderLayer::updateTransform):
(WebCore::RenderLayer::setupFilters):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintChildLayerIntoColumns):
(WebCore::RenderLayer::hitTestChildLayerColumns):
(WebCore::RenderLayer::updateClipRects):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
(WebCore::RenderLayer::clearZOrderLists):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh):
(WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
* rendering/RenderLayerCompositor.h:
* rendering/RenderLayerFilterInfo.cpp:
(WebCore::RenderLayer::FilterInfo::map):
(WebCore::RenderLayer::FilterInfo::get):
* rendering/RenderLayerFilterInfo.h:
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::setRenderBoxRegionInfo):
(WebCore::RenderRegion::takeRenderBoxRegionInfo):
* rendering/RenderRegion.h:
* rendering/RenderTable.cpp:
(WebCore::RenderTable::styleDidChange):
* rendering/RenderTable.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::selectionBounds):
(WebCore::RenderView::setSelection):
(WebCore::RenderView::compositor):
(WebCore::RenderView::flowThreadController):
(WebCore::RenderView::imageQualityController):
* rendering/RenderView.h:
* rendering/RootInlineBox.h:
(WebCore::RootInlineBox::appendFloat):
* rendering/TextAutosizer.h:
* rendering/shapes/PolygonShape.cpp:
(WebCore::computeShapePaddingBounds):
(WebCore::computeShapeMarginBounds):
* rendering/shapes/PolygonShape.h:
(WebCore::PolygonShape::PolygonShape):
* rendering/shapes/RasterShape.cpp:
(WebCore::RasterShapeIntervals::computeShapeMarginIntervals):
* rendering/shapes/RasterShape.h:
(WebCore::RasterShape::RasterShape):
* rendering/shapes/Shape.cpp:
(WebCore::createInsetShape):
(WebCore::createRectangleShape):
(WebCore::createCircleShape):
(WebCore::createEllipseShape):
(WebCore::createPolygonShape):
(WebCore::Shape::createShape):
(WebCore::Shape::createRasterShape):
(WebCore::Shape::createLayoutBoxShape):
* rendering/shapes/Shape.h:
* rendering/shapes/ShapeInfo.h:
(WebCore::ShapeInfo::markShapeAsDirty):
(WebCore::ShapeInfo::isShapeDirty):
* rendering/shapes/ShapeInsideInfo.h:
* rendering/style/ContentData.h:
* rendering/style/CounterDirectives.cpp:
(WebCore::clone):
* rendering/style/CounterDirectives.h:
* rendering/style/GridCoordinate.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::addCachedPseudoStyle):
(WebCore::RenderStyle::accessCounterDirectives):
(WebCore::RenderStyle::accessAnimations):
(WebCore::RenderStyle::accessTransitions):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
* rendering/style/StyleRareNonInheritedData.h:
* rendering/svg/RenderSVGResourceGradient.cpp:
(WebCore::RenderSVGResourceGradient::applyResource):
* rendering/svg/RenderSVGResourceGradient.h:
* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::buildPattern):
* rendering/svg/RenderSVGResourcePattern.h:
* rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::updateShapeFromElement):
* rendering/svg/RenderSVGShape.h:
* rendering/svg/SVGResources.cpp:
(WebCore::SVGResources::setClipper):
(WebCore::SVGResources::setFilter):
(WebCore::SVGResources::setMarkerStart):
(WebCore::SVGResources::setMarkerMid):
(WebCore::SVGResources::setMarkerEnd):
(WebCore::SVGResources::setMasker):
(WebCore::SVGResources::setFill):
(WebCore::SVGResources::setStroke):
* rendering/svg/SVGResources.h:
* rendering/svg/SVGResourcesCache.cpp:
(WebCore::SVGResourcesCache::addResourcesFromRenderer):
(WebCore::SVGResourcesCache::removeResourcesFromRenderer):
* rendering/svg/SVGResourcesCache.h:
* rendering/svg/SVGTextMetricsBuilder.cpp:
(WebCore::SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer):
* rendering/svg/SVGTextMetricsBuilder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPolygoncpp">trunk/Source/WebCore/platform/graphics/FloatPolygon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPolygonh">trunk/Source/WebCore/platform/graphics/FloatPolygon.h</a></li>
<li><a href="#trunkSourceWebCorerenderingClipPathOperationh">trunk/Source/WebCore/rendering/ClipPathOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingFlowThreadControllercpp">trunk/Source/WebCore/rendering/FlowThreadController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFlowThreadControllerh">trunk/Source/WebCore/rendering/FlowThreadController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestLocationh">trunk/Source/WebCore/rendering/HitTestLocation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResulth">trunk/Source/WebCore/rendering/HitTestResult.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestingTransformStatecpp">trunk/Source/WebCore/rendering/HitTestingTransformState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllerh">trunk/Source/WebCore/rendering/ImageQualityController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxRegionInfoh">trunk/Source/WebCore/rendering/RenderBoxRegionInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtonh">trunk/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCountercpp">trunk/Source/WebCore/rendering/RenderCounter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGeometryMapcpp">trunk/Source/WebCore/rendering/RenderGeometryMap.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGeometryMaph">trunk/Source/WebCore/rendering/RenderGeometryMap.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceh">trunk/Source/WebCore/rendering/RenderImageResource.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfoh">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegionh">trunk/Source/WebCore/rendering/RenderRegion.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxh">trunk/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutosizerh">trunk/Source/WebCore/rendering/TextAutosizer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesPolygonShapecpp">trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesPolygonShapeh">trunk/Source/WebCore/rendering/shapes/PolygonShape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesRasterShapecpp">trunk/Source/WebCore/rendering/shapes/RasterShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesRasterShapeh">trunk/Source/WebCore/rendering/shapes/RasterShape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeh">trunk/Source/WebCore/rendering/shapes/Shape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleContentDatah">trunk/Source/WebCore/rendering/style/ContentData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleCounterDirectivescpp">trunk/Source/WebCore/rendering/style/CounterDirectives.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleCounterDirectivesh">trunk/Source/WebCore/rendering/style/CounterDirectives.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridCoordinateh">trunk/Source/WebCore/rendering/style/GridCoordinate.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradienth">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapeh">trunk/Source/WebCore/rendering/svg/RenderSVGShape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcescpp">trunk/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesh">trunk/Source/WebCore/rendering/svg/SVGResources.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCachecpp">trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCacheh">trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricsBuildercpp">trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricsBuilderh">trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -1,3 +1,167 @@
</span><ins>+2014-03-23 Zan Dobersek <zdobersek@igalia.com>
+
+ Move Source/WebCore/rendering/ code to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=129664
+
+ Reviewed by Anders Carlsson.
+
+ Replace uses of OwnPtr and PassOwnPtr in code under Source/WebCore/rendering/ with std::unique_ptr.
+
+ * platform/graphics/FloatPolygon.cpp:
+ (WebCore::FloatPolygon::FloatPolygon):
+ * platform/graphics/FloatPolygon.h:
+ * rendering/ClipPathOperation.h:
+ * rendering/FlowThreadController.cpp:
+ (WebCore::FlowThreadController::ensureRenderFlowThreadWithName):
+ * rendering/FlowThreadController.h:
+ * rendering/HitTestLocation.h:
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::HitTestResult):
+ (WebCore::HitTestResult::operator=):
+ (WebCore::HitTestResult::rectBasedTestResult):
+ (WebCore::HitTestResult::mutableRectBasedTestResult):
+ * rendering/HitTestResult.h:
+ * rendering/HitTestingTransformState.cpp:
+ * rendering/ImageQualityController.h:
+ * rendering/RenderBlock.cpp:
+ (WebCore::removeBlockFromDescendantAndContainerMaps):
+ (WebCore::RenderBlock::finishDelayUpdateScrollInfo):
+ (WebCore::RenderBlock::addContinuationWithOutline):
+ (WebCore::RenderBlock::paintContinuationOutlines):
+ (WebCore::RenderBlock::insertIntoTrackedRendererMaps):
+ (WebCore::RenderBlock::removeFromTrackedRendererMaps):
+ (WebCore::RenderBlock::setComputedColumnCountAndWidth):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::createFloatingObjects):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBoxRegionInfo.h:
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::styleDidChange):
+ * rendering/RenderButton.h:
+ * rendering/RenderCounter.cpp:
+ (WebCore::makeCounterNode):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::updateAllLayerToRegionMappings):
+ (WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderGeometryMap.cpp:
+ (WebCore::RenderGeometryMap::push):
+ (WebCore::RenderGeometryMap::pushView):
+ * rendering/RenderGeometryMap.h:
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::GridIterator::nextEmptyGridArea):
+ (WebCore::RenderGrid::placeItemsOnGrid):
+ (WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
+ (WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
+ (WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
+ (WebCore::RenderGrid::resolveGridPositionsFromStyle):
+ (WebCore::RenderGrid::resolveGridPositionAgainstOppositePosition):
+ (WebCore::RenderGrid::resolveNamedGridLinePositionAgainstOppositePosition):
+ (WebCore::RenderGrid::resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition):
+ (WebCore::RenderGrid::resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition):
+ * rendering/RenderGrid.h:
+ * rendering/RenderImageResource.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateDescendantsAreContiguousInStackingOrder):
+ (WebCore::RenderLayer::updateTransform):
+ (WebCore::RenderLayer::setupFilters):
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::paintChildLayerIntoColumns):
+ (WebCore::RenderLayer::hitTestChildLayerColumns):
+ (WebCore::RenderLayer::updateClipRects):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+ (WebCore::RenderLayer::clearZOrderLists):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh):
+ (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
+ * rendering/RenderLayerCompositor.h:
+ * rendering/RenderLayerFilterInfo.cpp:
+ (WebCore::RenderLayer::FilterInfo::map):
+ (WebCore::RenderLayer::FilterInfo::get):
+ * rendering/RenderLayerFilterInfo.h:
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::setRenderBoxRegionInfo):
+ (WebCore::RenderRegion::takeRenderBoxRegionInfo):
+ * rendering/RenderRegion.h:
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::styleDidChange):
+ * rendering/RenderTable.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::selectionBounds):
+ (WebCore::RenderView::setSelection):
+ (WebCore::RenderView::compositor):
+ (WebCore::RenderView::flowThreadController):
+ (WebCore::RenderView::imageQualityController):
+ * rendering/RenderView.h:
+ * rendering/RootInlineBox.h:
+ (WebCore::RootInlineBox::appendFloat):
+ * rendering/TextAutosizer.h:
+ * rendering/shapes/PolygonShape.cpp:
+ (WebCore::computeShapePaddingBounds):
+ (WebCore::computeShapeMarginBounds):
+ * rendering/shapes/PolygonShape.h:
+ (WebCore::PolygonShape::PolygonShape):
+ * rendering/shapes/RasterShape.cpp:
+ (WebCore::RasterShapeIntervals::computeShapeMarginIntervals):
+ * rendering/shapes/RasterShape.h:
+ (WebCore::RasterShape::RasterShape):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::createInsetShape):
+ (WebCore::createRectangleShape):
+ (WebCore::createCircleShape):
+ (WebCore::createEllipseShape):
+ (WebCore::createPolygonShape):
+ (WebCore::Shape::createShape):
+ (WebCore::Shape::createRasterShape):
+ (WebCore::Shape::createLayoutBoxShape):
+ * rendering/shapes/Shape.h:
+ * rendering/shapes/ShapeInfo.h:
+ (WebCore::ShapeInfo::markShapeAsDirty):
+ (WebCore::ShapeInfo::isShapeDirty):
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/style/ContentData.h:
+ * rendering/style/CounterDirectives.cpp:
+ (WebCore::clone):
+ * rendering/style/CounterDirectives.h:
+ * rendering/style/GridCoordinate.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::addCachedPseudoStyle):
+ (WebCore::RenderStyle::accessCounterDirectives):
+ (WebCore::RenderStyle::accessAnimations):
+ (WebCore::RenderStyle::accessTransitions):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ * rendering/style/StyleRareNonInheritedData.h:
+ * rendering/svg/RenderSVGResourceGradient.cpp:
+ (WebCore::RenderSVGResourceGradient::applyResource):
+ * rendering/svg/RenderSVGResourceGradient.h:
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ (WebCore::RenderSVGResourcePattern::buildPattern):
+ * rendering/svg/RenderSVGResourcePattern.h:
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::updateShapeFromElement):
+ * rendering/svg/RenderSVGShape.h:
+ * rendering/svg/SVGResources.cpp:
+ (WebCore::SVGResources::setClipper):
+ (WebCore::SVGResources::setFilter):
+ (WebCore::SVGResources::setMarkerStart):
+ (WebCore::SVGResources::setMarkerMid):
+ (WebCore::SVGResources::setMarkerEnd):
+ (WebCore::SVGResources::setMasker):
+ (WebCore::SVGResources::setFill):
+ (WebCore::SVGResources::setStroke):
+ * rendering/svg/SVGResources.h:
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::SVGResourcesCache::addResourcesFromRenderer):
+ (WebCore::SVGResourcesCache::removeResourcesFromRenderer):
+ * rendering/svg/SVGResourcesCache.h:
+ * rendering/svg/SVGTextMetricsBuilder.cpp:
+ (WebCore::SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer):
+ * rendering/svg/SVGTextMetricsBuilder.h:
+
</ins><span class="cx"> 2014-03-28 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed<T> in loader
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPolygoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPolygon.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPolygon.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/platform/graphics/FloatPolygon.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> return vertexIndex2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPolygon::FloatPolygon(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fillRule)
- : m_vertices(vertices)
</del><ins>+FloatPolygon::FloatPolygon(std::unique_ptr<Vector<FloatPoint>> vertices, WindRule fillRule)
+ : m_vertices(std::move(vertices))
</ins><span class="cx"> , m_fillRule(fillRule)
</span><span class="cx"> {
</span><span class="cx"> unsigned nVertices = numberOfVertices();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPolygonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPolygon.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPolygon.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/platform/graphics/FloatPolygon.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -35,8 +35,7 @@
</span><span class="cx"> #include "PODIntervalTree.h"
</span><span class="cx"> #include "ValueToString.h"
</span><span class="cx"> #include "WindRule.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class FloatPolygon {
</span><span class="cx"> public:
</span><del>- FloatPolygon(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fillRule);
</del><ins>+ FloatPolygon(std::unique_ptr<Vector<FloatPoint>> vertices, WindRule fillRule);
</ins><span class="cx">
</span><span class="cx"> const FloatPoint& vertexAt(unsigned index) const { return (*m_vertices)[index]; }
</span><span class="cx"> unsigned numberOfVertices() const { return m_vertices->size(); }
</span><span class="lines">@@ -67,7 +66,7 @@
</span><span class="cx"> bool containsNonZero(const FloatPoint&) const;
</span><span class="cx"> bool containsEvenOdd(const FloatPoint&) const;
</span><span class="cx">
</span><del>- OwnPtr<Vector<FloatPoint>> m_vertices;
</del><ins>+ std::unique_ptr<Vector<FloatPoint>> m_vertices;
</ins><span class="cx"> WindRule m_fillRule;
</span><span class="cx"> FloatRect m_boundingBox;
</span><span class="cx"> bool m_empty;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingClipPathOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipPathOperation.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> #include "BasicShapes.h"
</span><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFlowThreadControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FlowThreadController.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FlowThreadController.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/FlowThreadController.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<FlowThreadController> FlowThreadController::create(RenderView* view)
-{
- return adoptPtr(new FlowThreadController(view));
-}
-
</del><span class="cx"> FlowThreadController::FlowThreadController(RenderView* view)
</span><span class="cx"> : m_view(view)
</span><span class="cx"> , m_currentRenderFlowThread(0)
</span><span class="lines">@@ -60,7 +55,7 @@
</span><span class="cx"> RenderNamedFlowThread& FlowThreadController::ensureRenderFlowThreadWithName(const AtomicString& name)
</span><span class="cx"> {
</span><span class="cx"> if (!m_renderNamedFlowThreadList)
</span><del>- m_renderNamedFlowThreadList = adoptPtr(new RenderNamedFlowThreadList());
</del><ins>+ m_renderNamedFlowThreadList = std::make_unique<RenderNamedFlowThreadList>();
</ins><span class="cx"> else {
</span><span class="cx"> for (auto iter = m_renderNamedFlowThreadList->begin(), end = m_renderNamedFlowThreadList->end(); iter != end; ++iter) {
</span><span class="cx"> RenderNamedFlowThread* flowRenderer = *iter;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFlowThreadControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FlowThreadController.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FlowThreadController.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/FlowThreadController.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #define FlowThreadController_h
</span><span class="cx">
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/ListHashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class FlowThreadController {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<FlowThreadController> create(RenderView*);
</del><ins>+ explicit FlowThreadController(RenderView*);
</ins><span class="cx"> ~FlowThreadController();
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* currentRenderFlowThread() const { return m_currentRenderFlowThread; }
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit FlowThreadController(RenderView*);
</del><span class="cx"> void updateFlowThreadsChainIfNecessary();
</span><span class="cx"> void resetFlowThreadsWithAutoHeightRegions();
</span><span class="cx">
</span><span class="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> RenderFlowThread* m_currentRenderFlowThread;
</span><span class="cx"> bool m_isRenderNamedFlowThreadOrderDirty;
</span><span class="cx"> unsigned m_flowThreadsWithAutoLogicalHeightRegions;
</span><del>- OwnPtr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
</del><ins>+ std::unique_ptr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
</ins><span class="cx"> HashMap<const Element*, RenderNamedFlowThread*> m_mapNamedFlowContentElement;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestLocation.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestLocation.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/HitTestLocation.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "TextDirection.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> , m_isOverWidget(other.isOverWidget())
</span><span class="cx"> {
</span><span class="cx"> // Only copy the NodeSet in case of rect hit test.
</span><del>- m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
</del><ins>+ m_rectBasedTestResult = other.m_rectBasedTestResult ? std::make_unique<NodeSet>(*other.m_rectBasedTestResult) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HitTestResult::~HitTestResult()
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> m_isOverWidget = other.isOverWidget();
</span><span class="cx">
</span><span class="cx"> // Only copy the NodeSet in case of rect hit test.
</span><del>- m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
</del><ins>+ m_rectBasedTestResult = other.m_rectBasedTestResult ? std::make_unique<NodeSet>(*other.m_rectBasedTestResult) : nullptr;
</ins><span class="cx">
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="lines">@@ -637,14 +637,14 @@
</span><span class="cx"> const HitTestResult::NodeSet& HitTestResult::rectBasedTestResult() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_rectBasedTestResult)
</span><del>- m_rectBasedTestResult = adoptPtr(new NodeSet);
</del><ins>+ m_rectBasedTestResult = std::make_unique<NodeSet>();
</ins><span class="cx"> return *m_rectBasedTestResult;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HitTestResult::NodeSet& HitTestResult::mutableRectBasedTestResult()
</span><span class="cx"> {
</span><span class="cx"> if (!m_rectBasedTestResult)
</span><del>- m_rectBasedTestResult = adoptPtr(new NodeSet);
</del><ins>+ m_rectBasedTestResult = std::make_unique<NodeSet>();
</ins><span class="cx"> return *m_rectBasedTestResult;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/HitTestResult.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "TextDirection.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> RefPtr<Scrollbar> m_scrollbar;
</span><span class="cx"> bool m_isOverWidget; // Returns true if we are over a widget (and not in the border/padding area of a RenderWidget for example).
</span><span class="cx">
</span><del>- mutable OwnPtr<NodeSet> m_rectBasedTestResult;
</del><ins>+ mutable std::unique_ptr<NodeSet> m_rectBasedTestResult;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> String displayString(const String&, const Node*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestingTransformStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestingTransformState.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestingTransformState.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/HitTestingTransformState.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "HitTestingTransformState.h"
</span><span class="cx">
</span><span class="cx"> #include "LayoutRect.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/ImageQualityController.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,7 +41,7 @@
</span><span class="cx"> class ImageQualityController {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ImageQualityController)
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ImageQualityController> create(const RenderView& renderView) { return adoptPtr(new ImageQualityController(renderView)); }
</del><ins>+ explicit ImageQualityController(const RenderView&);
</ins><span class="cx">
</span><span class="cx"> bool shouldPaintAtLowQuality(GraphicsContext*, RenderBoxModelObject*, Image*, const void* layer, const LayoutSize&);
</span><span class="cx"> void rendererWillBeDestroyed(RenderBoxModelObject& renderer) { removeObject(&renderer); }
</span><span class="lines">@@ -51,8 +50,6 @@
</span><span class="cx"> typedef HashMap<const void*, LayoutSize> LayerSizeMap;
</span><span class="cx"> typedef HashMap<RenderBoxModelObject*, LayerSizeMap> ObjectLayerSizeMap;
</span><span class="cx">
</span><del>- explicit ImageQualityController(const RenderView&);
-
</del><span class="cx"> void removeLayer(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer);
</span><span class="cx"> void set(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer, const LayoutSize&);
</span><span class="cx"> void highQualityRepaintTimerFired(Timer<ImageQualityController>&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
</span><span class="cx">
</span><del>-typedef WTF::HashMap<const RenderBox*, OwnPtr<ColumnInfo>> ColumnInfoMap;
</del><ins>+typedef WTF::HashMap<const RenderBox*, std::unique_ptr<ColumnInfo>> ColumnInfoMap;
</ins><span class="cx"> static ColumnInfoMap* gColumnInfoMap = 0;
</span><span class="cx">
</span><span class="cx"> static TrackedDescendantsMap* gPositionedDescendantsMap = 0;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> static TrackedContainerMap* gPositionedContainerMap = 0;
</span><span class="cx"> static TrackedContainerMap* gPercentHeightContainerMap = 0;
</span><span class="cx">
</span><del>-typedef WTF::HashMap<RenderBlock*, OwnPtr<ListHashSet<RenderInline*>>> ContinuationOutlineTableMap;
</del><ins>+typedef WTF::HashMap<RenderBlock*, std::unique_ptr<ListHashSet<RenderInline*>>> ContinuationOutlineTableMap;
</ins><span class="cx">
</span><span class="cx"> typedef WTF::HashSet<RenderBlock*> DelayedUpdateScrollInfoSet;
</span><span class="cx"> static int gDelayUpdateScrollInfo = 0;
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, TrackedDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
</span><span class="cx"> {
</span><del>- if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(block)) {
</del><ins>+ if (std::unique_ptr<TrackedRendererListHashSet> descendantSet = descendantMap->take(block)) {
</ins><span class="cx"> TrackedRendererListHashSet::iterator end = descendantSet->end();
</span><span class="cx"> for (TrackedRendererListHashSet::iterator descendant = descendantSet->begin(); descendant != end; ++descendant) {
</span><span class="cx"> TrackedContainerMap::iterator it = containerMap->find(*descendant);
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> if (gDelayUpdateScrollInfo == 0) {
</span><span class="cx"> ASSERT(gDelayedUpdateScrollInfoSet);
</span><span class="cx">
</span><del>- OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScrollInfoSet));
</del><ins>+ std::unique_ptr<DelayedUpdateScrollInfoSet> infoSet(gDelayedUpdateScrollInfoSet);
</ins><span class="cx"> gDelayedUpdateScrollInfoSet = 0;
</span><span class="cx">
</span><span class="cx"> for (DelayedUpdateScrollInfoSet::iterator it = infoSet->begin(); it != infoSet->end(); ++it) {
</span><span class="lines">@@ -2226,7 +2226,7 @@
</span><span class="cx"> ListHashSet<RenderInline*>* continuations = table->get(this);
</span><span class="cx"> if (!continuations) {
</span><span class="cx"> continuations = new ListHashSet<RenderInline*>;
</span><del>- table->set(this, adoptPtr(continuations));
</del><ins>+ table->set(this, std::unique_ptr<ListHashSet<RenderInline*>>(continuations));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> continuations->add(flow);
</span><span class="lines">@@ -2251,7 +2251,7 @@
</span><span class="cx"> if (table->isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OwnPtr<ListHashSet<RenderInline*>> continuations = table->take(this);
</del><ins>+ std::unique_ptr<ListHashSet<RenderInline*>> continuations = table->take(this);
</ins><span class="cx"> if (!continuations)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2656,7 +2656,7 @@
</span><span class="cx"> TrackedRendererListHashSet* descendantSet = descendantsMap->get(this);
</span><span class="cx"> if (!descendantSet) {
</span><span class="cx"> descendantSet = new TrackedRendererListHashSet;
</span><del>- descendantsMap->set(this, adoptPtr(descendantSet));
</del><ins>+ descendantsMap->set(this, std::unique_ptr<TrackedRendererListHashSet>(descendantSet));
</ins><span class="cx"> }
</span><span class="cx"> bool added = descendantSet->add(&descendant).isNewEntry;
</span><span class="cx"> if (!added) {
</span><span class="lines">@@ -2668,7 +2668,7 @@
</span><span class="cx"> HashSet<RenderBlock*>* containerSet = containerMap->get(&descendant);
</span><span class="cx"> if (!containerSet) {
</span><span class="cx"> containerSet = new HashSet<RenderBlock*>;
</span><del>- containerMap->set(&descendant, adoptPtr(containerSet));
</del><ins>+ containerMap->set(&descendant, std::unique_ptr<HashSet<RenderBlock*>>(containerSet));
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(!containerSet->contains(this));
</span><span class="cx"> containerSet->add(this);
</span><span class="lines">@@ -2679,7 +2679,7 @@
</span><span class="cx"> if (!descendantsMap)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OwnPtr<HashSet<RenderBlock*>> containerSet = containerMap->take(&descendant);
</del><ins>+ std::unique_ptr<HashSet<RenderBlock*>> containerSet = containerMap->take(&descendant);
</ins><span class="cx"> if (!containerSet)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3329,7 +3329,7 @@
</span><span class="cx"> if (!gColumnInfoMap)
</span><span class="cx"> gColumnInfoMap = new ColumnInfoMap;
</span><span class="cx"> info = new ColumnInfo;
</span><del>- gColumnInfoMap->add(this, adoptPtr(info));
</del><ins>+ gColumnInfoMap->add(this, std::unique_ptr<ColumnInfo>(info));
</ins><span class="cx"> setHasColumns(true);
</span><span class="cx"> }
</span><span class="cx"> info->setDesiredColumnCount(count);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "GapRects.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "TextRun.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> struct PaintInfo;
</span><span class="cx">
</span><span class="cx"> typedef WTF::ListHashSet<RenderBox*, 16> TrackedRendererListHashSet;
</span><del>-typedef WTF::HashMap<const RenderBlock*, OwnPtr<TrackedRendererListHashSet>> TrackedDescendantsMap;
-typedef WTF::HashMap<const RenderBox*, OwnPtr<HashSet<RenderBlock*>>> TrackedContainerMap;
</del><ins>+typedef WTF::HashMap<const RenderBlock*, std::unique_ptr<TrackedRendererListHashSet>> TrackedDescendantsMap;
+typedef WTF::HashMap<const RenderBox*, std::unique_ptr<HashSet<RenderBlock*>>> TrackedContainerMap;
</ins><span class="cx">
</span><span class="cx"> enum CaretType { CursorCaret, DragCaret };
</span><span class="cx"> enum ContainingBlockState { NewContainingBlock, SameContainingBlock };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -2024,7 +2024,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::createFloatingObjects()
</span><span class="cx"> {
</span><del>- m_floatingObjects = adoptPtr(new FloatingObjects(*this));
</del><ins>+ m_floatingObjects = std::make_unique<FloatingObjects>(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::removeFloatingObjects()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "RenderLineBoxList.h"
</span><span class="cx"> #include "SimpleLineLayout.h"
</span><span class="cx"> #include "TrailingObjects.h"
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -592,7 +593,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- OwnPtr<FloatingObjects> m_floatingObjects;
</del><ins>+ std::unique_ptr<FloatingObjects> m_floatingObjects;
</ins><span class="cx"> std::unique_ptr<RenderBlockFlowRareData> m_rareBlockFlowData;
</span><span class="cx"> RenderLineBoxList m_lineBoxes;
</span><span class="cx"> std::unique_ptr<SimpleLineLayout::Layout> m_simpleLineLayout;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxRegionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxRegionInfo.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxRegionInfo.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderBoxRegionInfo.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #define RenderBoxRegionInfo_h
</span><span class="cx">
</span><span class="cx"> #include "RenderOverflow.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -114,12 +114,12 @@
</span><span class="cx">
</span><span class="cx"> if (!m_default && theme().isDefault(this)) {
</span><span class="cx"> if (!m_timer)
</span><del>- m_timer = adoptPtr(new Timer<RenderButton>(this, &RenderButton::timerFired));
</del><ins>+ m_timer = std::make_unique<Timer<RenderButton>>(this, &RenderButton::timerFired);
</ins><span class="cx"> m_timer->startRepeating(0.03);
</span><span class="cx"> m_default = true;
</span><span class="cx"> } else if (m_default && !theme().isDefault(this)) {
</span><span class="cx"> m_default = false;
</span><del>- m_timer.clear();
</del><ins>+ m_timer = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderButton.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "RenderFlexibleBox.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> RenderTextFragment* m_buttonText;
</span><span class="cx"> RenderBlock* m_inner;
</span><span class="cx">
</span><del>- OwnPtr<Timer<RenderButton>> m_timer;
</del><ins>+ std::unique_ptr<Timer<RenderButton>> m_timer;
</ins><span class="cx"> bool m_default;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderCounter.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> typedef HashMap<AtomicString, RefPtr<CounterNode>> CounterMap;
</span><del>-typedef HashMap<const RenderObject*, OwnPtr<CounterMap>> CounterMaps;
</del><ins>+typedef HashMap<const RenderObject*, std::unique_ptr<CounterMap>> CounterMaps;
</ins><span class="cx">
</span><span class="cx"> static CounterNode* makeCounterNode(RenderObject*, const AtomicString& identifier, bool alwaysCreateCounter);
</span><span class="cx">
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> nodeMap = counterMaps().get(element);
</span><span class="cx"> else {
</span><span class="cx"> nodeMap = new CounterMap;
</span><del>- counterMaps().set(element, adoptPtr(nodeMap));
</del><ins>+ counterMaps().set(element, std::unique_ptr<CounterMap>(nodeMap));
</ins><span class="cx"> element->setHasCounterNodeMap(true);
</span><span class="cx"> }
</span><span class="cx"> nodeMap->set(identifier, newNode);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -323,11 +323,11 @@
</span><span class="cx">
</span><span class="cx"> if (needsLayerUpdate) {
</span><span class="cx"> if (!m_layerToRegionMap)
</span><del>- m_layerToRegionMap = adoptPtr(new LayerToRegionMap());
</del><ins>+ m_layerToRegionMap = std::make_unique<LayerToRegionMap>();
</ins><span class="cx"> m_layerToRegionMap->swap(layerToRegionMap);
</span><span class="cx">
</span><span class="cx"> if (!m_regionToLayerListMap)
</span><del>- m_regionToLayerListMap = adoptPtr(new RegionToLayerListMap());
</del><ins>+ m_regionToLayerListMap = std::make_unique<RegionToLayerListMap>();
</ins><span class="cx"> m_regionToLayerListMap->swap(regionToLayerListMap);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -645,7 +645,7 @@
</span><span class="cx"> ASSERT(!region->needsLayout() || region->isRenderRegionSet());
</span><span class="cx">
</span><span class="cx"> // We have no information computed for this region so we need to do it.
</span><del>- OwnPtr<RenderBoxRegionInfo> oldInfo = region->takeRenderBoxRegionInfo(block);
</del><ins>+ std::unique_ptr<RenderBoxRegionInfo> oldInfo = region->takeRenderBoxRegionInfo(block);
</ins><span class="cx"> if (!oldInfo) {
</span><span class="cx"> relayoutChildren = rangeInvalidated;
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -303,10 +303,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Map a layer to the region in which the layer is painted.
</span><del>- OwnPtr<LayerToRegionMap> m_layerToRegionMap;
</del><ins>+ std::unique_ptr<LayerToRegionMap> m_layerToRegionMap;
</ins><span class="cx">
</span><span class="cx"> // Map a region to the list of layers that paint in that region.
</span><del>- OwnPtr<RegionToLayerListMap> m_regionToLayerListMap;
</del><ins>+ std::unique_ptr<RegionToLayerListMap> m_regionToLayerListMap;
</ins><span class="cx">
</span><span class="cx"> // Map a box to the list of regions in which the box is rendered.
</span><span class="cx"> typedef HashMap<const RenderBox*, RenderRegionRange> RenderRegionRangeMap;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGeometryMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGeometryMap.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGeometryMap.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderGeometryMap.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> RenderGeometryMapStep& step = m_mapping[m_insertionPosition];
</span><span class="cx"> if (!t.isIntegerTranslation())
</span><del>- step.m_transform = adoptPtr(new TransformationMatrix(t));
</del><ins>+ step.m_transform = std::make_unique<TransformationMatrix>(t);
</ins><span class="cx"> else
</span><span class="cx"> step.m_offset = LayoutSize(t.e(), t.f());
</span><span class="cx">
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> RenderGeometryMapStep& step = m_mapping[m_insertionPosition];
</span><span class="cx"> step.m_offset = scrollOffset;
</span><span class="cx"> if (t)
</span><del>- step.m_transform = adoptPtr(new TransformationMatrix(*t));
</del><ins>+ step.m_transform = std::make_unique<TransformationMatrix>(*t);
</ins><span class="cx">
</span><span class="cx"> stepInserted(step);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGeometryMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGeometryMap.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGeometryMap.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderGeometryMap.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "LayoutSize.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx"> const RenderObject* m_renderer;
</span><span class="cx"> LayoutSize m_offset;
</span><del>- OwnPtr<TransformationMatrix> m_transform; // Includes offset if non-null.
</del><ins>+ std::unique_ptr<TransformationMatrix> m_transform; // Includes offset if non-null.
</ins><span class="cx"> bool m_accumulatingTransform;
</span><span class="cx"> bool m_isNonUniform; // Mapping depends on the input point, e.g. because of CSS columns.
</span><span class="cx"> bool m_isFixedPosition;
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><del>-// This is required for a struct with OwnPtr. We know RenderGeometryMapStep is simple enough that
</del><ins>+// This is required for a struct with std::unique_ptr<>. We know RenderGeometryMapStep is simple enough that
</ins><span class="cx"> // initializing to 0 and moving with memcpy (and then not destructing the original) will work.
</span><span class="cx"> template<> struct VectorTraits<WebCore::RenderGeometryMapStep> : SimpleClassVectorTraits { };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PassOwnPtr<GridCoordinate> nextEmptyGridArea()
</del><ins>+ std::unique_ptr<GridCoordinate> nextEmptyGridArea()
</ins><span class="cx"> {
</span><span class="cx"> if (m_grid.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> for (; varyingTrackIndex < endOfVaryingTrackIndex; ++varyingTrackIndex) {
</span><span class="cx"> const Vector<RenderBox*>& children = m_grid[m_rowIndex][m_columnIndex];
</span><span class="cx"> if (children.isEmpty()) {
</span><del>- OwnPtr<GridCoordinate> result = adoptPtr(new GridCoordinate(GridSpan(m_rowIndex, m_rowIndex), GridSpan(m_columnIndex, m_columnIndex)));
</del><ins>+ std::unique_ptr<GridCoordinate> result = std::make_unique<GridCoordinate>(GridSpan(m_rowIndex, m_rowIndex), GridSpan(m_columnIndex, m_columnIndex));
</ins><span class="cx"> // Advance the iterator to avoid an infinite loop where we would return the same grid area over and over.
</span><span class="cx"> ++varyingTrackIndex;
</span><del>- return result.release();
</del><ins>+ return std::move(result);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -670,8 +670,8 @@
</span><span class="cx"> for (RenderBox* child = m_orderIterator.first(); child; child = m_orderIterator.next()) {
</span><span class="cx"> // FIXME: We never re-resolve positions if the grid is grown during auto-placement which may lead auto / <integer>
</span><span class="cx"> // positions to not match the author's intent. The specification is unclear on what should be done in this case.
</span><del>- OwnPtr<GridSpan> rowPositions = resolveGridPositionsFromStyle(child, ForRows);
- OwnPtr<GridSpan> columnPositions = resolveGridPositionsFromStyle(child, ForColumns);
</del><ins>+ std::unique_ptr<GridSpan> rowPositions = resolveGridPositionsFromStyle(child, ForRows);
+ std::unique_ptr<GridSpan> columnPositions = resolveGridPositionsFromStyle(child, ForColumns);
</ins><span class="cx"> if (!rowPositions || !columnPositions) {
</span><span class="cx"> GridSpan* majorAxisPositions = (autoPlacementMajorAxisDirection() == ForColumns) ? columnPositions.get() : rowPositions.get();
</span><span class="cx"> if (!majorAxisPositions)
</span><span class="lines">@@ -712,8 +712,8 @@
</span><span class="cx"> orderValues.append(order);
</span><span class="cx">
</span><span class="cx"> // This function bypasses the cache (cachedGridCoordinate()) as it is used to build it.
</span><del>- OwnPtr<GridSpan> rowPositions = resolveGridPositionsFromStyle(child, ForRows);
- OwnPtr<GridSpan> columnPositions = resolveGridPositionsFromStyle(child, ForColumns);
</del><ins>+ std::unique_ptr<GridSpan> rowPositions = resolveGridPositionsFromStyle(child, ForRows);
+ std::unique_ptr<GridSpan> columnPositions = resolveGridPositionsFromStyle(child, ForColumns);
</ins><span class="cx">
</span><span class="cx"> // |positions| is 0 if we need to run the auto-placement algorithm. Our estimation ignores
</span><span class="cx"> // this case as the auto-placement algorithm will grow the grid as needed.
</span><span class="lines">@@ -733,15 +733,15 @@
</span><span class="cx"> void RenderGrid::placeSpecifiedMajorAxisItemsOnGrid(Vector<RenderBox*> autoGridItems)
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < autoGridItems.size(); ++i) {
</span><del>- OwnPtr<GridSpan> majorAxisPositions = resolveGridPositionsFromStyle(autoGridItems[i], autoPlacementMajorAxisDirection());
</del><ins>+ std::unique_ptr<GridSpan> majorAxisPositions = resolveGridPositionsFromStyle(autoGridItems[i], autoPlacementMajorAxisDirection());
</ins><span class="cx"> GridIterator iterator(m_grid, autoPlacementMajorAxisDirection(), majorAxisPositions->initialPositionIndex);
</span><del>- if (OwnPtr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</del><ins>+ if (std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</ins><span class="cx"> insertItemIntoGrid(autoGridItems[i], emptyGridArea->rows.initialPositionIndex, emptyGridArea->columns.initialPositionIndex);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> growGrid(autoPlacementMinorAxisDirection());
</span><del>- OwnPtr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea();
</del><ins>+ std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea();
</ins><span class="cx"> ASSERT(emptyGridArea);
</span><span class="cx"> insertItemIntoGrid(autoGridItems[i], emptyGridArea->rows.initialPositionIndex, emptyGridArea->columns.initialPositionIndex);
</span><span class="cx"> }
</span><span class="lines">@@ -755,13 +755,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::placeAutoMajorAxisItemOnGrid(RenderBox* gridItem)
</span><span class="cx"> {
</span><del>- OwnPtr<GridSpan> minorAxisPositions = resolveGridPositionsFromStyle(gridItem, autoPlacementMinorAxisDirection());
</del><ins>+ std::unique_ptr<GridSpan> minorAxisPositions = resolveGridPositionsFromStyle(gridItem, autoPlacementMinorAxisDirection());
</ins><span class="cx"> ASSERT(!resolveGridPositionsFromStyle(gridItem, autoPlacementMajorAxisDirection()));
</span><span class="cx"> size_t minorAxisIndex = 0;
</span><span class="cx"> if (minorAxisPositions) {
</span><span class="cx"> minorAxisIndex = minorAxisPositions->initialPositionIndex;
</span><span class="cx"> GridIterator iterator(m_grid, autoPlacementMinorAxisDirection(), minorAxisIndex);
</span><del>- if (OwnPtr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</del><ins>+ if (std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</ins><span class="cx"> insertItemIntoGrid(gridItem, emptyGridArea->rows.initialPositionIndex, emptyGridArea->columns.initialPositionIndex);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> const size_t endOfMajorAxis = (autoPlacementMajorAxisDirection() == ForColumns) ? gridColumnCount() : gridRowCount();
</span><span class="cx"> for (size_t majorAxisIndex = 0; majorAxisIndex < endOfMajorAxis; ++majorAxisIndex) {
</span><span class="cx"> GridIterator iterator(m_grid, autoPlacementMajorAxisDirection(), majorAxisIndex);
</span><del>- if (OwnPtr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</del><ins>+ if (std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea()) {
</ins><span class="cx"> insertItemIntoGrid(gridItem, emptyGridArea->rows.initialPositionIndex, emptyGridArea->columns.initialPositionIndex);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> adjustNamedGridItemPosition(finalPosition, finalPositionSide);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GridSpan> RenderGrid::resolveGridPositionsFromStyle(const RenderBox* gridItem, GridTrackSizingDirection direction) const
</del><ins>+std::unique_ptr<GridSpan> RenderGrid::resolveGridPositionsFromStyle(const RenderBox* gridItem, GridTrackSizingDirection direction) const
</ins><span class="cx"> {
</span><span class="cx"> GridPosition initialPosition = (direction == ForColumns) ? gridItem->style().gridItemColumnStart() : gridItem->style().gridItemRowStart();
</span><span class="cx"> const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide;
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx">
</span><span class="cx"> if (initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition()) {
</span><span class="cx"> if (style().gridAutoFlow() == AutoFlowNone)
</span><del>- return adoptPtr(new GridSpan(0, 0));
</del><ins>+ return std::make_unique<GridSpan>(0, 0);
</ins><span class="cx">
</span><span class="cx"> // We can't get our grid positions without running the auto placement algorithm.
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -984,7 +984,7 @@
</span><span class="cx"> if (resolvedFinalPosition < resolvedInitialPosition)
</span><span class="cx"> resolvedFinalPosition = resolvedInitialPosition;
</span><span class="cx">
</span><del>- return adoptPtr(new GridSpan(resolvedInitialPosition, resolvedFinalPosition));
</del><ins>+ return std::make_unique<GridSpan>(resolvedInitialPosition, resolvedFinalPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t RenderGrid::resolveNamedGridLinePositionFromStyle(const GridPosition& position, GridPositionSide side) const
</span><span class="lines">@@ -1059,10 +1059,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GridSpan> RenderGrid::resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const
</del><ins>+std::unique_ptr<GridSpan> RenderGrid::resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const
</ins><span class="cx"> {
</span><span class="cx"> if (position.isAuto())
</span><del>- return GridSpan::create(resolvedOppositePosition, resolvedOppositePosition);
</del><ins>+ return std::make_unique<GridSpan>(resolvedOppositePosition, resolvedOppositePosition);
</ins><span class="cx">
</span><span class="cx"> ASSERT(position.isSpan());
</span><span class="cx"> ASSERT(position.spanPosition() > 0);
</span><span class="lines">@@ -1077,13 +1077,13 @@
</span><span class="cx"> size_t positionOffset = position.spanPosition() - 1;
</span><span class="cx"> if (side == ColumnStartSide || side == RowStartSide) {
</span><span class="cx"> size_t initialResolvedPosition = std::max<int>(0, resolvedOppositePosition - positionOffset);
</span><del>- return GridSpan::create(initialResolvedPosition, resolvedOppositePosition);
</del><ins>+ return std::make_unique<GridSpan>(initialResolvedPosition, resolvedOppositePosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return GridSpan::create(resolvedOppositePosition, resolvedOppositePosition + positionOffset);
</del><ins>+ return std::make_unique<GridSpan>(resolvedOppositePosition, resolvedOppositePosition + positionOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GridSpan> RenderGrid::resolveNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const
</del><ins>+std::unique_ptr<GridSpan> RenderGrid::resolveNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, GridPositionSide side) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(position.isSpan());
</span><span class="cx"> ASSERT(!position.namedGridLine().isNull());
</span><span class="lines">@@ -1096,7 +1096,7 @@
</span><span class="cx"> // If there is no named grid line of that name, we resolve the position to 'auto' (which is equivalent to 'span 1' in this case).
</span><span class="cx"> // See http://lists.w3.org/Archives/Public/www-style/2013Jun/0394.html.
</span><span class="cx"> if (it == gridLinesNames.end())
</span><del>- return GridSpan::create(resolvedOppositePosition, resolvedOppositePosition);
</del><ins>+ return std::make_unique<GridSpan>(resolvedOppositePosition, resolvedOppositePosition);
</ins><span class="cx">
</span><span class="cx"> if (side == RowStartSide || side == ColumnStartSide)
</span><span class="cx"> return resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition(resolvedOppositePosition, position, it->value);
</span><span class="lines">@@ -1120,16 +1120,16 @@
</span><span class="cx"> return firstLineBeforePositionIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GridSpan> RenderGrid::resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, const Vector<size_t>& gridLines) const
</del><ins>+std::unique_ptr<GridSpan> RenderGrid::resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, const Vector<size_t>& gridLines) const
</ins><span class="cx"> {
</span><span class="cx"> size_t gridLineIndex = std::max<int>(0, firstNamedGridLineBeforePosition(resolvedOppositePosition, gridLines) - position.spanPosition() + 1);
</span><span class="cx"> size_t resolvedGridLinePosition = gridLines[gridLineIndex];
</span><span class="cx"> if (resolvedGridLinePosition > resolvedOppositePosition)
</span><span class="cx"> resolvedGridLinePosition = resolvedOppositePosition;
</span><del>- return GridSpan::create(resolvedGridLinePosition, resolvedOppositePosition);
</del><ins>+ return std::make_unique<GridSpan>(resolvedGridLinePosition, resolvedOppositePosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GridSpan> RenderGrid::resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, const Vector<size_t>& gridLines) const
</del><ins>+std::unique_ptr<GridSpan> RenderGrid::resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition& position, const Vector<size_t>& gridLines) const
</ins><span class="cx"> {
</span><span class="cx"> size_t firstLineAfterOppositePositionIndex = gridLines.size() - 1;
</span><span class="cx"> const size_t* firstLineAfterOppositePosition = std::upper_bound(gridLines.begin(), gridLines.end(), resolvedOppositePosition);
</span><span class="lines">@@ -1140,7 +1140,7 @@
</span><span class="cx"> size_t resolvedGridLinePosition = GridPosition::adjustGridPositionForRowEndColumnEndSide(gridLines[gridLineIndex]);
</span><span class="cx"> if (resolvedGridLinePosition < resolvedOppositePosition)
</span><span class="cx"> resolvedGridLinePosition = resolvedOppositePosition;
</span><del>- return GridSpan::create(resolvedOppositePosition, resolvedGridLinePosition);
</del><ins>+ return std::make_unique<GridSpan>(resolvedOppositePosition, resolvedGridLinePosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDirection direction, const Vector<GridTrack>& tracks) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx"> GridSpan resolveGridPositionsFromAutoPlacementPosition(const RenderBox*, GridTrackSizingDirection, size_t) const;
</span><span class="cx"> void adjustNamedGridItemPosition(GridPosition&, GridPositionSide) const;
</span><span class="cx"> void adjustGridPositionsFromStyle(GridPosition& initialPosition, GridPosition& finalPosition, GridPositionSide initialPositionSide, GridPositionSide finalPositionSide) const;
</span><del>- PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTrackSizingDirection) const;
</del><ins>+ std::unique_ptr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTrackSizingDirection) const;
</ins><span class="cx"> size_t resolveNamedGridLinePositionFromStyle(const GridPosition&, GridPositionSide) const;
</span><span class="cx"> size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) const;
</span><del>- PassOwnPtr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;
- PassOwnPtr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;
- PassOwnPtr<GridSpan> resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>&) const;
- PassOwnPtr<GridSpan> resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>&) const;
</del><ins>+ std::unique_ptr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;
+ std::unique_ptr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;
+ std::unique_ptr<GridSpan> resolveRowStartColumnStartNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>&) const;
+ std::unique_ptr<GridSpan> resolveRowEndColumnEndNamedGridLinePositionAgainstOppositePosition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>&) const;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResource.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderImageResource.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "StyleImage.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -617,8 +617,8 @@
</span><span class="cx"> ASSERT(!m_normalFlowListDirty);
</span><span class="cx"> ASSERT(!m_zOrderListsDirty);
</span><span class="cx">
</span><del>- OwnPtr<Vector<RenderLayer*>> posZOrderList;
- OwnPtr<Vector<RenderLayer*>> negZOrderList;
</del><ins>+ std::unique_ptr<Vector<RenderLayer*>> posZOrderList;
+ std::unique_ptr<Vector<RenderLayer*>> negZOrderList;
</ins><span class="cx"> rebuildZOrderLists(StopAtStackingContexts, posZOrderList, negZOrderList);
</span><span class="cx">
</span><span class="cx"> // Create a reverse lookup.
</span><span class="lines">@@ -864,12 +864,12 @@
</span><span class="cx"> bool hasTransform = renderer().hasTransform() && renderer().style().hasTransform();
</span><span class="cx"> bool had3DTransform = has3DTransform();
</span><span class="cx">
</span><del>- bool hadTransform = m_transform;
</del><ins>+ bool hadTransform = !!m_transform;
</ins><span class="cx"> if (hasTransform != hadTransform) {
</span><span class="cx"> if (hasTransform)
</span><del>- m_transform = adoptPtr(new TransformationMatrix);
</del><ins>+ m_transform = std::make_unique<TransformationMatrix>();
</ins><span class="cx"> else
</span><del>- m_transform.clear();
</del><ins>+ m_transform = nullptr;
</ins><span class="cx">
</span><span class="cx"> // Layers with transforms act as clip rects roots, so clear the cached clip rects here.
</span><span class="cx"> clearClipRectsIncludingDescendants();
</span><span class="lines">@@ -3927,7 +3927,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx">
</span><del>-PassOwnPtr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
</del><ins>+std::unique_ptr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
</ins><span class="cx"> {
</span><span class="cx"> if (context->paintingDisabled())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -3940,7 +3940,7 @@
</span><span class="cx"> if (!hasPaintedFilter)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- OwnPtr<FilterEffectRendererHelper> filterPainter = adoptPtr(new FilterEffectRendererHelper(hasPaintedFilter));
</del><ins>+ auto filterPainter = std::make_unique<FilterEffectRendererHelper>(hasPaintedFilter);
</ins><span class="cx"> if (!filterPainter->haveFilterEffect())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -3967,7 +3967,7 @@
</span><span class="cx"> // Otherwise, if for example this layer has overflow:hidden, a drop shadow will not compute correctly.
</span><span class="cx"> // Note that we will still apply the clipping on the final rendering of the filter.
</span><span class="cx"> paintingInfo.clipToDirtyRect = !filterInfo->renderer()->hasFilterThatMovesPixels();
</span><del>- return filterPainter.release();
</del><ins>+ return std::move(filterPainter);
</ins><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -4072,7 +4072,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContext* transparencyLayerContext = context;
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- OwnPtr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</del><ins>+ std::unique_ptr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</ins><span class="cx"> if (filterPainter) {
</span><span class="cx"> context = filterPainter->filterContext();
</span><span class="cx"> if (context != transparencyLayerContext && haveTransparency) {
</span><span class="lines">@@ -4160,7 +4160,7 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> if (filterPainter) {
</span><span class="cx"> context = applyFilters(filterPainter.get(), transparencyLayerContext, localPaintingInfo, layerFragments);
</span><del>- filterPainter.clear();
</del><ins>+ filterPainter = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -4577,16 +4577,16 @@
</span><span class="cx"> TransformationMatrix newTransform(oldTransform);
</span><span class="cx"> newTransform.translateRight(roundToInt(offset.width()), roundToInt(offset.height()));
</span><span class="cx">
</span><del>- childLayer->m_transform = adoptPtr(new TransformationMatrix(newTransform));
</del><ins>+ childLayer->m_transform = std::make_unique<TransformationMatrix>(newTransform);
</ins><span class="cx">
</span><span class="cx"> LayerPaintingInfo localPaintingInfo(paintingInfo);
</span><span class="cx"> localPaintingInfo.paintDirtyRect = localDirtyRect;
</span><span class="cx"> childLayer->paintLayer(context, localPaintingInfo, paintFlags);
</span><span class="cx">
</span><span class="cx"> if (oldHasTransform)
</span><del>- childLayer->m_transform = adoptPtr(new TransformationMatrix(oldTransform));
</del><ins>+ childLayer->m_transform = std::make_unique<TransformationMatrix>(oldTransform);
</ins><span class="cx"> else
</span><del>- childLayer->m_transform.clear();
</del><ins>+ childLayer->m_transform = nullptr;
</ins><span class="cx"> } else {
</span><span class="cx"> // Adjust the transform such that the renderer's upper left corner will paint at (0,0) in user space.
</span><span class="cx"> // This involves subtracting out the position of the layer in our current coordinate space.
</span><span class="lines">@@ -5231,12 +5231,12 @@
</span><span class="cx"> TransformationMatrix newTransform(oldTransform);
</span><span class="cx"> newTransform.translateRight(offset.width(), offset.height());
</span><span class="cx">
</span><del>- childLayer->m_transform = adoptPtr(new TransformationMatrix(newTransform));
</del><ins>+ childLayer->m_transform = std::make_unique<TransformationMatrix>(newTransform);
</ins><span class="cx"> hitLayer = childLayer->hitTestLayer(rootLayer, columnLayers[0], request, result, localClipRect, hitTestLocation, false, transformState, zOffset);
</span><span class="cx"> if (oldHasTransform)
</span><del>- childLayer->m_transform = adoptPtr(new TransformationMatrix(oldTransform));
</del><ins>+ childLayer->m_transform = std::make_unique<TransformationMatrix>(oldTransform);
</ins><span class="cx"> else
</span><del>- childLayer->m_transform.clear();
</del><ins>+ childLayer->m_transform = nullptr;
</ins><span class="cx"> } else {
</span><span class="cx"> // Adjust the transform such that the renderer's upper left corner will be at (0,0) in user space.
</span><span class="cx"> // This involves subtracting out the position of the layer in our current coordinate space.
</span><span class="lines">@@ -5294,7 +5294,7 @@
</span><span class="cx"> calculateClipRects(clipRectsContext, clipRects);
</span><span class="cx">
</span><span class="cx"> if (!m_clipRectsCache)
</span><del>- m_clipRectsCache = adoptPtr(new ClipRectsCache);
</del><ins>+ m_clipRectsCache = std::make_unique<ClipRectsCache>();
</ins><span class="cx">
</span><span class="cx"> if (parentLayer && parentLayer->clipRects(clipRectsContext) && clipRects == *parentLayer->clipRects(clipRectsContext))
</span><span class="cx"> m_clipRectsCache->setClipRects(clipRectsType, clipRectsContext.respectOverflowClip, parentLayer->clipRects(clipRectsContext));
</span><span class="lines">@@ -5924,7 +5924,7 @@
</span><span class="cx"> RenderLayerBacking* RenderLayer::ensureBacking()
</span><span class="cx"> {
</span><span class="cx"> if (!m_backing) {
</span><del>- m_backing = adoptPtr(new RenderLayerBacking(*this));
</del><ins>+ m_backing = std::make_unique<RenderLayerBacking>(*this);
</ins><span class="cx"> compositor().layerBecameComposited(*this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="lines">@@ -5941,7 +5941,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_backing && !renderer().documentBeingDestroyed())
</span><span class="cx"> compositor().layerBecameNonComposited(*this);
</span><del>- m_backing.clear();
</del><ins>+ m_backing = nullptr;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> if (!layerBeingDestroyed)
</span><span class="lines">@@ -6115,7 +6115,7 @@
</span><span class="cx"> m_zOrderListsDirty = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::rebuildZOrderLists(CollectLayersBehavior behavior, OwnPtr<Vector<RenderLayer*>>& posZOrderList, OwnPtr<Vector<RenderLayer*>>& negZOrderList)
</del><ins>+void RenderLayer::rebuildZOrderLists(CollectLayersBehavior behavior, std::unique_ptr<Vector<RenderLayer*>>& posZOrderList, std::unique_ptr<Vector<RenderLayer*>>& negZOrderList)
</ins><span class="cx"> {
</span><span class="cx"> bool includeHiddenLayers = compositor().inCompositingMode();
</span><span class="cx"> for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
</span><span class="lines">@@ -6141,7 +6141,7 @@
</span><span class="cx"> // Ignore non-overflow layers and reflections.
</span><span class="cx"> if (child->isNormalFlowOnly() && (!m_reflection || reflectionLayer() != child)) {
</span><span class="cx"> if (!m_normalFlowList)
</span><del>- m_normalFlowList = adoptPtr(new Vector<RenderLayer*>);
</del><ins>+ m_normalFlowList = std::make_unique<Vector<RenderLayer*>>();
</ins><span class="cx"> m_normalFlowList->append(child);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -6149,7 +6149,7 @@
</span><span class="cx"> m_normalFlowListDirty = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::collectLayers(bool includeHiddenLayers, CollectLayersBehavior behavior, OwnPtr<Vector<RenderLayer*>>& posBuffer, OwnPtr<Vector<RenderLayer*>>& negBuffer)
</del><ins>+void RenderLayer::collectLayers(bool includeHiddenLayers, CollectLayersBehavior behavior, std::unique_ptr<Vector<RenderLayer*>>& posBuffer, std::unique_ptr<Vector<RenderLayer*>>& negBuffer)
</ins><span class="cx"> {
</span><span class="cx"> updateDescendantDependentFlags();
</span><span class="cx">
</span><span class="lines">@@ -6158,11 +6158,11 @@
</span><span class="cx"> bool includeHiddenLayer = includeHiddenLayers || (m_hasVisibleContent || (m_hasVisibleDescendant && isStacking));
</span><span class="cx"> if (includeHiddenLayer && !isNormalFlowOnly()) {
</span><span class="cx"> // Determine which buffer the child should be in.
</span><del>- OwnPtr<Vector<RenderLayer*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
</del><ins>+ std::unique_ptr<Vector<RenderLayer*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
</ins><span class="cx">
</span><span class="cx"> // Create the buffer if it doesn't exist yet.
</span><span class="cx"> if (!buffer)
</span><del>- buffer = adoptPtr(new Vector<RenderLayer*>);
</del><ins>+ buffer = std::make_unique<Vector<RenderLayer*>>();
</ins><span class="cx">
</span><span class="cx"> // Append ourselves at the end of the appropriate buffer.
</span><span class="cx"> buffer->append(this);
</span><span class="lines">@@ -6551,11 +6551,11 @@
</span><span class="cx">
</span><span class="cx"> if (renderer().style().overflowX() == OMARQUEE && renderer().style().marqueeBehavior() != MNONE && renderer().isBox()) {
</span><span class="cx"> if (!m_marquee)
</span><del>- m_marquee = adoptPtr(new RenderMarquee(this));
</del><ins>+ m_marquee = std::make_unique<RenderMarquee>(this);
</ins><span class="cx"> m_marquee->updateMarqueeStyle();
</span><span class="cx"> }
</span><span class="cx"> else if (m_marquee) {
</span><del>- m_marquee.clear();
</del><ins>+ m_marquee = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateScrollbarsAfterStyleChange(oldStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderPtr.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx">
</span><span class="cx"> void updateZOrderLists();
</span><span class="cx"> void rebuildZOrderLists();
</span><del>- void rebuildZOrderLists(CollectLayersBehavior, OwnPtr<Vector<RenderLayer*>>&, OwnPtr<Vector<RenderLayer*>>&);
</del><ins>+ void rebuildZOrderLists(CollectLayersBehavior, std::unique_ptr<Vector<RenderLayer*>>&, std::unique_ptr<Vector<RenderLayer*>>&);
</ins><span class="cx"> void clearZOrderLists();
</span><span class="cx">
</span><span class="cx"> void updateNormalFlowList();
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutPoint renderBoxLocation() const { return renderer().isBox() ? toRenderBox(renderer()).location() : LayoutPoint(); }
</span><span class="cx">
</span><del>- void collectLayers(bool includeHiddenLayers, CollectLayersBehavior, OwnPtr<Vector<RenderLayer*>>&, OwnPtr<Vector<RenderLayer*>>&);
</del><ins>+ void collectLayers(bool includeHiddenLayers, CollectLayersBehavior, std::unique_ptr<Vector<RenderLayer*>>&, std::unique_ptr<Vector<RenderLayer*>>&);
</ins><span class="cx">
</span><span class="cx"> void updateCompositingAndLayerListsIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> bool setupFontSubpixelQuantization(GraphicsContext*, bool& didQuantizeFonts);
</span><span class="cx"> bool setupClipPath(GraphicsContext*, const LayerPaintingInfo&, const LayoutPoint& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- PassOwnPtr<FilterEffectRendererHelper> setupFilters(GraphicsContext*, LayerPaintingInfo&, PaintLayerFlags, const LayoutPoint& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</del><ins>+ std::unique_ptr<FilterEffectRendererHelper> setupFilters(GraphicsContext*, LayerPaintingInfo&, PaintLayerFlags, const LayoutPoint& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</ins><span class="cx"> GraphicsContext* applyFilters(FilterEffectRendererHelper*, GraphicsContext* originalContext, LayerPaintingInfo&, LayerFragments&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1325,24 +1325,24 @@
</span><span class="cx"> // descendant layers within the stacking context that have z-indices of 0 or greater
</span><span class="cx"> // (auto will count as 0). m_negZOrderList holds descendants within our stacking context with negative
</span><span class="cx"> // z-indices.
</span><del>- OwnPtr<Vector<RenderLayer*>> m_posZOrderList;
- OwnPtr<Vector<RenderLayer*>> m_negZOrderList;
</del><ins>+ std::unique_ptr<Vector<RenderLayer*>> m_posZOrderList;
+ std::unique_ptr<Vector<RenderLayer*>> m_negZOrderList;
</ins><span class="cx">
</span><span class="cx"> // This list contains child layers that cannot create stacking contexts. For now it is just
</span><span class="cx"> // overflow layers, but that may change in the future.
</span><del>- OwnPtr<Vector<RenderLayer*>> m_normalFlowList;
</del><ins>+ std::unique_ptr<Vector<RenderLayer*>> m_normalFlowList;
</ins><span class="cx">
</span><del>- OwnPtr<ClipRectsCache> m_clipRectsCache;
</del><ins>+ std::unique_ptr<ClipRectsCache> m_clipRectsCache;
</ins><span class="cx">
</span><span class="cx"> IntPoint m_cachedOverlayScrollbarOffset;
</span><span class="cx">
</span><del>- OwnPtr<RenderMarquee> m_marquee; // Used by layers with overflow:marquee
</del><ins>+ std::unique_ptr<RenderMarquee> m_marquee; // Used by layers with overflow:marquee
</ins><span class="cx">
</span><span class="cx"> // Cached normal flow values for absolute positioned elements with static left/top values.
</span><span class="cx"> LayoutUnit m_staticInlinePosition;
</span><span class="cx"> LayoutUnit m_staticBlockPosition;
</span><span class="cx">
</span><del>- OwnPtr<TransformationMatrix> m_transform;
</del><ins>+ std::unique_ptr<TransformationMatrix> m_transform;
</ins><span class="cx">
</span><span class="cx"> // May ultimately be extended to many replicas (with their own paint order).
</span><span class="cx"> RenderPtr<RenderReplica> m_reflection;
</span><span class="lines">@@ -1356,7 +1356,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect m_blockSelectionGapsBounds;
</span><span class="cx">
</span><del>- OwnPtr<RenderLayerBacking> m_backing;
</del><ins>+ std::unique_ptr<RenderLayerBacking> m_backing;
</ins><span class="cx">
</span><span class="cx"> class FilterInfo;
</span><span class="cx"> };
</span><span class="lines">@@ -1365,8 +1365,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isStackingContainer());
</span><span class="cx">
</span><del>- m_posZOrderList.clear();
- m_negZOrderList.clear();
</del><ins>+ m_posZOrderList = nullptr;
+ m_negZOrderList = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void RenderLayer::updateZOrderLists()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> if (Page* page = this->page())
</span><span class="cx"> displayID = page->chrome().displayID();
</span><span class="cx">
</span><del>- m_layerUpdater = adoptPtr(new GraphicsLayerUpdater(this, displayID));
</del><ins>+ m_layerUpdater = std::make_unique<GraphicsLayerUpdater>(this, displayID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_layerUpdater->scheduleUpdate();
</span><span class="lines">@@ -3542,7 +3542,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-typedef HashMap<PlatformLayer*, OwnPtr<ViewportConstraints>> LayerMap;
</del><ins>+typedef HashMap<PlatformLayer*, std::unique_ptr<ViewportConstraints>> LayerMap;
</ins><span class="cx"> typedef HashMap<PlatformLayer*, PlatformLayer*> StickyContainerMap;
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::registerAllViewportConstrainedLayers()
</span><span class="lines">@@ -3574,7 +3574,7 @@
</span><span class="cx"> else
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- layerMap.add(layer.backing()->graphicsLayer()->platformLayer(), adoptPtr(constraints.release()));
</del><ins>+ layerMap.add(layer.backing()->graphicsLayer()->platformLayer(), std::move(constraints));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ChromeClient* client = this->chromeClient())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_layerForFooter;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</del><ins>+ std::unique_ptr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</ins><span class="cx">
</span><span class="cx"> Timer<RenderLayerCompositor> m_layerFlushTimer;
</span><span class="cx"> bool m_layerFlushThrottlingEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-HashMap<const RenderLayer*, OwnPtr<RenderLayer::FilterInfo>>& RenderLayer::FilterInfo::map()
</del><ins>+HashMap<const RenderLayer*, std::unique_ptr<RenderLayer::FilterInfo>>& RenderLayer::FilterInfo::map()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashMap<const RenderLayer*, OwnPtr<FilterInfo>>> map;
</del><ins>+ static NeverDestroyed<HashMap<const RenderLayer*, std::unique_ptr<FilterInfo>>> map;
</ins><span class="cx"> return map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -60,9 +60,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(layer.m_hasFilterInfo == map().contains(&layer));
</span><span class="cx">
</span><del>- OwnPtr<FilterInfo>& info = map().add(&layer, nullptr).iterator->value;
</del><ins>+ auto& info = map().add(&layer, nullptr).iterator->value;
</ins><span class="cx"> if (!info) {
</span><del>- info = adoptPtr(new FilterInfo(layer));
</del><ins>+ info = std::make_unique<FilterInfo>(layer);
</ins><span class="cx"> layer.m_hasFilterInfo = true;
</span><span class="cx"> }
</span><span class="cx"> return *info;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -48,6 +49,9 @@
</span><span class="cx"> static FilterInfo* getIfExists(const RenderLayer&);
</span><span class="cx"> static void remove(RenderLayer&);
</span><span class="cx">
</span><ins>+ explicit FilterInfo(RenderLayer&);
+ ~FilterInfo();
+
</ins><span class="cx"> const LayoutRect& dirtySourceRect() const { return m_dirtySourceRect; }
</span><span class="cx"> void expandDirtySourceRect(const LayoutRect& rect) { m_dirtySourceRect.unite(rect); }
</span><span class="cx"> void resetDirtySourceRect() { m_dirtySourceRect = LayoutRect(); }
</span><span class="lines">@@ -59,16 +63,13 @@
</span><span class="cx"> void removeReferenceFilterClients();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit FilterInfo(RenderLayer&);
- ~FilterInfo();
-
</del><span class="cx"> Element* layerElement() const;
</span><span class="cx">
</span><span class="cx"> friend void WTF::deleteOwnedPtr<FilterInfo>(FilterInfo*);
</span><span class="cx">
</span><span class="cx"> virtual void notifyFinished(CachedResource*) override;
</span><span class="cx">
</span><del>- static HashMap<const RenderLayer*, OwnPtr<FilterInfo>>& map();
</del><ins>+ static HashMap<const RenderLayer*, std::unique_ptr<FilterInfo>>& map();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #pragma clang diagnostic push
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -334,11 +334,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isValid());
</span><span class="cx">
</span><del>- OwnPtr<RenderBoxRegionInfo>& boxInfo = m_renderBoxRegionInfo.add(box, adoptPtr(new RenderBoxRegionInfo(logicalLeftInset, logicalRightInset, containingBlockChainIsInset))).iterator->value;
</del><ins>+ std::unique_ptr<RenderBoxRegionInfo>& boxInfo = m_renderBoxRegionInfo.add(box, std::make_unique<RenderBoxRegionInfo>(logicalLeftInset, logicalRightInset, containingBlockChainIsInset)).iterator->value;
</ins><span class="cx"> return boxInfo.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OwnPtr<RenderBoxRegionInfo> RenderRegion::takeRenderBoxRegionInfo(const RenderBox* box)
</del><ins>+std::unique_ptr<RenderBoxRegionInfo> RenderRegion::takeRenderBoxRegionInfo(const RenderBox* box)
</ins><span class="cx"> {
</span><span class="cx"> return m_renderBoxRegionInfo.take(box);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderRegion.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><span class="cx"> #include "VisiblePosition.h"
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx"> RenderBoxRegionInfo* renderBoxRegionInfo(const RenderBox*) const;
</span><span class="cx"> RenderBoxRegionInfo* setRenderBoxRegionInfo(const RenderBox*, LayoutUnit logicalLeftInset, LayoutUnit logicalRightInset,
</span><span class="cx"> bool containingBlockChainIsInset);
</span><del>- OwnPtr<RenderBoxRegionInfo> takeRenderBoxRegionInfo(const RenderBox*);
</del><ins>+ std::unique_ptr<RenderBoxRegionInfo> takeRenderBoxRegionInfo(const RenderBox*);
</ins><span class="cx"> void removeRenderBoxRegionInfo(const RenderBox*);
</span><span class="cx">
</span><span class="cx"> void deleteAllRenderBoxRegionInfo();
</span><span class="lines">@@ -172,7 +173,7 @@
</span><span class="cx"> // A RenderBoxRegionInfo* tells us about any layout information for a RenderBox that
</span><span class="cx"> // is unique to the region. For now it just holds logical width information for RenderBlocks, but eventually
</span><span class="cx"> // it will also hold a custom style for any box (for region styling).
</span><del>- typedef HashMap<const RenderBox*, OwnPtr<RenderBoxRegionInfo>> RenderBoxRegionInfoMap;
</del><ins>+ typedef HashMap<const RenderBox*, std::unique_ptr<RenderBoxRegionInfo>> RenderBoxRegionInfoMap;
</ins><span class="cx"> RenderBoxRegionInfoMap m_renderBoxRegionInfo;
</span><span class="cx">
</span><span class="cx"> bool m_isValid : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -113,9 +113,9 @@
</span><span class="cx"> // According to the CSS2 spec, you only use fixed table layout if an
</span><span class="cx"> // explicit width is specified on the table. Auto width implies auto table layout.
</span><span class="cx"> if (style().tableLayout() == TFIXED && !style().logicalWidth().isAuto())
</span><del>- m_tableLayout = adoptPtr(new FixedTableLayout(this));
</del><ins>+ m_tableLayout = std::make_unique<FixedTableLayout>(this);
</ins><span class="cx"> else
</span><del>- m_tableLayout = adoptPtr(new AutoTableLayout(this));
</del><ins>+ m_tableLayout = std::make_unique<AutoTableLayout>(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If border was changed, invalidate collapsed borders cache.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CollapsedBorderValue.h"
</span><span class="cx"> #include "RenderBlock.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -340,7 +341,7 @@
</span><span class="cx"> mutable RenderTableSection* m_foot;
</span><span class="cx"> mutable RenderTableSection* m_firstBody;
</span><span class="cx">
</span><del>- OwnPtr<TableLayout> m_tableLayout;
</del><ins>+ std::unique_ptr<TableLayout> m_tableLayout;
</ins><span class="cx">
</span><span class="cx"> CollapsedBorderValues m_collapsedBorders;
</span><span class="cx"> const CollapsedBorderValue* m_currentBorder;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect RenderView::selectionBounds(bool clipToVisibleContent) const
</span><span class="cx"> {
</span><del>- typedef HashMap<RenderObject*, OwnPtr<RenderSelectionInfo>> SelectionMap;
</del><ins>+ typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectionMap;
</ins><span class="cx"> SelectionMap selectedObjects;
</span><span class="cx">
</span><span class="cx"> RenderObject* os = m_selectionStart;
</span><span class="lines">@@ -667,13 +667,13 @@
</span><span class="cx"> while (os && os != stop) {
</span><span class="cx"> if ((os->canBeSelectionLeaf() || os == m_selectionStart || os == m_selectionEnd) && os->selectionState() != SelectionNone) {
</span><span class="cx"> // Blocks are responsible for painting line gaps and margin gaps. They must be examined as well.
</span><del>- selectedObjects.set(os, adoptPtr(new RenderSelectionInfo(os, clipToVisibleContent)));
</del><ins>+ selectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, clipToVisibleContent));
</ins><span class="cx"> RenderBlock* cb = os->containingBlock();
</span><span class="cx"> while (cb && !cb->isRenderView()) {
</span><del>- OwnPtr<RenderSelectionInfo>& blockInfo = selectedObjects.add(cb, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<RenderSelectionInfo>& blockInfo = selectedObjects.add(cb, nullptr).iterator->value;
</ins><span class="cx"> if (blockInfo)
</span><span class="cx"> break;
</span><del>- blockInfo = adoptPtr(new RenderSelectionInfo(cb, clipToVisibleContent));
</del><ins>+ blockInfo = std::make_unique<RenderSelectionInfo>(cb, clipToVisibleContent);
</ins><span class="cx"> cb = cb->containingBlock();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -773,14 +773,14 @@
</span><span class="cx"> int oldEndPos = m_selectionEndPos;
</span><span class="cx">
</span><span class="cx"> // Objects each have a single selection rect to examine.
</span><del>- typedef HashMap<RenderObject*, OwnPtr<RenderSelectionInfo>> SelectedObjectMap;
</del><ins>+ typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectedObjectMap;
</ins><span class="cx"> SelectedObjectMap oldSelectedObjects;
</span><span class="cx"> SelectedObjectMap newSelectedObjects;
</span><span class="cx">
</span><span class="cx"> // Blocks contain selected objects and fill gaps between them, either on the left, right, or in between lines and blocks.
</span><span class="cx"> // In order to get the repaint rect right, we have to examine left, middle, and right rects individually, since otherwise
</span><span class="cx"> // the union of those rects might remain the same even when changes have occurred.
</span><del>- typedef HashMap<RenderBlock*, OwnPtr<RenderBlockSelectionInfo>> SelectedBlockMap;
</del><ins>+ typedef HashMap<RenderBlock*, std::unique_ptr<RenderBlockSelectionInfo>> SelectedBlockMap;
</ins><span class="cx"> SelectedBlockMap oldSelectedBlocks;
</span><span class="cx"> SelectedBlockMap newSelectedBlocks;
</span><span class="cx">
</span><span class="lines">@@ -791,14 +791,14 @@
</span><span class="cx"> while (continueExploring) {
</span><span class="cx"> if ((os->canBeSelectionLeaf() || os == m_selectionStart || os == m_selectionEnd) && os->selectionState() != SelectionNone) {
</span><span class="cx"> // Blocks are responsible for painting line gaps and margin gaps. They must be examined as well.
</span><del>- oldSelectedObjects.set(os, adoptPtr(new RenderSelectionInfo(os, true)));
</del><ins>+ oldSelectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, true));
</ins><span class="cx"> if (blockRepaintMode == RepaintNewXOROld) {
</span><span class="cx"> RenderBlock* cb = os->containingBlock();
</span><span class="cx"> while (cb && !cb->isRenderView()) {
</span><del>- OwnPtr<RenderBlockSelectionInfo>& blockInfo = oldSelectedBlocks.add(cb, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = oldSelectedBlocks.add(cb, nullptr).iterator->value;
</ins><span class="cx"> if (blockInfo)
</span><span class="cx"> break;
</span><del>- blockInfo = adoptPtr(new RenderBlockSelectionInfo(cb));
</del><ins>+ blockInfo = std::make_unique<RenderBlockSelectionInfo>(cb);
</ins><span class="cx"> cb = cb->containingBlock();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -847,13 +847,13 @@
</span><span class="cx"> continueExploring = o && (o != stop);
</span><span class="cx"> while (continueExploring) {
</span><span class="cx"> if ((o->canBeSelectionLeaf() || o == start || o == end) && o->selectionState() != SelectionNone) {
</span><del>- newSelectedObjects.set(o, adoptPtr(new RenderSelectionInfo(o, true)));
</del><ins>+ newSelectedObjects.set(o, std::make_unique<RenderSelectionInfo>(o, true));
</ins><span class="cx"> RenderBlock* cb = o->containingBlock();
</span><span class="cx"> while (cb && !cb->isRenderView()) {
</span><del>- OwnPtr<RenderBlockSelectionInfo>& blockInfo = newSelectedBlocks.add(cb, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = newSelectedBlocks.add(cb, nullptr).iterator->value;
</ins><span class="cx"> if (blockInfo)
</span><span class="cx"> break;
</span><del>- blockInfo = adoptPtr(new RenderBlockSelectionInfo(cb));
</del><ins>+ blockInfo = std::make_unique<RenderBlockSelectionInfo>(cb);
</ins><span class="cx"> cb = cb->containingBlock();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> RenderLayerCompositor& RenderView::compositor()
</span><span class="cx"> {
</span><span class="cx"> if (!m_compositor)
</span><del>- m_compositor = adoptPtr(new RenderLayerCompositor(*this));
</del><ins>+ m_compositor = std::make_unique<RenderLayerCompositor>(*this);
</ins><span class="cx">
</span><span class="cx"> return *m_compositor;
</span><span class="cx"> }
</span><span class="lines">@@ -1123,7 +1123,7 @@
</span><span class="cx"> FlowThreadController& RenderView::flowThreadController()
</span><span class="cx"> {
</span><span class="cx"> if (!m_flowThreadController)
</span><del>- m_flowThreadController = FlowThreadController::create(this);
</del><ins>+ m_flowThreadController = std::make_unique<FlowThreadController>(this);
</ins><span class="cx">
</span><span class="cx"> return *m_flowThreadController;
</span><span class="cx"> }
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> ImageQualityController& RenderView::imageQualityController()
</span><span class="cx"> {
</span><span class="cx"> if (!m_imageQualityController)
</span><del>- m_imageQualityController = ImageQualityController::create(*this);
</del><ins>+ m_imageQualityController = std::make_unique<ImageQualityController>(*this);
</ins><span class="cx"> return *m_imageQualityController;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "PODFreeListArena.h"
</span><span class="cx"> #include "Region.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -321,13 +321,13 @@
</span><span class="cx">
</span><span class="cx"> bool shouldUsePrintingLayout() const;
</span><span class="cx">
</span><del>- OwnPtr<ImageQualityController> m_imageQualityController;
</del><ins>+ std::unique_ptr<ImageQualityController> m_imageQualityController;
</ins><span class="cx"> LayoutUnit m_pageLogicalHeight;
</span><span class="cx"> bool m_pageLogicalHeightChanged;
</span><span class="cx"> std::unique_ptr<LayoutState> m_layoutState;
</span><span class="cx"> unsigned m_layoutStateDisableCount;
</span><del>- OwnPtr<RenderLayerCompositor> m_compositor;
- OwnPtr<FlowThreadController> m_flowThreadController;
</del><ins>+ std::unique_ptr<RenderLayerCompositor> m_compositor;
+ std::unique_ptr<FlowThreadController> m_flowThreadController;
</ins><span class="cx"> RefPtr<IntervalArena> m_intervalArena;
</span><span class="cx">
</span><span class="cx"> RenderQuote* m_renderQuoteHead;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> if (m_floats)
</span><span class="cx"> m_floats->append(&floatingBox);
</span><span class="cx"> else
</span><del>- m_floats = adoptPtr(new Vector<RenderBox*>(1, &floatingBox));
</del><ins>+ m_floats = std::make_unique<Vector<RenderBox*>>(1, &floatingBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> // Floats hanging off the line are pushed into this vector during layout. It is only
</span><span class="cx"> // good for as long as the line has not been marked dirty.
</span><del>- OwnPtr<Vector<RenderBox*>> m_floats;
</del><ins>+ std::unique_ptr<Vector<RenderBox*>> m_floats;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> INLINE_BOX_OBJECT_TYPE_CASTS(RootInlineBox, isRootInlineBox())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutosizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutosizer.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutosizer.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/TextAutosizer.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "WritingMode.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesPolygonShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -126,9 +126,9 @@
</span><span class="cx"> vertices[i].set(LayoutUnit(vertices[i].x()).toFloat(), LayoutUnit(vertices[i].y()).toFloat());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline PassOwnPtr<FloatPolygon> computeShapeMarginBounds(const FloatPolygon& polygon, float margin, WindRule fillRule)
</del><ins>+static inline std::unique_ptr<FloatPolygon> computeShapeMarginBounds(const FloatPolygon& polygon, float margin, WindRule fillRule)
</ins><span class="cx"> {
</span><del>- OwnPtr<Vector<FloatPoint>> marginVertices = adoptPtr(new Vector<FloatPoint>());
</del><ins>+ auto marginVertices = std::make_unique<Vector<FloatPoint>>();
</ins><span class="cx"> FloatPoint intersection;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < polygon.numberOfEdges(); ++i) {
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> snapVerticesToLayoutUnitGrid(*marginVertices);
</span><del>- return adoptPtr(new FloatPolygon(marginVertices.release(), fillRule));
</del><ins>+ return std::make_unique<FloatPolygon>(std::move(marginVertices), fillRule);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesPolygonShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/PolygonShape.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/PolygonShape.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/PolygonShape.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> class PolygonShape : public Shape {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PolygonShape);
</span><span class="cx"> public:
</span><del>- PolygonShape(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fillRule)
- : m_polygon(vertices, fillRule)
</del><ins>+ PolygonShape(std::unique_ptr<Vector<FloatPoint>> vertices, WindRule fillRule)
+ : m_polygon(std::move(vertices), fillRule)
</ins><span class="cx"> , m_marginBounds(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> const FloatPolygon& shapeMarginBounds() const;
</span><span class="cx">
</span><span class="cx"> FloatPolygon m_polygon;
</span><del>- mutable OwnPtr<FloatPolygon> m_marginBounds;
</del><ins>+ mutable std::unique_ptr<FloatPolygon> m_marginBounds;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRasterShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RasterShape.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -163,10 +163,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginIntervals(int shapeMargin) const
</del><ins>+std::unique_ptr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginIntervals(int shapeMargin) const
</ins><span class="cx"> {
</span><span class="cx"> int marginIntervalsSize = (offset() > shapeMargin) ? size() : size() - offset() * 2 + shapeMargin * 2;
</span><del>- OwnPtr<RasterShapeIntervals> result = adoptPtr(new RasterShapeIntervals(marginIntervalsSize, std::max(shapeMargin, offset())));
</del><ins>+ auto result = std::make_unique<RasterShapeIntervals>(marginIntervalsSize, std::max(shapeMargin, offset()));
</ins><span class="cx"> MarginIntervalGenerator marginIntervalGenerator(shapeMargin);
</span><span class="cx">
</span><span class="cx"> for (int y = bounds().y(); y < bounds().maxY(); ++y) {
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RasterShapeIntervals::buildBoundsPath(Path& path) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRasterShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RasterShape.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RasterShape.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/RasterShape.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void getExcludedIntervals(int y1, int y2, IntShapeIntervals& result) const;
</span><span class="cx">
</span><del>- PassOwnPtr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
</del><ins>+ std::unique_ptr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
</ins><span class="cx">
</span><span class="cx"> void buildBoundsPath(Path&) const;
</span><span class="cx">
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> class RasterShape : public Shape {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RasterShape);
</span><span class="cx"> public:
</span><del>- RasterShape(PassOwnPtr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
- : m_intervals(intervals)
</del><ins>+ RasterShape(std::unique_ptr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
+ : m_intervals(std::move(intervals))
</ins><span class="cx"> , m_marginRectSize(marginRectSize)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx"> private:
</span><span class="cx"> const RasterShapeIntervals& marginIntervals() const;
</span><span class="cx">
</span><del>- OwnPtr<RasterShapeIntervals> m_intervals;
- mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;
</del><ins>+ std::unique_ptr<RasterShapeIntervals> m_intervals;
+ mutable std::unique_ptr<RasterShapeIntervals> m_marginIntervals;
</ins><span class="cx"> IntSize m_marginRectSize;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -41,32 +41,30 @@
</span><span class="cx"> #include "RectangleShape.h"
</span><span class="cx"> #include "WindRule.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static PassOwnPtr<Shape> createInsetShape(const FloatRoundedRect& bounds)
</del><ins>+static std::unique_ptr<Shape> createInsetShape(const FloatRoundedRect& bounds)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(bounds.rect().width() >= 0 && bounds.rect().height() >= 0);
</span><del>- return adoptPtr(new BoxShape(bounds));
</del><ins>+ return std::make_unique<BoxShape>(bounds);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<Shape> createCircleShape(const FloatPoint& center, float radius)
</del><ins>+static std::unique_ptr<Shape> createCircleShape(const FloatPoint& center, float radius)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(radius >= 0);
</span><del>- return adoptPtr(new RectangleShape(FloatRect(center.x() - radius, center.y() - radius, radius*2, radius*2), FloatSize(radius, radius)));
</del><ins>+ return std::make_unique<RectangleShape>(FloatRect(center.x() - radius, center.y() - radius, radius*2, radius*2), FloatSize(radius, radius));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<Shape> createEllipseShape(const FloatPoint& center, const FloatSize& radii)
</del><ins>+static std::unique_ptr<Shape> createEllipseShape(const FloatPoint& center, const FloatSize& radii)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(radii.width() >= 0 && radii.height() >= 0);
</span><del>- return adoptPtr(new RectangleShape(FloatRect(center.x() - radii.width(), center.y() - radii.height(), radii.width()*2, radii.height()*2), radii));
</del><ins>+ return std::make_unique<RectangleShape>(FloatRect(center.x() - radii.width(), center.y() - radii.height(), radii.width()*2, radii.height()*2), radii);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<Shape> createPolygonShape(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fillRule)
</del><ins>+static std::unique_ptr<Shape> createPolygonShape(std::unique_ptr<Vector<FloatPoint>> vertices, WindRule fillRule)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new PolygonShape(vertices, fillRule));
</del><ins>+ return std::make_unique<PolygonShape>(std::move(vertices), fillRule);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline FloatRect physicalRectToLogical(const FloatRect& rect, float logicalBoxHeight, WritingMode writingMode)
</span><span class="lines">@@ -94,14 +92,14 @@
</span><span class="cx"> return size.transposedSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, Length margin)
</del><ins>+std::unique_ptr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, Length margin)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(basicShape);
</span><span class="cx">
</span><span class="cx"> bool horizontalWritingMode = isHorizontalWritingMode(writingMode);
</span><span class="cx"> float boxWidth = horizontalWritingMode ? logicalBoxSize.width() : logicalBoxSize.height();
</span><span class="cx"> float boxHeight = horizontalWritingMode ? logicalBoxSize.height() : logicalBoxSize.width();
</span><del>- OwnPtr<Shape> shape;
</del><ins>+ std::unique_ptr<Shape> shape;
</ins><span class="cx">
</span><span class="cx"> switch (basicShape->type()) {
</span><span class="cx">
</span><span class="lines">@@ -133,7 +131,7 @@
</span><span class="cx"> const Vector<Length>& values = polygon.values();
</span><span class="cx"> size_t valuesSize = values.size();
</span><span class="cx"> ASSERT(!(valuesSize % 2));
</span><del>- OwnPtr<Vector<FloatPoint>> vertices = adoptPtr(new Vector<FloatPoint>(valuesSize / 2));
</del><ins>+ std::unique_ptr<Vector<FloatPoint>> vertices = std::make_unique<Vector<FloatPoint>>(valuesSize / 2);
</ins><span class="cx"> for (unsigned i = 0; i < valuesSize; i += 2) {
</span><span class="cx"> FloatPoint vertex(
</span><span class="cx"> floatValueForLength(values.at(i), boxWidth),
</span><span class="lines">@@ -141,7 +139,7 @@
</span><span class="cx"> (*vertices)[i / 2] = physicalPointToLogical(vertex, logicalBoxSize.height(), writingMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- shape = createPolygonShape(vertices.release(), polygon.windRule());
</del><ins>+ shape = createPolygonShape(std::move(vertices), polygon.windRule());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,14 +173,14 @@
</span><span class="cx"> shape->m_writingMode = writingMode;
</span><span class="cx"> shape->m_margin = floatValueForLength(margin, 0);
</span><span class="cx">
</span><del>- return shape.release();
</del><ins>+ return shape;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, Length margin)
</del><ins>+std::unique_ptr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, Length margin)
</ins><span class="cx"> {
</span><span class="cx"> IntRect imageRect = pixelSnappedIntRect(imageR);
</span><span class="cx"> IntRect marginRect = pixelSnappedIntRect(marginR);
</span><del>- OwnPtr<RasterShapeIntervals> intervals = adoptPtr(new RasterShapeIntervals(marginRect.height(), -marginRect.y()));
</del><ins>+ auto intervals = std::make_unique<RasterShapeIntervals>(marginRect.height(), -marginRect.y());
</ins><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(imageRect.size());
</span><span class="cx">
</span><span class="cx"> if (imageBuffer) {
</span><span class="lines">@@ -214,23 +212,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release(), marginRect.size()));
</del><ins>+ auto rasterShape = std::make_unique<RasterShape>(std::move(intervals), marginRect.size());
</ins><span class="cx"> rasterShape->m_writingMode = writingMode;
</span><span class="cx"> rasterShape->m_margin = floatValueForLength(margin, 0);
</span><del>- return rasterShape.release();
</del><ins>+ return std::move(rasterShape);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, Length margin)
</del><ins>+std::unique_ptr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, Length margin)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(roundedRect.rect().width() >= 0 && roundedRect.rect().height() >= 0);
</span><span class="cx">
</span><span class="cx"> FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height());
</span><span class="cx"> FloatRoundedRect bounds(rect, roundedRect.radii());
</span><del>- OwnPtr<Shape> shape = adoptPtr(new BoxShape(bounds));
</del><ins>+ auto shape = std::make_unique<BoxShape>(bounds);
</ins><span class="cx"> shape->m_writingMode = writingMode;
</span><span class="cx"> shape->m_margin = floatValueForLength(margin, 0);
</span><span class="cx">
</span><del>- return shape.release();
</del><ins>+ return std::move(shape);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/Shape.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "RoundedRect.h"
</span><span class="cx"> #include "StyleImage.h"
</span><span class="cx"> #include "WritingMode.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> Path marginShape;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassOwnPtr<Shape> createShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, Length margin);
- static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, Length margin);
- static PassOwnPtr<Shape> createBoxShape(const RoundedRect&, WritingMode, Length margin);
</del><ins>+ static std::unique_ptr<Shape> createShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, Length margin);
+ static std::unique_ptr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, Length margin);
+ static std::unique_ptr<Shape> createBoxShape(const RoundedRect&, WritingMode, Length margin);
</ins><span class="cx">
</span><span class="cx"> virtual ~Shape() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "Shape.h"
</span><span class="cx"> #include "ShapeValue.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool lineOverlapsShapeBounds() const = 0;
</span><span class="cx">
</span><del>- void markShapeAsDirty() { m_shape.clear(); }
- bool isShapeDirty() { return !m_shape.get(); }
</del><ins>+ void markShapeAsDirty() { m_shape = nullptr; }
+ bool isShapeDirty() { return !m_shape; }
</ins><span class="cx"> const RenderType& owner() const { return m_renderer; }
</span><span class="cx"> LayoutSize referenceBoxLogicalSize() const { return m_referenceBoxLogicalSize; }
</span><span class="cx">
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> const RenderType& m_renderer;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- mutable OwnPtr<Shape> m_shape;
</del><ins>+ mutable std::unique_ptr<Shape> m_shape;
</ins><span class="cx"> LayoutSize m_referenceBoxLogicalSize;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "CounterContent.h"
</span><span class="cx"> #include "StyleImage.h"
</span><span class="cx"> #include "RenderPtr.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleCounterDirectivescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/CounterDirectives.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/CounterDirectives.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/CounterDirectives.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CounterDirectives.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -33,11 +32,11 @@
</span><span class="cx"> && a.resetValue() == b.resetValue();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<CounterDirectiveMap> clone(const CounterDirectiveMap& counterDirectives)
</del><ins>+std::unique_ptr<CounterDirectiveMap> clone(const CounterDirectiveMap& counterDirectives)
</ins><span class="cx"> {
</span><del>- OwnPtr<CounterDirectiveMap> result = adoptPtr(new CounterDirectiveMap);
</del><ins>+ auto result = std::make_unique<CounterDirectiveMap>();
</ins><span class="cx"> *result = counterDirectives;
</span><del>- return result.release();
</del><ins>+ return std::move(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleCounterDirectivesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/CounterDirectives.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/CounterDirectives.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/CounterDirectives.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #ifndef CounterDirectives_h
</span><span class="cx"> #define CounterDirectives_h
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -104,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<AtomicString, CounterDirectives> CounterDirectiveMap;
</span><span class="cx">
</span><del>-PassOwnPtr<CounterDirectiveMap> clone(const CounterDirectiveMap&);
</del><ins>+std::unique_ptr<CounterDirectiveMap> clone(const CounterDirectiveMap&);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridCoordinateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridCoordinate.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridCoordinate.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/GridCoordinate.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,11 +44,6 @@
</span><span class="cx"> // span should include both |initialPositionIndex| and |finalPositionIndex| to be correct.
</span><span class="cx"> class GridSpan {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<GridSpan> create(size_t initialPosition, size_t finalPosition)
- {
- return adoptPtr(new GridSpan(initialPosition, finalPosition));
- }
-
</del><span class="cx"> GridSpan(size_t initialPosition, size_t finalPosition)
</span><span class="cx"> : initialPositionIndex(initialPosition)
</span><span class="cx"> , finalPositionIndex(finalPosition)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> RenderStyle* result = pseudo.get();
</span><span class="cx">
</span><span class="cx"> if (!m_cachedPseudoStyles)
</span><del>- m_cachedPseudoStyles = adoptPtr(new PseudoStyleCache);
</del><ins>+ m_cachedPseudoStyles = std::make_unique<PseudoStyleCache>();
</ins><span class="cx">
</span><span class="cx"> m_cachedPseudoStyles->append(pseudo);
</span><span class="cx">
</span><span class="lines">@@ -1113,9 +1113,9 @@
</span><span class="cx">
</span><span class="cx"> CounterDirectiveMap& RenderStyle::accessCounterDirectives()
</span><span class="cx"> {
</span><del>- OwnPtr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
</del><ins>+ auto& map = rareNonInheritedData.access()->m_counterDirectives;
</ins><span class="cx"> if (!map)
</span><del>- map = adoptPtr(new CounterDirectiveMap);
</del><ins>+ map = std::make_unique<CounterDirectiveMap>();
</ins><span class="cx"> return *map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1269,14 +1269,14 @@
</span><span class="cx"> AnimationList* RenderStyle::accessAnimations()
</span><span class="cx"> {
</span><span class="cx"> if (!rareNonInheritedData.access()->m_animations)
</span><del>- rareNonInheritedData.access()->m_animations = adoptPtr(new AnimationList());
</del><ins>+ rareNonInheritedData.access()->m_animations = std::make_unique<AnimationList>();
</ins><span class="cx"> return rareNonInheritedData->m_animations.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AnimationList* RenderStyle::accessTransitions()
</span><span class="cx"> {
</span><span class="cx"> if (!rareNonInheritedData.access()->m_transitions)
</span><del>- rareNonInheritedData.access()->m_transitions = adoptPtr(new AnimationList());
</del><ins>+ rareNonInheritedData.access()->m_transitions = std::make_unique<AnimationList>();
</ins><span class="cx"> return rareNonInheritedData->m_transitions.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> #include "ThemeTypes.h"
</span><span class="cx"> #include "TransformOperations.h"
</span><span class="cx"> #include "UnicodeBidi.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> DataRef<StyleInheritedData> inherited;
</span><span class="cx">
</span><span class="cx"> // list of associated pseudo styles
</span><del>- OwnPtr<PseudoStyleCache> m_cachedPseudoStyles;
</del><ins>+ std::unique_ptr<PseudoStyleCache> m_cachedPseudoStyles;
</ins><span class="cx">
</span><span class="cx"> DataRef<SVGRenderStyle> m_svgStyle;
</span><span class="cx">
</span><span class="lines">@@ -1553,16 +1553,16 @@
</span><span class="cx">
</span><span class="cx"> void clearAnimations()
</span><span class="cx"> {
</span><del>- rareNonInheritedData.access()->m_animations.clear();
</del><ins>+ rareNonInheritedData.access()->m_animations = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clearTransitions()
</span><span class="cx"> {
</span><del>- rareNonInheritedData.access()->m_transitions.clear();
</del><ins>+ rareNonInheritedData.access()->m_transitions = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void inheritAnimations(const AnimationList* parent) { rareNonInheritedData.access()->m_animations = parent ? adoptPtr(new AnimationList(*parent)) : nullptr; }
- void inheritTransitions(const AnimationList* parent) { rareNonInheritedData.access()->m_transitions = parent ? adoptPtr(new AnimationList(*parent)) : nullptr; }
</del><ins>+ void inheritAnimations(const AnimationList* parent) { rareNonInheritedData.access()->m_animations = parent ? std::make_unique<AnimationList>(*parent) : nullptr; }
+ void inheritTransitions(const AnimationList* parent) { rareNonInheritedData.access()->m_transitions = parent ? std::make_unique<AnimationList>(*parent) : nullptr; }
</ins><span class="cx"> void adjustAnimations();
</span><span class="cx"> void adjustTransitions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
</span><span class="cx"> , m_boxShadow(o.m_boxShadow ? std::make_unique<ShadowData>(*o.m_boxShadow) : nullptr)
</span><span class="cx"> , m_boxReflect(o.m_boxReflect)
</span><del>- , m_animations(o.m_animations ? adoptPtr(new AnimationList(*o.m_animations)) : nullptr)
- , m_transitions(o.m_transitions ? adoptPtr(new AnimationList(*o.m_transitions)) : nullptr)
</del><ins>+ , m_animations(o.m_animations ? std::make_unique<AnimationList>(*o.m_animations) : nullptr)
+ , m_transitions(o.m_transitions ? std::make_unique<AnimationList>(*o.m_transitions) : nullptr)
</ins><span class="cx"> , m_mask(o.m_mask)
</span><span class="cx"> , m_maskBoxImage(o.m_maskBoxImage)
</span><span class="cx"> , m_pageSize(o.m_pageSize)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "LineClampValue.h"
</span><span class="cx"> #include "NinePieceImage.h"
</span><span class="cx"> #include "ShapeValue.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -125,15 +125,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ContentData> m_content;
</span><del>- OwnPtr<CounterDirectiveMap> m_counterDirectives;
</del><ins>+ std::unique_ptr<CounterDirectiveMap> m_counterDirectives;
</ins><span class="cx"> String m_altText;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ShadowData> m_boxShadow; // For box-shadow decorations.
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleReflection> m_boxReflect;
</span><span class="cx">
</span><del>- OwnPtr<AnimationList> m_animations;
- OwnPtr<AnimationList> m_transitions;
</del><ins>+ std::unique_ptr<AnimationList> m_animations;
+ std::unique_ptr<AnimationList> m_transitions;
</ins><span class="cx">
</span><span class="cx"> FillLayer m_mask;
</span><span class="cx"> NinePieceImage m_maskBoxImage;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -120,9 +120,9 @@
</span><span class="cx"> if (gradientUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX && objectBoundingBox.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- OwnPtr<GradientData>& gradientData = m_gradientMap.add(&renderer, nullptr).iterator->value;
</del><ins>+ auto& gradientData = m_gradientMap.add(&renderer, nullptr).iterator->value;
</ins><span class="cx"> if (!gradientData)
</span><del>- gradientData = adoptPtr(new GradientData);
</del><ins>+ gradientData = std::make_unique<GradientData>();
</ins><span class="cx">
</span><span class="cx"> bool isPaintingText = resourceMode & ApplyToTextMode;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "RenderSVGResourceContainer.h"
</span><span class="cx"> #include "SVGGradientElement.h"
</span><del>-
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool m_shouldCollectGradientAttributes : 1;
</span><del>- HashMap<RenderObject*, OwnPtr<GradientData>> m_gradientMap;
</del><ins>+ HashMap<RenderObject*, std::unique_ptr<GradientData>> m_gradientMap;
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> GraphicsContext* m_savedContext;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Build pattern.
</span><del>- OwnPtr<PatternData> patternData = adoptPtr(new PatternData);
</del><ins>+ auto patternData = std::make_unique<PatternData>();
</ins><span class="cx"> patternData->pattern = Pattern::create(copiedImage, true, true);
</span><span class="cx">
</span><span class="cx"> // Compute pattern space transformation.
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> // Various calls above may trigger invalidations in some fringe cases (ImageBuffer allocation
</span><span class="cx"> // failures in the SVG image cache for example). To avoid having our PatternData deleted by
</span><span class="cx"> // removeAllClientsFromCache(), we only make it visible in the cache at the very end.
</span><del>- return m_patternMap.set(object, patternData.release()).iterator->value.get();
</del><ins>+ return m_patternMap.set(object, std::move(patternData)).iterator->value.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSVGResourcePattern::applyResource(RenderElement& renderer, const RenderStyle& style, GraphicsContext*& context, unsigned short resourceMode)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "RenderSVGResourceContainer.h"
</span><span class="cx"> #include "SVGPatternElement.h"
</span><span class="cx"> #include "SVGUnitTypes.h"
</span><del>-
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_shouldCollectPatternAttributes : 1;
</span><span class="cx"> PatternAttributes m_attributes;
</span><del>- HashMap<RenderObject*, OwnPtr<PatternData>> m_patternMap;
</del><ins>+ HashMap<RenderObject*, std::unique_ptr<PatternData>> m_patternMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -77,8 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGShape::updateShapeFromElement()
</span><span class="cx"> {
</span><del>- m_path.clear();
- m_path = adoptPtr(new Path);
</del><ins>+ m_path = std::make_unique<Path>();
</ins><span class="cx"> ASSERT(RenderSVGShape::isEmpty());
</span><span class="cx">
</span><span class="cx"> updatePathFromGraphicsElement(&graphicsElement(), path());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "RenderSVGModelObject.h"
</span><span class="cx"> #include "SVGGraphicsElement.h"
</span><span class="cx"> #include "SVGMarkerData.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> FloatRect m_repaintBoundingBox;
</span><span class="cx"> FloatRect m_repaintBoundingBoxExcludingShadow;
</span><span class="cx"> AffineTransform m_localTransform;
</span><del>- OwnPtr<Path> m_path;
</del><ins>+ std::unique_ptr<Path> m_path;
</ins><span class="cx"> Vector<MarkerPosition> m_markerPositions;
</span><span class="cx">
</span><span class="cx"> bool m_needsBoundariesUpdate : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> ASSERT(clipper->resourceType() == ClipperResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_clipperFilterMaskerData)
</span><del>- m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
</del><ins>+ m_clipperFilterMaskerData = std::make_unique<ClipperFilterMaskerData>();
</ins><span class="cx">
</span><span class="cx"> m_clipperFilterMaskerData->clipper = clipper;
</span><span class="cx"> return true;
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> ASSERT(filter->resourceType() == FilterResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_clipperFilterMaskerData)
</span><del>- m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
</del><ins>+ m_clipperFilterMaskerData = std::make_unique<ClipperFilterMaskerData>();
</ins><span class="cx">
</span><span class="cx"> m_clipperFilterMaskerData->filter = filter;
</span><span class="cx"> return true;
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> ASSERT(markerStart->resourceType() == MarkerResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_markerData)
</span><del>- m_markerData = MarkerData::create();
</del><ins>+ m_markerData = std::make_unique<MarkerData>();
</ins><span class="cx">
</span><span class="cx"> m_markerData->markerStart = markerStart;
</span><span class="cx"> return true;
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> ASSERT(markerMid->resourceType() == MarkerResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_markerData)
</span><del>- m_markerData = MarkerData::create();
</del><ins>+ m_markerData = std::make_unique<MarkerData>();
</ins><span class="cx">
</span><span class="cx"> m_markerData->markerMid = markerMid;
</span><span class="cx"> return true;
</span><span class="lines">@@ -532,7 +532,7 @@
</span><span class="cx"> ASSERT(markerEnd->resourceType() == MarkerResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_markerData)
</span><del>- m_markerData = MarkerData::create();
</del><ins>+ m_markerData = std::make_unique<MarkerData>();
</ins><span class="cx">
</span><span class="cx"> m_markerData->markerEnd = markerEnd;
</span><span class="cx"> return true;
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> ASSERT(masker->resourceType() == MaskerResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_clipperFilterMaskerData)
</span><del>- m_clipperFilterMaskerData = ClipperFilterMaskerData::create();
</del><ins>+ m_clipperFilterMaskerData = std::make_unique<ClipperFilterMaskerData>();
</ins><span class="cx">
</span><span class="cx"> m_clipperFilterMaskerData->masker = masker;
</span><span class="cx"> return true;
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx"> || fill->resourceType() == RadialGradientResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_fillStrokeData)
</span><del>- m_fillStrokeData = FillStrokeData::create();
</del><ins>+ m_fillStrokeData = std::make_unique<FillStrokeData>();
</ins><span class="cx">
</span><span class="cx"> m_fillStrokeData->fill = fill;
</span><span class="cx"> return true;
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> || stroke->resourceType() == RadialGradientResourceType);
</span><span class="cx">
</span><span class="cx"> if (!m_fillStrokeData)
</span><del>- m_fillStrokeData = FillStrokeData::create();
</del><ins>+ m_fillStrokeData = std::make_unique<FillStrokeData>();
</ins><span class="cx">
</span><span class="cx"> m_fillStrokeData->stroke = stroke;
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -20,10 +20,9 @@
</span><span class="cx"> #ifndef SVGResources_h
</span><span class="cx"> #define SVGResources_h
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -124,11 +123,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<ClipperFilterMaskerData> create()
- {
- return adoptPtr(new ClipperFilterMaskerData);
- }
-
</del><span class="cx"> RenderSVGResourceClipper* clipper;
</span><span class="cx"> #if ENABLE(FILTERS)
</span><span class="cx"> RenderSVGResourceFilter* filter;
</span><span class="lines">@@ -148,11 +142,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<MarkerData> create()
- {
- return adoptPtr(new MarkerData);
- }
-
</del><span class="cx"> RenderSVGResourceMarker* markerStart;
</span><span class="cx"> RenderSVGResourceMarker* markerMid;
</span><span class="cx"> RenderSVGResourceMarker* markerEnd;
</span><span class="lines">@@ -171,18 +160,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<FillStrokeData> create()
- {
- return adoptPtr(new FillStrokeData);
- }
-
</del><span class="cx"> RenderSVGResourceContainer* fill;
</span><span class="cx"> RenderSVGResourceContainer* stroke;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- OwnPtr<ClipperFilterMaskerData> m_clipperFilterMaskerData;
- OwnPtr<MarkerData> m_markerData;
- OwnPtr<FillStrokeData> m_fillStrokeData;
</del><ins>+ std::unique_ptr<ClipperFilterMaskerData> m_clipperFilterMaskerData;
+ std::unique_ptr<MarkerData> m_markerData;
+ std::unique_ptr<FillStrokeData> m_fillStrokeData;
</ins><span class="cx"> RenderSVGResourceContainer* m_linkedResource;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -42,12 +42,12 @@
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><span class="cx">
</span><span class="cx"> // Build a list of all resources associated with the passed RenderObject
</span><del>- OwnPtr<SVGResources> newResources = adoptPtr(new SVGResources);
</del><ins>+ auto newResources = std::make_unique<SVGResources>();
</ins><span class="cx"> if (!newResources->buildCachedResources(renderer, svgStyle))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Put object in cache.
</span><del>- SVGResources& resources = *m_cache.add(&renderer, newResources.release()).iterator->value;
</del><ins>+ SVGResources& resources = *m_cache.add(&renderer, std::move(newResources)).iterator->value;
</ins><span class="cx">
</span><span class="cx"> // Run cycle-detection _afterwards_, so self-references can be caught as well.
</span><span class="cx"> SVGResourcesCycleSolver solver(renderer, resources);
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::removeResourcesFromRenderer(RenderElement& renderer)
</span><span class="cx"> {
</span><del>- OwnPtr<SVGResources> resources = m_cache.take(&renderer);
</del><ins>+ std::unique_ptr<SVGResources> resources = m_cache.take(&renderer);
</ins><span class="cx"> if (!resources)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -21,8 +21,9 @@
</span><span class="cx"> #define SVGResourcesCache_h
</span><span class="cx">
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <wtf/Noncopyable.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -62,7 +63,7 @@
</span><span class="cx"> void addResourcesFromRenderer(RenderElement&, const RenderStyle&);
</span><span class="cx"> void removeResourcesFromRenderer(RenderElement&);
</span><span class="cx">
</span><del>- typedef HashMap<const RenderObject*, OwnPtr<SVGResources>> CacheMap;
</del><ins>+ typedef HashMap<const RenderObject*, std::unique_ptr<SVGResources>> CacheMap;
</ins><span class="cx"> CacheMap m_cache;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricsBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.cpp 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -104,9 +104,9 @@
</span><span class="cx"> m_isComplexText = scaledFont.codePath(m_run) == Font::Complex;
</span><span class="cx">
</span><span class="cx"> if (m_isComplexText)
</span><del>- m_simpleWidthIterator.clear();
</del><ins>+ m_simpleWidthIterator = nullptr;
</ins><span class="cx"> else
</span><del>- m_simpleWidthIterator = adoptPtr(new WidthIterator(&scaledFont, m_run));
</del><ins>+ m_simpleWidthIterator = std::make_unique<WidthIterator>(&scaledFont, m_run);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct MeasureTextData {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricsBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h (166488 => 166489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h 2014-03-31 08:38:23 UTC (rev 166488)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h 2014-03-31 10:12:49 UTC (rev 166489)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> float m_totalWidth;
</span><span class="cx">
</span><span class="cx"> // Simple text only.
</span><del>- OwnPtr<WidthIterator> m_simpleWidthIterator;
</del><ins>+ std::unique_ptr<WidthIterator> m_simpleWidthIterator;
</ins><span class="cx">
</span><span class="cx"> // Complex text only.
</span><span class="cx"> SVGTextMetrics m_complexStartToCurrentMetrics;
</span></span></pre>
</div>
</div>
</body>
</html>