<!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>[159791] 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/159791">159791</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-26 14:58:17 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>ImageBuffer::create should return a std::unique_ptr instead of OwnPtr.
https://bugs.webkit.org/show_bug.cgi?id=124822
Patch by Brian J. Burg <burg@cs.washington.edu> on 2013-11-26
Reviewed by Andreas Kling.
Replace all uses of OwnPtr<ImageBuffer> and PassOwnPtr<ImageBuffer> with
std::unique_ptr<ImageBuffer>. Replace calls to OwnPtr::clear() and
OwnPtr::release() with reset() and std::move(). Remove unnecessary includes.
No new tests. This is a mechanical refactoring.
* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::image):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::setSurfaceSize):
* html/HTMLCanvasElement.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::createCompositingBuffer):
(WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage):
(WebCore::CanvasRenderingContext2D::fullCanvasCompositedFill):
(WebCore::CanvasRenderingContext2D::drawTextInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::LRUImageBufferCache::LRUImageBufferCache):
(WebCore::WebGLRenderingContext::LRUImageBufferCache::imageBuffer):
* html/canvas/WebGLRenderingContext.h:
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):
* page/Frame.cpp:
(WebCore::Frame::nodeImage):
(WebCore::Frame::dragImageForSelection):
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::drawPattern):
* platform/graphics/CrossfadeGeneratedImage.cpp:
(WebCore::CrossfadeGeneratedImage::drawPattern):
* platform/graphics/GradientImage.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::createCompatibleBuffer):
* platform/graphics/GraphicsContext.h:
* platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::createCompatibleBuffer):
* platform/graphics/ImageBuffer.h:
(WebCore::ImageBuffer::create):
* platform/graphics/ShadowBlur.cpp:
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::putByteArray):
* platform/graphics/cg/PDFDocumentImage.h:
* platform/graphics/filters/FETile.cpp:
(WebCore::FETile::platformApplySoftware):
* platform/graphics/filters/Filter.h:
(WebCore::Filter::setSourceImage):
* platform/graphics/filters/FilterEffect.cpp:
(WebCore::FilterEffect::clearResult):
* platform/graphics/filters/FilterEffect.h:
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::BitmapTexture::updateContents):
* platform/graphics/texmap/TextureMapperImageBuffer.h:
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintProgressBar):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createShape):
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::invalidateBufferedForeground):
* rendering/svg/RenderSVGImage.h:
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::applyClippingToContext):
* rendering/svg/RenderSVGResourceClipper.h:
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource):
(WebCore::RenderSVGResourceFilter::postApplyResource):
* rendering/svg/RenderSVGResourceFilter.h:
* rendering/svg/RenderSVGResourceGradient.cpp: Remove method parameter wrapping/indentation.
(WebCore::createMaskAndSwapContextForTextGradient):
(WebCore::clipToTextMask):
(WebCore::RenderSVGResourceGradient::applyResource):
* rendering/svg/RenderSVGResourceGradient.h:
* rendering/svg/RenderSVGResourceMasker.cpp:
(WebCore::RenderSVGResourceMasker::applyResource):
* rendering/svg/RenderSVGResourceMasker.h:
* rendering/svg/RenderSVGResourcePattern.cpp: Remove method parameter wrapping/indentation.
(WebCore::RenderSVGResourcePattern::buildPattern):
(WebCore::RenderSVGResourcePattern::createTileImage):
* rendering/svg/RenderSVGResourcePattern.h: Remove method parameter wrapping/indentation.
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::createImageBuffer):
(WebCore::SVGRenderingContext::createImageBufferForPattern):
(WebCore::SVGRenderingContext::clipToImageBuffer):
(WebCore::SVGRenderingContext::bufferForeground):
* rendering/svg/SVGRenderingContext.h:
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::nativeImageForCurrentFrame):
(WebCore::SVGImage::drawPatternForContainer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContexth">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImageh">trunk/Source/WebCore/platform/graphics/GradientImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBuffercpp">trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFETilecpp">trunk/Source/WebCore/platform/graphics/filters/FETile.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterh">trunk/Source/WebCore/platform/graphics/filters/Filter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterEffectcpp">trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterEffecth">trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImagecpp">trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImageh">trunk/Source/WebCore/rendering/svg/RenderSVGImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.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="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.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="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContexth">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/ChangeLog 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1,3 +1,102 @@
</span><ins>+2013-11-26 Brian J. Burg <burg@cs.washington.edu>
+
+ ImageBuffer::create should return a std::unique_ptr instead of OwnPtr.
+ https://bugs.webkit.org/show_bug.cgi?id=124822
+
+ Reviewed by Andreas Kling.
+
+ Replace all uses of OwnPtr<ImageBuffer> and PassOwnPtr<ImageBuffer> with
+ std::unique_ptr<ImageBuffer>. Replace calls to OwnPtr::clear() and
+ OwnPtr::release() with reset() and std::move(). Remove unnecessary includes.
+
+ No new tests. This is a mechanical refactoring.
+
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::image):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::setSurfaceSize):
+ * html/HTMLCanvasElement.h:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::createCompositingBuffer):
+ (WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage):
+ (WebCore::CanvasRenderingContext2D::fullCanvasCompositedFill):
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::LRUImageBufferCache::LRUImageBufferCache):
+ (WebCore::WebGLRenderingContext::LRUImageBufferCache::imageBuffer):
+ * html/canvas/WebGLRenderingContext.h:
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):
+ * page/Frame.cpp:
+ (WebCore::Frame::nodeImage):
+ (WebCore::Frame::dragImageForSelection):
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::drawPattern):
+ * platform/graphics/CrossfadeGeneratedImage.cpp:
+ (WebCore::CrossfadeGeneratedImage::drawPattern):
+ * platform/graphics/GradientImage.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::createCompatibleBuffer):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/ImageBuffer.cpp:
+ (WebCore::ImageBuffer::createCompatibleBuffer):
+ * platform/graphics/ImageBuffer.h:
+ (WebCore::ImageBuffer::create):
+ * platform/graphics/ShadowBlur.cpp:
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::putByteArray):
+ * platform/graphics/cg/PDFDocumentImage.h:
+ * platform/graphics/filters/FETile.cpp:
+ (WebCore::FETile::platformApplySoftware):
+ * platform/graphics/filters/Filter.h:
+ (WebCore::Filter::setSourceImage):
+ * platform/graphics/filters/FilterEffect.cpp:
+ (WebCore::FilterEffect::clearResult):
+ * platform/graphics/filters/FilterEffect.h:
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::BitmapTexture::updateContents):
+ * platform/graphics/texmap/TextureMapperImageBuffer.h:
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintProgressBar):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createShape):
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::invalidateBufferedForeground):
+ * rendering/svg/RenderSVGImage.h:
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+ * rendering/svg/RenderSVGResourceClipper.h:
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::applyResource):
+ (WebCore::RenderSVGResourceFilter::postApplyResource):
+ * rendering/svg/RenderSVGResourceFilter.h:
+ * rendering/svg/RenderSVGResourceGradient.cpp: Remove method parameter wrapping/indentation.
+ (WebCore::createMaskAndSwapContextForTextGradient):
+ (WebCore::clipToTextMask):
+ (WebCore::RenderSVGResourceGradient::applyResource):
+ * rendering/svg/RenderSVGResourceGradient.h:
+ * rendering/svg/RenderSVGResourceMasker.cpp:
+ (WebCore::RenderSVGResourceMasker::applyResource):
+ * rendering/svg/RenderSVGResourceMasker.h:
+ * rendering/svg/RenderSVGResourcePattern.cpp: Remove method parameter wrapping/indentation.
+ (WebCore::RenderSVGResourcePattern::buildPattern):
+ (WebCore::RenderSVGResourcePattern::createTileImage):
+ * rendering/svg/RenderSVGResourcePattern.h: Remove method parameter wrapping/indentation.
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::createImageBuffer):
+ (WebCore::SVGRenderingContext::createImageBufferForPattern):
+ (WebCore::SVGRenderingContext::clipToImageBuffer):
+ (WebCore::SVGRenderingContext::bufferForeground):
+ * rendering/svg/SVGRenderingContext.h:
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::nativeImageForCurrentFrame):
+ (WebCore::SVGImage::drawPatternForContainer):
+
</ins><span class="cx"> 2013-11-26 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> video.currentSrc should return empty when no resource is loaded
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx"> return Image::nullImage();
</span><span class="cx">
</span><span class="cx"> // Transform Image into ImageBuffer.
</span><del>- OwnPtr<ImageBuffer> texture = ImageBuffer::create(size);
</del><ins>+ std::unique_ptr<ImageBuffer> texture = ImageBuffer::create(size);
</ins><span class="cx"> if (!texture)
</span><span class="cx"> return Image::nullImage();
</span><span class="cx"> texture->context()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</span><span class="cx">
</span><span class="cx"> RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
</span><del>- filterRenderer->setSourceImage(texture.release());
</del><ins>+ filterRenderer->setSourceImage(std::move(texture));
</ins><span class="cx"> filterRenderer->setSourceImageRect(FloatRect(FloatPoint(), size));
</span><span class="cx"> filterRenderer->setFilterRegion(FloatRect(FloatPoint(), size));
</span><span class="cx"> if (!filterRenderer->build(renderer, m_filterOperations, FilterFunction))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> m_size = size;
</span><span class="cx"> m_hasCreatedImageBuffer = false;
</span><span class="cx"> m_contextStateSaver.clear();
</span><del>- m_imageBuffer.clear();
</del><ins>+ m_imageBuffer.reset();
</ins><span class="cx"> clearCopiedImage();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> // m_createdImageBuffer means we tried to malloc the buffer. We didn't necessarily get it.
</span><span class="cx"> mutable bool m_hasCreatedImageBuffer;
</span><span class="cx"> mutable bool m_didClearImageBuffer;
</span><del>- mutable OwnPtr<ImageBuffer> m_imageBuffer;
</del><ins>+ mutable std::unique_ptr<ImageBuffer> m_imageBuffer;
</ins><span class="cx"> mutable OwnPtr<GraphicsContextStateSaver> m_contextStateSaver;
</span><span class="cx">
</span><span class="cx"> mutable RefPtr<Image> m_presentedImage;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1544,7 +1544,7 @@
</span><span class="cx"> return bufferRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OwnPtr<ImageBuffer> CanvasRenderingContext2D::createCompositingBuffer(const IntRect& bufferRect)
</del><ins>+std::unique_ptr<ImageBuffer> CanvasRenderingContext2D::createCompositingBuffer(const IntRect& bufferRect)
</ins><span class="cx"> {
</span><span class="cx"> RenderingMode renderMode = isAccelerated() ? Accelerated : Unaccelerated;
</span><span class="cx"> return ImageBuffer::create(bufferRect.size(), 1, ColorSpaceDeviceRGB, renderMode);
</span><span class="lines">@@ -1593,7 +1593,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer = createCompositingBuffer(bufferRect);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = createCompositingBuffer(bufferRect);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1623,7 +1623,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer = createCompositingBuffer(bufferRect);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = createCompositingBuffer(bufferRect);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2234,7 +2234,7 @@
</span><span class="cx"> if (drawStyle.canvasGradient() || drawStyle.canvasPattern()) {
</span><span class="cx"> IntRect maskRect = enclosingIntRect(textRect);
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> maskImage = c->createCompatibleBuffer(maskRect.size());
</del><ins>+ std::unique_ptr<ImageBuffer> maskImage = c->createCompatibleBuffer(maskRect.size());
</ins><span class="cx">
</span><span class="cx"> GraphicsContext* maskImageContext = maskImage->context();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> bool rectContainsCanvas(const FloatRect&) const;
</span><span class="cx">
</span><span class="cx"> template<class T> IntRect calculateCompositingBufferRect(const T&, IntSize*);
</span><del>- OwnPtr<ImageBuffer> createCompositingBuffer(const IntRect&);
</del><ins>+ std::unique_ptr<ImageBuffer> createCompositingBuffer(const IntRect&);
</ins><span class="cx"> void compositeBuffer(ImageBuffer*, const IntRect&, CompositeOperator);
</span><span class="cx">
</span><span class="cx"> void inflateStrokeRect(FloatRect&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -5931,7 +5931,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContext::LRUImageBufferCache::LRUImageBufferCache(int capacity)
</span><del>- : m_buffers(std::make_unique<OwnPtr<ImageBuffer>[]>(capacity))
</del><ins>+ : m_buffers(std::make_unique<std::unique_ptr<ImageBuffer>[]>(capacity))
</ins><span class="cx"> , m_capacity(capacity)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -5949,11 +5949,11 @@
</span><span class="cx"> return buf;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> temp = ImageBuffer::create(size, 1);
</del><ins>+ std::unique_ptr<ImageBuffer> temp = ImageBuffer::create(size, 1);
</ins><span class="cx"> if (!temp)
</span><span class="cx"> return 0;
</span><span class="cx"> i = std::min(m_capacity - 1, i);
</span><del>- m_buffers[i] = temp.release();
</del><ins>+ m_buffers[i] = std::move(temp);
</ins><span class="cx">
</span><span class="cx"> ImageBuffer* buf = m_buffers[i].get();
</span><span class="cx"> bubbleToFront(i);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> ImageBuffer* imageBuffer(const IntSize& size);
</span><span class="cx"> private:
</span><span class="cx"> void bubbleToFront(int idx);
</span><del>- std::unique_ptr<OwnPtr<ImageBuffer>[]> m_buffers;
</del><ins>+ std::unique_ptr<std::unique_ptr<ImageBuffer>[]> m_buffers;
</ins><span class="cx"> int m_capacity;
</span><span class="cx"> };
</span><span class="cx"> LRUImageBufferCache m_generatedImageCache;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1415,7 +1415,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect paintingRect = IntRect(IntPoint(), layer->size());
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1022,7 +1022,7 @@
</span><span class="cx"> paintingRect.setWidth(paintingRect.width() * deviceScaleFactor);
</span><span class="cx"> paintingRect.setHeight(paintingRect.height() * deviceScaleFactor);
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx"> buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
</span><span class="lines">@@ -1056,7 +1056,7 @@
</span><span class="cx"> paintingRect.setWidth(paintingRect.width() * deviceScaleFactor);
</span><span class="cx"> paintingRect.setHeight(paintingRect.height() * deviceScaleFactor);
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return 0;
</span><span class="cx"> buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_cachedImage) {
</span><del>- OwnPtr<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(tileRect.size()));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(tileRect.size()));
</ins><span class="cx"> ASSERT(buffer.get());
</span><span class="cx">
</span><span class="cx"> ImageObserver* observer = imageObserver();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode)
</span><span class="cx"> {
</span><del>- OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><ins>+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</ins><span class="cx"> if (!imageBuffer)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<Gradient> m_gradient;
</span><del>- OwnPtr<ImageBuffer> m_cachedImageBuffer;
</del><ins>+ std::unique_ptr<ImageBuffer> m_cachedImageBuffer;
</ins><span class="cx"> IntSize m_cachedAdjustedSize;
</span><span class="cx"> unsigned m_cachedGeneratorHash;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> return a.xScale() == b.xScale() && a.yScale() == b.yScale();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ImageBuffer> GraphicsContext::createCompatibleBuffer(const IntSize& size, bool hasAlpha) const
</del><ins>+std::unique_ptr<ImageBuffer> GraphicsContext::createCompatibleBuffer(const IntSize& size, bool hasAlpha) const
</ins><span class="cx"> {
</span><span class="cx"> // Make the buffer larger if the context's transform is scaling it so we need a higher
</span><span class="cx"> // resolution than one pixel per unit. Also set up a corresponding scale factor on the
</span><span class="lines">@@ -812,14 +812,14 @@
</span><span class="cx"> AffineTransform transform = getCTM(DefinitelyIncludeDeviceScale);
</span><span class="cx"> IntSize scaledSize(static_cast<int>(ceil(size.width() * transform.xScale())), static_cast<int>(ceil(size.height() * transform.yScale())));
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, ColorSpaceDeviceRGB, this, hasAlpha);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, ColorSpaceDeviceRGB, this, hasAlpha);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> buffer->context()->scale(FloatSize(static_cast<float>(scaledSize.width()) / size.width(),
</span><span class="cx"> static_cast<float>(scaledSize.height()) / size.height()));
</span><span class="cx">
</span><del>- return buffer.release();
</del><ins>+ return buffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool GraphicsContext::isCompatibleWithBuffer(ImageBuffer* buffer) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> // Create an image buffer compatible with this context, with suitable resolution
</span><span class="cx"> // for drawing into the buffer and then into this context.
</span><del>- PassOwnPtr<ImageBuffer> createCompatibleBuffer(const IntSize&, bool hasAlpha = true) const;
</del><ins>+ std::unique_ptr<ImageBuffer> createCompatibleBuffer(const IntSize&, bool hasAlpha = true) const;
</ins><span class="cx"> bool isCompatibleWithBuffer(ImageBuffer*) const;
</span><span class="cx">
</span><span class="cx"> // This function applies the device scale factor to the context, making the context capable of
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const IntSize& size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext* context, bool)
</del><ins>+std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const IntSize& size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext* context, bool)
</ins><span class="cx"> {
</span><span class="cx"> return create(size, resolutionScale, colorSpace, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include <runtime/Uint8ClampedArray.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -79,16 +78,16 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ImageBuffer); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> // Will return a null pointer on allocation failure.
</span><del>- static PassOwnPtr<ImageBuffer> create(const IntSize& size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
</del><ins>+ static std::unique_ptr<ImageBuffer> create(const IntSize& size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
</ins><span class="cx"> {
</span><span class="cx"> bool success = false;
</span><del>- OwnPtr<ImageBuffer> buf = adoptPtr(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
</ins><span class="cx"> if (!success)
</span><span class="cx"> return nullptr;
</span><del>- return buf.release();
</del><ins>+ return buffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<ImageBuffer> createCompatibleBuffer(const IntSize&, float resolutionScale, ColorSpace, const GraphicsContext*, bool hasAlpha);
</del><ins>+ static std::unique_ptr<ImageBuffer> createCompatibleBuffer(const IntSize&, float resolutionScale, ColorSpace, const GraphicsContext*, bool hasAlpha);
</ins><span class="cx">
</span><span class="cx"> ~ImageBuffer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> m_lastRadius = FloatSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> m_imageBuffer;
</del><ins>+ std::unique_ptr<ImageBuffer> m_imageBuffer;
</ins><span class="cx"> Timer<ScratchBuffer> m_purgeTimer;
</span><span class="cx">
</span><span class="cx"> FloatRect m_lastInsetBounds;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> // Make a copy of the source to ensure the bits don't change before being drawn
</span><span class="cx"> IntSize sourceCopySize(sourceRect.width(), sourceRect.height());
</span><del>- OwnPtr<ImageBuffer> sourceCopy = ImageBuffer::create(sourceCopySize, 1, ColorSpaceDeviceRGB, Unaccelerated);
</del><ins>+ std::unique_ptr<ImageBuffer> sourceCopy = ImageBuffer::create(sourceCopySize, 1, ColorSpaceDeviceRGB, Unaccelerated);
</ins><span class="cx"> if (!sourceCopy)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> RetainPtr<CGPDFDocumentRef> m_document;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> m_cachedImageBuffer;
</del><ins>+ std::unique_ptr<ImageBuffer> m_cachedImageBuffer;
</ins><span class="cx"> AffineTransform m_cachedTransform;
</span><span class="cx"> FloatSize m_cachedDestinationSize;
</span><span class="cx"> FloatRect m_cachedSourceRect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFETilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FETile.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> tileRect.scale(filter->filterResolution().width(), filter->filterResolution().height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> tileImage;
</del><ins>+ std::unique_ptr<ImageBuffer> tileImage;
</ins><span class="cx"> if (!SVGRenderingContext::createImageBufferForPattern(tileRect, tileRect, tileImage, ColorSpaceDeviceRGB, filter()->renderingMode()))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/Filter.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/Filter.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/filters/Filter.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> Filter() : m_renderingMode(Unaccelerated) { }
</span><span class="cx"> virtual ~Filter() { }
</span><span class="cx">
</span><del>- void setSourceImage(PassOwnPtr<ImageBuffer> sourceImage) { m_sourceImage = sourceImage; }
</del><ins>+ void setSourceImage(std::unique_ptr<ImageBuffer> sourceImage) { m_sourceImage = std::move(sourceImage); }
</ins><span class="cx"> ImageBuffer* sourceImage() { return m_sourceImage.get(); }
</span><span class="cx">
</span><span class="cx"> FloatSize filterResolution() const { return m_filterResolution; }
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual FloatPoint mapAbsolutePointToLocalPoint(const FloatPoint&) const { return FloatPoint(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<ImageBuffer> m_sourceImage;
</del><ins>+ std::unique_ptr<ImageBuffer> m_sourceImage;
</ins><span class="cx"> FloatSize m_filterResolution;
</span><span class="cx"> RenderingMode m_renderingMode;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterEffectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> void FilterEffect::clearResult()
</span><span class="cx"> {
</span><span class="cx"> if (m_imageBufferResult)
</span><del>- m_imageBufferResult.clear();
</del><ins>+ m_imageBufferResult.reset();
</ins><span class="cx"> if (m_unmultipliedImageResult)
</span><span class="cx"> m_unmultipliedImageResult.clear();
</span><span class="cx"> if (m_premultipliedImageResult)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterEffecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include <runtime/Uint8ClampedArray.h>
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -179,7 +178,7 @@
</span><span class="cx"> void forceValidPreMultipliedPixels();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<ImageBuffer> m_imageBufferResult;
</del><ins>+ std::unique_ptr<ImageBuffer> m_imageBufferResult;
</ins><span class="cx"> RefPtr<Uint8ClampedArray> m_unmultipliedImageResult;
</span><span class="cx"> RefPtr<Uint8ClampedArray> m_premultipliedImageResult;
</span><span class="cx"> FilterEffectVector m_inputEffects;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> void BitmapTexture::updateContents(TextureMapper* textureMapper, GraphicsLayer* sourceLayer, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag updateContentsFlag)
</span><span class="cx"> {
</span><del>- OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(targetRect.size());
</del><ins>+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(targetRect.size());
</ins><span class="cx"> GraphicsContext* context = imageBuffer->context();
</span><span class="cx"> context->setImageInterpolationQuality(textureMapper->imageInterpolationQuality());
</span><span class="cx"> context->setTextDrawingMode(textureMapper->textDrawingMode());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> static PassRefPtr<BitmapTexture> create() { return adoptRef(new BitmapTextureImageBuffer); }
</span><span class="cx"> virtual IntSize size() const { return m_image->internalSize(); }
</span><span class="cx"> virtual void didReset();
</span><del>- virtual bool isValid() const { return m_image; }
</del><ins>+ virtual bool isValid() const { return m_image.get(); }
</ins><span class="cx"> inline GraphicsContext* graphicsContext() { return m_image ? m_image->context() : 0; }
</span><span class="cx"> virtual void updateContents(Image*, const IntRect&, const IntPoint&, UpdateContentsFlag);
</span><span class="cx"> virtual void updateContents(TextureMapper*, GraphicsLayer*, const IntRect& target, const IntPoint& offset, UpdateContentsFlag);
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> BitmapTextureImageBuffer() { }
</span><del>- OwnPtr<ImageBuffer> m_image;
</del><ins>+ std::unique_ptr<ImageBuffer> m_image;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect underlineRect = boundingBoxForAllActiveDecorations(*this, context, decoration, textDecorationThickness, width, doubleOffset, decorationStyle, localOrigin, lineStyle, isPrinting, baseline);
</span><span class="cx"> IntRect enclosingDeviceRect = enclosingIntRect(underlineRect);
</span><del>- OwnPtr<ImageBuffer> imageBuffer = context.createCompatibleBuffer(enclosingDeviceRect.size());
</del><ins>+ std::unique_ptr<ImageBuffer> imageBuffer = context.createCompatibleBuffer(enclosingDeviceRect.size());
</ins><span class="cx">
</span><span class="cx"> if (imageBuffer.get()) {
</span><span class="cx"> GraphicsContext& maskContext = *imageBuffer->context();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver backgroundClipStateSaver(*context, false);
</span><del>- OwnPtr<ImageBuffer> maskImage;
</del><ins>+ std::unique_ptr<ImageBuffer> maskImage;
</ins><span class="cx"> IntRect maskRect;
</span><span class="cx">
</span><span class="cx"> if (bgLayer->clip() == PaddingFillBox || bgLayer->clip() == ContentFillBox) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx"> trackInfo.reserved = 0;
</span><span class="cx"> trackInfo.filler1 = 0;
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(inflatedRect.size(), deviceScaleFactor);
</del><ins>+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(inflatedRect.size(), deviceScaleFactor);
</ins><span class="cx"> if (!imageBuffer)
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">
</span><span class="cx"> OwnPtr<RasterShapeIntervals> intervals = adoptPtr(new RasterShapeIntervals(imageSize.height()));
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(imageSize);
</del><ins>+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(imageSize);
</ins><span class="cx"> if (imageBuffer) {
</span><span class="cx"> GraphicsContext* graphicsContext = imageBuffer->context();
</span><span class="cx"> graphicsContext->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGImage::invalidateBufferedForeground()
</span><span class="cx"> {
</span><del>- m_bufferedForeground.clear();
</del><ins>+ m_bufferedForeground.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSVGImage::nodeAtFloatPoint(const HitTestRequest& request, HitTestResult& result, const FloatPoint& pointInParent, HitTestAction hitTestAction)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> FloatRect m_repaintBoundingBoxExcludingShadow;
</span><span class="cx"> OwnPtr<RenderImageResource> m_imageResource;
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> m_bufferedForeground;
</del><ins>+ std::unique_ptr<ImageBuffer> m_bufferedForeground;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderSVGImage, isSVGImage())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> succeeded = drawContentIntoMaskImage(clipperData, objectBoundingBox);
</span><span class="cx">
</span><span class="cx"> if (!succeeded)
</span><del>- clipperData->clipMaskImage.clear();
</del><ins>+ clipperData->clipMaskImage.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!clipperData->clipMaskImage)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -31,14 +31,13 @@
</span><span class="cx"> #include "SVGUnitTypes.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct ClipperData {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- OwnPtr<ImageBuffer> clipMaskImage;
</del><ins>+ std::unique_ptr<ImageBuffer> clipMaskImage;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class RenderSVGResourceClipper FINAL : public RenderSVGResourceContainer {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> effectiveTransform.scale(scale.width(), scale.height());
</span><span class="cx"> effectiveTransform.multiply(filterData->shearFreeAbsoluteTransform);
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> sourceGraphic;
</del><ins>+ std::unique_ptr<ImageBuffer> sourceGraphic;
</ins><span class="cx"> RenderingMode renderingMode = renderer.frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
</span><span class="cx"> if (!SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, sourceGraphic, ColorSpaceLinearRGB, renderingMode)) {
</span><span class="cx"> ASSERT(!m_filter.contains(&renderer));
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> GraphicsContext* sourceGraphicContext = sourceGraphic->context();
</span><span class="cx"> ASSERT(sourceGraphicContext);
</span><span class="cx">
</span><del>- filterData->sourceGraphicBuffer = sourceGraphic.release();
</del><ins>+ filterData->sourceGraphicBuffer = std::move(sourceGraphic);
</ins><span class="cx"> filterData->savedContext = context;
</span><span class="cx">
</span><span class="cx"> context = sourceGraphicContext;
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> // initial filtering process. We just take the stored filter result on a
</span><span class="cx"> // second drawing.
</span><span class="cx"> if (filterData->state != FilterData::Built)
</span><del>- filterData->filter->setSourceImage(filterData->sourceGraphicBuffer.release());
</del><ins>+ filterData->filter->setSourceImage(std::move(filterData->sourceGraphicBuffer));
</ins><span class="cx">
</span><span class="cx"> // Always true if filterData is just built (filterData->state == FilterData::Built).
</span><span class="cx"> if (!lastEffect->hasResult()) {
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> context->concatCTM(filterData->shearFreeAbsoluteTransform);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- filterData->sourceGraphicBuffer.clear();
</del><ins>+ filterData->sourceGraphicBuffer.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect RenderSVGResourceFilter::resourceBoundingBox(const RenderObject& object)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> #include "SVGFilterElement.h"
</span><span class="cx"> #include "SVGUnitTypes.h"
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -53,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SVGFilter> filter;
</span><span class="cx"> std::unique_ptr<SVGFilterBuilder> builder;
</span><del>- OwnPtr<ImageBuffer> sourceGraphicBuffer;
</del><ins>+ std::unique_ptr<ImageBuffer> sourceGraphicBuffer;
</ins><span class="cx"> GraphicsContext* savedContext;
</span><span class="cx"> AffineTransform shearFreeAbsoluteTransform;
</span><span class="cx"> FloatRect boundaries;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -58,10 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><del>-static inline bool createMaskAndSwapContextForTextGradient(GraphicsContext*& context,
- GraphicsContext*& savedContext,
- OwnPtr<ImageBuffer>& imageBuffer,
- RenderObject* object)
</del><ins>+static inline bool createMaskAndSwapContextForTextGradient(GraphicsContext*& context, GraphicsContext*& savedContext, std::unique_ptr<ImageBuffer>& imageBuffer, RenderObject* object)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* textRootBlock = RenderSVGText::locateRenderSVGTextAncestor(object);
</span><span class="cx"> ASSERT(textRootBlock);
</span><span class="lines">@@ -70,7 +67,7 @@
</span><span class="cx"> SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(textRootBlock, absoluteTransform);
</span><span class="cx">
</span><span class="cx"> FloatRect repaintRect = textRootBlock->repaintRectInLocalCoordinates();
</span><del>- OwnPtr<ImageBuffer> maskImage;
</del><ins>+ std::unique_ptr<ImageBuffer> maskImage;
</ins><span class="cx"> if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, maskImage, ColorSpaceDeviceRGB, Unaccelerated))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -79,16 +76,11 @@
</span><span class="cx"> ASSERT(maskImage);
</span><span class="cx"> savedContext = context;
</span><span class="cx"> context = maskImageContext;
</span><del>- imageBuffer = maskImage.release();
</del><ins>+ imageBuffer = std::move(maskImage);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline AffineTransform clipToTextMask(GraphicsContext* context,
- OwnPtr<ImageBuffer>& imageBuffer,
- FloatRect& targetRect,
- RenderObject* object,
- bool boundingBoxMode,
- const AffineTransform& gradientTransform)
</del><ins>+static inline AffineTransform clipToTextMask(GraphicsContext* context, std::unique_ptr<ImageBuffer>& imageBuffer, FloatRect& targetRect, RenderObject* object, bool boundingBoxMode, const AffineTransform& gradientTransform)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* textRootBlock = RenderSVGText::locateRenderSVGTextAncestor(object);
</span><span class="cx"> ASSERT(textRootBlock);
</span><span class="lines">@@ -225,7 +217,7 @@
</span><span class="cx"> context->setFillGradient(gradientData->gradient);
</span><span class="cx">
</span><span class="cx"> context->fillRect(targetRect);
</span><del>- m_imageBuffer.clear();
</del><ins>+ m_imageBuffer.reset();
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(renderer);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> GraphicsContext* m_savedContext;
</span><del>- OwnPtr<ImageBuffer> m_imageBuffer;
</del><ins>+ std::unique_ptr<ImageBuffer> m_imageBuffer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!drawContentIntoMaskImage(maskerData, colorSpace, &renderer)) {
</span><del>- maskerData->maskImage.clear();
</del><ins>+ maskerData->maskImage.reset();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -30,12 +30,11 @@
</span><span class="cx"> #include "SVGUnitTypes.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct MaskerData {
</span><del>- OwnPtr<ImageBuffer> maskImage;
</del><ins>+ std::unique_ptr<ImageBuffer> maskImage;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class RenderSVGResourceMasker FINAL : public RenderSVGResourceContainer {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> static_cast<float>(m_attributes.patternTransform().yScale()));
</span><span class="cx">
</span><span class="cx"> // Build tile image.
</span><del>- OwnPtr<ImageBuffer> tileImage = createTileImage(m_attributes, tileBoundaries, absoluteTileBoundaries, tileImageTransform, clampedAbsoluteTileBoundaries);
</del><ins>+ std::unique_ptr<ImageBuffer> tileImage = createTileImage(m_attributes, tileBoundaries, absoluteTileBoundaries, tileImageTransform, clampedAbsoluteTileBoundaries);
</ins><span class="cx"> if (!tileImage)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -240,15 +240,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ImageBuffer> RenderSVGResourcePattern::createTileImage(const PatternAttributes& attributes,
- const FloatRect& tileBoundaries,
- const FloatRect& absoluteTileBoundaries,
- const AffineTransform& tileImageTransform,
- FloatRect& clampedAbsoluteTileBoundaries) const
</del><ins>+std::unique_ptr<ImageBuffer> RenderSVGResourcePattern::createTileImage(const PatternAttributes& attributes, const FloatRect& tileBoundaries, const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform, FloatRect& clampedAbsoluteTileBoundaries) const
</ins><span class="cx"> {
</span><span class="cx"> clampedAbsoluteTileBoundaries = SVGRenderingContext::clampedAbsoluteTargetRect(absoluteTileBoundaries);
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> tileImage;
</del><ins>+ std::unique_ptr<ImageBuffer> tileImage;
</ins><span class="cx">
</span><span class="cx"> if (!SVGRenderingContext::createImageBufferForPattern(absoluteTileBoundaries, clampedAbsoluteTileBoundaries, tileImage, ColorSpaceDeviceRGB, Unaccelerated))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -279,7 +275,7 @@
</span><span class="cx"> SVGRenderingContext::renderSubtreeToImageBuffer(tileImage.get(), *child.renderer(), contentTransformation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return tileImage.release();
</del><ins>+ return tileImage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -64,9 +64,7 @@
</span><span class="cx">
</span><span class="cx"> bool buildTileImageTransform(RenderObject*, const PatternAttributes&, const SVGPatternElement&, FloatRect& patternBoundaries, AffineTransform& tileImageTransform) const;
</span><span class="cx">
</span><del>- PassOwnPtr<ImageBuffer> createTileImage(const PatternAttributes&, const FloatRect& tileBoundaries,
- const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform,
- FloatRect& clampedAbsoluteTileBoundaries) const;
</del><ins>+ std::unique_ptr<ImageBuffer> createTileImage(const PatternAttributes&, const FloatRect& tileBoundaries, const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform, FloatRect& clampedAbsoluteTileBoundaries) const;
</ins><span class="cx">
</span><span class="cx"> PatternData* buildPattern(RenderObject*, unsigned short resourceMode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> absoluteTransform.scale(deviceScaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, OwnPtr<ImageBuffer>& imageBuffer, ColorSpace colorSpace, RenderingMode renderingMode)
</del><ins>+bool SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, std::unique_ptr<ImageBuffer>& imageBuffer, ColorSpace colorSpace, RenderingMode renderingMode)
</ins><span class="cx"> {
</span><span class="cx"> IntRect paintRect = calculateImageBufferRect(targetRect, absoluteTransform);
</span><span class="cx"> // Don't create empty ImageBuffers.
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> IntSize clampedSize = clampedAbsoluteSize(paintRect.size());
</span><del>- OwnPtr<ImageBuffer> image = ImageBuffer::create(clampedSize, 1, colorSpace, renderingMode);
</del><ins>+ std::unique_ptr<ImageBuffer> image = ImageBuffer::create(clampedSize, 1, colorSpace, renderingMode);
</ins><span class="cx"> if (!image)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -243,11 +243,11 @@
</span><span class="cx"> imageContext->translate(-paintRect.x(), -paintRect.y());
</span><span class="cx"> imageContext->concatCTM(absoluteTransform);
</span><span class="cx">
</span><del>- imageBuffer = image.release();
</del><ins>+ imageBuffer = std::move(image);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGRenderingContext::createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>& imageBuffer, ColorSpace colorSpace, RenderingMode renderingMode)
</del><ins>+bool SVGRenderingContext::createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, std::unique_ptr<ImageBuffer>& imageBuffer, ColorSpace colorSpace, RenderingMode renderingMode)
</ins><span class="cx"> {
</span><span class="cx"> IntSize imageSize(roundedIntSize(clampedAbsoluteTargetRect.size()));
</span><span class="cx"> IntSize unclampedImageSize(roundedIntSize(absoluteTargetRect.size()));
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> if (imageSize.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> image = ImageBuffer::create(imageSize, 1, colorSpace, renderingMode);
</del><ins>+ std::unique_ptr<ImageBuffer> image = ImageBuffer::create(imageSize, 1, colorSpace, renderingMode);
</ins><span class="cx"> if (!image)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> // Compensate rounding effects, as the absolute target rect is using floating-point numbers and the image buffer size is integer.
</span><span class="cx"> imageContext->scale(FloatSize(unclampedImageSize.width() / absoluteTargetRect.width(), unclampedImageSize.height() / absoluteTargetRect.height()));
</span><span class="cx">
</span><del>- imageBuffer = image.release();
</del><ins>+ imageBuffer = std::move(image);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> contentTransformation = savedContentTransformation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGRenderingContext::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>& imageBuffer, bool safeToClear)
</del><ins>+void SVGRenderingContext::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, std::unique_ptr<ImageBuffer>& imageBuffer, bool safeToClear)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(context);
</span><span class="cx"> ASSERT(imageBuffer);
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> // When nesting resources, with objectBoundingBox as content unit types, there's no use in caching the
</span><span class="cx"> // resulting image buffer as the parent resource already caches the result.
</span><span class="cx"> if (safeToClear && !currentContentTransformation().isIdentity())
</span><del>- imageBuffer.clear();
</del><ins>+ imageBuffer.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect SVGRenderingContext::clampedAbsoluteTargetRect(const FloatRect& absoluteTargetRect)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> transform.recompose(decomposition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGRenderingContext::bufferForeground(OwnPtr<ImageBuffer>& imageBuffer)
</del><ins>+bool SVGRenderingContext::bufferForeground(std::unique_ptr<ImageBuffer>& imageBuffer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_paintInfo);
</span><span class="cx"> ASSERT(m_renderer->isSVGImage());
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> IntSize expandedBoundingBox = expandedIntSize(boundingBox.size());
</span><span class="cx"> IntSize bufferSize(static_cast<int>(ceil(expandedBoundingBox.width() * transform.xScale())), static_cast<int>(ceil(expandedBoundingBox.height() * transform.yScale())));
</span><span class="cx"> if (bufferSize != imageBuffer->internalSize())
</span><del>- imageBuffer.clear();
</del><ins>+ imageBuffer.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Create a new buffer and paint the foreground into it.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -76,12 +76,12 @@
</span><span class="cx"> void prepareToRenderSVGContent(RenderElement&, PaintInfo&, NeedsGraphicsContextSave = DontSaveGraphicsContext);
</span><span class="cx"> bool isRenderingPrepared() const { return m_renderingFlags & RenderingPrepared; }
</span><span class="cx">
</span><del>- static bool createImageBuffer(const FloatRect& paintRect, const AffineTransform& absoluteTransform, OwnPtr<ImageBuffer>&, ColorSpace, RenderingMode);
</del><ins>+ static bool createImageBuffer(const FloatRect& paintRect, const AffineTransform& absoluteTransform, std::unique_ptr<ImageBuffer>&, ColorSpace, RenderingMode);
</ins><span class="cx"> // Patterns need a different float-to-integer coordinate mapping.
</span><del>- static bool createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>&, ColorSpace, RenderingMode);
</del><ins>+ static bool createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, std::unique_ptr<ImageBuffer>&, ColorSpace, RenderingMode);
</ins><span class="cx">
</span><span class="cx"> static void renderSubtreeToImageBuffer(ImageBuffer*, RenderElement&, const AffineTransform&);
</span><del>- static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&, bool safeToClear);
</del><ins>+ static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, std::unique_ptr<ImageBuffer>&, bool safeToClear);
</ins><span class="cx">
</span><span class="cx"> static float calculateScreenFontSizeScalingFactor(const RenderObject*);
</span><span class="cx"> static void calculateTransformationToOutermostCoordinateSystem(const RenderObject*, AffineTransform& absoluteTransform);
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Support for the buffered-rendering hint.
</span><del>- bool bufferForeground(OwnPtr<ImageBuffer>&);
</del><ins>+ bool bufferForeground(std::unique_ptr<ImageBuffer>&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // To properly revert partially successful initializtions in the destructor, we record all successful steps.
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (159790 => 159791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2013-11-26 20:24:58 UTC (rev 159790)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2013-11-26 22:58:17 UTC (rev 159791)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer = ImageBuffer::create(size(), 1);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(size(), 1);
</ins><span class="cx"> if (!buffer) // failed to allocate image
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> FloatRect imageBufferSize = zoomedContainerRect;
</span><span class="cx"> imageBufferSize.scale(imageBufferScale.width(), imageBufferScale.height());
</span><span class="cx">
</span><del>- OwnPtr<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(imageBufferSize.size()), 1);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(imageBufferSize.size()), 1);
</ins><span class="cx"> if (!buffer) // Failed to allocate buffer.
</span><span class="cx"> return;
</span><span class="cx"> drawForContainer(buffer->context(), containerSize, zoom, imageBufferSize, zoomedContainerRect, ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal);
</span></span></pre>
</div>
</div>
</body>
</html>