<!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>[180268] 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/180268">180268</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 09:52:17 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr from CanvasRenderingContext2D.
<https://webkit.org/b/141749>
Reviewed by Gyuyoung Kim.
Switch from using PassRefPtr to RefPtr/Ref in CanvasRenderingContext2D.
* html/TextMetrics.h:
(WebCore::TextMetrics::create): Changed create() helper to return Ref.
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::prepareGradientForDashboard): Changed to take a reference.
(WebCore::CanvasRenderingContext2D::createLinearGradient):
(WebCore::CanvasRenderingContext2D::createRadialGradient):
(WebCore::CanvasRenderingContext2D::createPattern):
(WebCore::createEmptyImageData):
(WebCore::CanvasRenderingContext2D::createImageData):
(WebCore::CanvasRenderingContext2D::getImageData):
(WebCore::CanvasRenderingContext2D::webkitGetImageDataHD): Made these return RefPtr. Also did
a bunch of 0 -> nullptr conversion, removed a bunch of unnecessary RefPtr::release() calls,
and changed a PassRefPtr argument to RefPtr&&.
(WebCore::CanvasRenderingContext2D::measureText): Made this return Ref.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlTextMetricsh">trunk/Source/WebCore/html/TextMetrics.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180267 => 180268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-18 17:34:50 UTC (rev 180267)
+++ trunk/Source/WebCore/ChangeLog        2015-02-18 17:52:17 UTC (rev 180268)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-18 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from CanvasRenderingContext2D.
+ <https://webkit.org/b/141749>
+
+ Reviewed by Gyuyoung Kim.
+
+ Switch from using PassRefPtr to RefPtr/Ref in CanvasRenderingContext2D.
+
+ * html/TextMetrics.h:
+ (WebCore::TextMetrics::create): Changed create() helper to return Ref.
+
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::prepareGradientForDashboard): Changed to take a reference.
+
+ (WebCore::CanvasRenderingContext2D::createLinearGradient):
+ (WebCore::CanvasRenderingContext2D::createRadialGradient):
+ (WebCore::CanvasRenderingContext2D::createPattern):
+ (WebCore::createEmptyImageData):
+ (WebCore::CanvasRenderingContext2D::createImageData):
+ (WebCore::CanvasRenderingContext2D::getImageData):
+ (WebCore::CanvasRenderingContext2D::webkitGetImageDataHD): Made these return RefPtr. Also did
+ a bunch of 0 -> nullptr conversion, removed a bunch of unnecessary RefPtr::release() calls,
+ and changed a PassRefPtr argument to RefPtr&&.
+
+ (WebCore::CanvasRenderingContext2D::measureText): Made this return Ref.
+
</ins><span class="cx"> 2015-02-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r180260.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextMetricsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextMetrics.h (180267 => 180268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextMetrics.h        2015-02-18 17:34:50 UTC (rev 180267)
+++ trunk/Source/WebCore/html/TextMetrics.h        2015-02-18 17:52:17 UTC (rev 180268)
</span><span class="lines">@@ -26,14 +26,14 @@
</span><span class="cx"> #ifndef TextMetrics_h
</span><span class="cx"> #define TextMetrics_h
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class TextMetrics : public RefCounted<TextMetrics> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<TextMetrics> create() { return adoptRef(new TextMetrics); }
</del><ins>+ static Ref<TextMetrics> create() { return adoptRef(*new TextMetrics); }
</ins><span class="cx">
</span><span class="cx"> float width() const { return m_width; }
</span><span class="cx"> void setWidth(float w) { m_width = w; }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (180267 => 180268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2015-02-18 17:34:50 UTC (rev 180267)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2015-02-18 17:52:17 UTC (rev 180268)
</span><span class="lines">@@ -1699,65 +1699,65 @@
</span><span class="cx"> compositeBuffer(buffer.get(), bufferRect, op);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::prepareGradientForDashboard(CanvasGradient* gradient) const
</del><ins>+void CanvasRenderingContext2D::prepareGradientForDashboard(CanvasGradient& gradient) const
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (m_usesDashboardCompatibilityMode)
</span><del>- gradient->setDashboardCompatibilityMode();
</del><ins>+ gradient.setDashboardCompatibilityMode();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(gradient);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGradient(float x0, float y0, float x1, float y1, ExceptionCode& ec)
</del><ins>+RefPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGradient(float x0, float y0, float x1, float y1, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(x1) || !std::isfinite(y1)) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1));
</del><ins>+ Ref<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1));
</ins><span class="cx"> prepareGradientForDashboard(gradient.get());
</span><del>- return gradient.release();
</del><ins>+ return WTF::move(gradient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CanvasGradient> CanvasRenderingContext2D::createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionCode& ec)
</del><ins>+RefPtr<CanvasGradient> CanvasRenderingContext2D::createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(r0) || !std::isfinite(x1) || !std::isfinite(y1) || !std::isfinite(r1)) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (r0 < 0 || r1 < 0) {
</span><span class="cx"> ec = INDEX_SIZE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1);
</del><ins>+ Ref<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1);
</ins><span class="cx"> prepareGradientForDashboard(gradient.get());
</span><del>- return gradient.release();
</del><ins>+ return WTF::move(gradient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageElement* image,
</del><ins>+RefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageElement* image,
</ins><span class="cx"> const String& repetitionType, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!image) {
</span><span class="cx"> ec = TYPE_MISMATCH_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> bool repeatX, repeatY;
</span><span class="cx"> ec = 0;
</span><span class="cx"> CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, ec);
</span><span class="cx"> if (ec)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!image->complete())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> CachedImage* cachedImage = image->cachedImage();
</span><span class="cx"> if (!cachedImage || cachedImage->status() == CachedResource::LoadError) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!image->cachedImage()->imageForRenderer(image->renderer()))
</span><span class="lines">@@ -1767,23 +1767,23 @@
</span><span class="cx"> return CanvasPattern::create(cachedImage->imageForRenderer(image->renderer()), repeatX, repeatY, originClean);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLCanvasElement* canvas,
</del><ins>+RefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLCanvasElement* canvas,
</ins><span class="cx"> const String& repetitionType, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!canvas) {
</span><span class="cx"> ec = TYPE_MISMATCH_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!canvas->width() || !canvas->height() || !canvas->buffer()) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool repeatX, repeatY;
</span><span class="cx"> ec = 0;
</span><span class="cx"> CanvasPattern::parseRepetitionType(repetitionType, repeatX, repeatY, ec);
</span><span class="cx"> if (ec)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return CanvasPattern::create(canvas->copiedImage(), repeatX, repeatY, canvas->originClean());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1841,41 +1841,41 @@
</span><span class="cx"> return canvas()->drawingContext();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<ImageData> createEmptyImageData(const IntSize& size)
</del><ins>+static RefPtr<ImageData> createEmptyImageData(const IntSize& size)
</ins><span class="cx"> {
</span><span class="cx"> if (RefPtr<ImageData> data = ImageData::create(size)) {
</span><span class="cx"> data->data()->zeroFill();
</span><del>- return data.release();
</del><ins>+ return data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(PassRefPtr<ImageData> imageData, ExceptionCode& ec) const
</del><ins>+RefPtr<ImageData> CanvasRenderingContext2D::createImageData(RefPtr<ImageData>&& imageData, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> if (!imageData) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return createEmptyImageData(imageData->size());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionCode& ec) const
</del><ins>+RefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> ec = 0;
</span><span class="cx"> if (!sw || !sh) {
</span><span class="cx"> ec = INDEX_SIZE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!std::isfinite(sw) || !std::isfinite(sh)) {
</span><span class="cx"> ec = TypeError;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize logicalSize(fabs(sw), fabs(sh));
</span><span class="cx"> if (!logicalSize.isExpressibleAsIntSize())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> IntSize size = expandedIntSize(logicalSize);
</span><span class="cx"> if (size.width() < 1)
</span><span class="lines">@@ -1886,32 +1886,32 @@
</span><span class="cx"> return createEmptyImageData(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</del><ins>+RefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> return getImageData(ImageBuffer::LogicalCoordinateSystem, sx, sy, sw, sh, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> CanvasRenderingContext2D::webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</del><ins>+RefPtr<ImageData> CanvasRenderingContext2D::webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> return getImageData(ImageBuffer::BackingStoreCoordinateSystem, sx, sy, sw, sh, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::CoordinateSystem coordinateSystem, float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</del><ins>+RefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::CoordinateSystem coordinateSystem, float sx, float sy, float sw, float sh, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> if (!canvas()->originClean()) {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Unable to get image data from canvas because the canvas has been tainted by cross-origin data.")));
</span><span class="cx"> canvas()->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
</span><span class="cx"> ec = SECURITY_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!sw || !sh) {
</span><span class="cx"> ec = INDEX_SIZE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!std::isfinite(sx) || !std::isfinite(sy) || !std::isfinite(sw) || !std::isfinite(sh)) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sw < 0) {
</span><span class="lines">@@ -1929,7 +1929,7 @@
</span><span class="cx"> if (logicalRect.height() < 1)
</span><span class="cx"> logicalRect.setHeight(1);
</span><span class="cx"> if (!logicalRect.isExpressibleAsIntRect())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> IntRect imageDataRect = enclosingIntRect(logicalRect);
</span><span class="cx"> ImageBuffer* buffer = canvas()->buffer();
</span><span class="lines">@@ -1938,7 +1938,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Uint8ClampedArray> byteArray = buffer->getUnmultipliedImageData(imageDataRect, coordinateSystem);
</span><span class="cx"> if (!byteArray)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return ImageData::create(imageDataRect.size(), byteArray.release());
</span><span class="cx"> }
</span><span class="lines">@@ -2257,16 +2257,16 @@
</span><span class="cx"> text = String::adopt(charVector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TextMetrics> CanvasRenderingContext2D::measureText(const String& text)
</del><ins>+Ref<TextMetrics> CanvasRenderingContext2D::measureText(const String& text)
</ins><span class="cx"> {
</span><del>- RefPtr<TextMetrics> metrics = TextMetrics::create();
</del><ins>+ Ref<TextMetrics> metrics = TextMetrics::create();
</ins><span class="cx">
</span><span class="cx"> String normalizedText = text;
</span><span class="cx"> normalizeSpaces(normalizedText);
</span><span class="cx">
</span><span class="cx"> metrics->setWidth(accessFont().width(TextRun(normalizedText)));
</span><span class="cx">
</span><del>- return metrics.release();
</del><ins>+ return metrics;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth, bool useMaxWidth)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (180267 => 180268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h        2015-02-18 17:34:50 UTC (rev 180267)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h        2015-02-18 17:52:17 UTC (rev 180268)
</span><span class="lines">@@ -183,15 +183,15 @@
</span><span class="cx">
</span><span class="cx"> void setCompositeOperation(const String&);
</span><span class="cx">
</span><del>- PassRefPtr<CanvasGradient> createLinearGradient(float x0, float y0, float x1, float y1, ExceptionCode&);
- PassRefPtr<CanvasGradient> createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionCode&);
- PassRefPtr<CanvasPattern> createPattern(HTMLImageElement*, const String& repetitionType, ExceptionCode&);
- PassRefPtr<CanvasPattern> createPattern(HTMLCanvasElement*, const String& repetitionType, ExceptionCode&);
</del><ins>+ RefPtr<CanvasGradient> createLinearGradient(float x0, float y0, float x1, float y1, ExceptionCode&);
+ RefPtr<CanvasGradient> createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionCode&);
+ RefPtr<CanvasPattern> createPattern(HTMLImageElement*, const String& repetitionType, ExceptionCode&);
+ RefPtr<CanvasPattern> createPattern(HTMLCanvasElement*, const String& repetitionType, ExceptionCode&);
</ins><span class="cx">
</span><del>- PassRefPtr<ImageData> createImageData(PassRefPtr<ImageData>, ExceptionCode&) const;
- PassRefPtr<ImageData> createImageData(float width, float height, ExceptionCode&) const;
- PassRefPtr<ImageData> getImageData(float sx, float sy, float sw, float sh, ExceptionCode&) const;
- PassRefPtr<ImageData> webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionCode&) const;
</del><ins>+ RefPtr<ImageData> createImageData(RefPtr<ImageData>&&, ExceptionCode&) const;
+ RefPtr<ImageData> createImageData(float width, float height, ExceptionCode&) const;
+ RefPtr<ImageData> getImageData(float sx, float sy, float sw, float sh, ExceptionCode&) const;
+ RefPtr<ImageData> webkitGetImageDataHD(float sx, float sy, float sw, float sh, ExceptionCode&) const;
</ins><span class="cx"> void putImageData(ImageData*, float dx, float dy, ExceptionCode&);
</span><span class="cx"> void putImageData(ImageData*, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionCode&);
</span><span class="cx"> void webkitPutImageDataHD(ImageData*, float dx, float dy, ExceptionCode&);
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> void fillText(const String& text, float x, float y, float maxWidth);
</span><span class="cx"> void strokeText(const String& text, float x, float y);
</span><span class="cx"> void strokeText(const String& text, float x, float y, float maxWidth);
</span><del>- PassRefPtr<TextMetrics> measureText(const String& text);
</del><ins>+ Ref<TextMetrics> measureText(const String& text);
</ins><span class="cx">
</span><span class="cx"> LineCap getLineCap() const { return state().m_lineCap; }
</span><span class="cx"> LineJoin getLineJoin() const { return state().m_lineJoin; }
</span><span class="lines">@@ -339,9 +339,9 @@
</span><span class="cx">
</span><span class="cx"> template<class T> void fullCanvasCompositedDrawImage(T*, ColorSpace, const FloatRect&, const FloatRect&, CompositeOperator);
</span><span class="cx">
</span><del>- void prepareGradientForDashboard(CanvasGradient* gradient) const;
</del><ins>+ void prepareGradientForDashboard(CanvasGradient& gradient) const;
</ins><span class="cx">
</span><del>- PassRefPtr<ImageData> getImageData(ImageBuffer::CoordinateSystem, float sx, float sy, float sw, float sh, ExceptionCode&) const;
</del><ins>+ RefPtr<ImageData> getImageData(ImageBuffer::CoordinateSystem, float sx, float sy, float sw, float sh, ExceptionCode&) const;
</ins><span class="cx"> void putImageData(ImageData*, ImageBuffer::CoordinateSystem, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> virtual bool is2d() const override { return true; }
</span></span></pre>
</div>
</div>
</body>
</html>