<!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>[174382] 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/174382">174382</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-06 20:28:32 -0700 (Mon, 06 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CanvasPattern always has an internal WebCore::Pattern.
<https://webkit.org/b/137456>
Use more Ref & PassRef for CanvasPattern and Pattern.
Removed some impossible null checks in GraphicsContext that
got exposed as compile errors with these changes.
Reviewed by Anders Carlsson.
* html/canvas/CanvasPattern.h:
(WebCore::CanvasPattern::pattern):
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::setStrokePattern):
(WebCore::GraphicsContext::setFillPattern):
* platform/graphics/GraphicsContext.h:
* platform/graphics/Pattern.cpp:
(WebCore::Pattern::create):
* platform/graphics/Pattern.h:
* platform/graphics/filters/FETile.cpp:
(WebCore::FETile::platformApplySoftware):
* rendering/svg/RenderSVGPath.cpp:
(WebCore::useStrokeStyleToFill):
* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::applyResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasPatternh">trunk/Source/WebCore/html/canvas/CanvasPattern.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="#trunkSourceWebCoreplatformgraphicsPatterncpp">trunk/Source/WebCore/platform/graphics/Pattern.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPatternh">trunk/Source/WebCore/platform/graphics/Pattern.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFETilecpp">trunk/Source/WebCore/platform/graphics/filters/FETile.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGPathcpp">trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/ChangeLog 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-10-06 Andreas Kling <akling@apple.com>
+
+ CanvasPattern always has an internal WebCore::Pattern.
+ <https://webkit.org/b/137456>
+
+ Use more Ref & PassRef for CanvasPattern and Pattern.
+
+ Removed some impossible null checks in GraphicsContext that
+ got exposed as compile errors with these changes.
+
+ Reviewed by Anders Carlsson.
+
+ * html/canvas/CanvasPattern.h:
+ (WebCore::CanvasPattern::pattern):
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::setStrokePattern):
+ (WebCore::GraphicsContext::setFillPattern):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/Pattern.cpp:
+ (WebCore::Pattern::create):
+ * platform/graphics/Pattern.h:
+ * platform/graphics/filters/FETile.cpp:
+ (WebCore::FETile::platformApplySoftware):
+ * rendering/svg/RenderSVGPath.cpp:
+ (WebCore::useStrokeStyleToFill):
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ (WebCore::RenderSVGResourcePattern::applyResource):
+
</ins><span class="cx"> 2014-10-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Restore previous scroll position using restoreViewState()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasPatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasPattern.h (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasPattern.h 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/html/canvas/CanvasPattern.h 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/RefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,14 +45,15 @@
</span><span class="cx">
</span><span class="cx"> static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
</span><span class="cx">
</span><del>- Pattern* pattern() const { return m_pattern.get(); }
</del><ins>+ Pattern& pattern() { return m_pattern.get(); }
+ const Pattern& pattern() const { return m_pattern.get(); }
</ins><span class="cx">
</span><span class="cx"> bool originClean() const { return m_originClean; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
</span><span class="cx">
</span><del>- RefPtr<Pattern> m_pattern;
</del><ins>+ Ref<Pattern> m_pattern;
</ins><span class="cx"> bool m_originClean;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -335,26 +335,16 @@
</span><span class="cx"> return m_state;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setStrokePattern(PassRefPtr<Pattern> pattern)
</del><ins>+void GraphicsContext::setStrokePattern(PassRef<Pattern> pattern)
</ins><span class="cx"> {
</span><del>- ASSERT(pattern);
- if (!pattern) {
- setStrokeColor(Color::black, ColorSpaceDeviceRGB);
- return;
- }
</del><span class="cx"> m_state.strokeGradient.clear();
</span><del>- m_state.strokePattern = pattern;
</del><ins>+ m_state.strokePattern = WTF::move(pattern);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setFillPattern(PassRefPtr<Pattern> pattern)
</del><ins>+void GraphicsContext::setFillPattern(PassRef<Pattern> pattern)
</ins><span class="cx"> {
</span><del>- ASSERT(pattern);
- if (!pattern) {
- setFillColor(Color::black, ColorSpaceDeviceRGB);
- return;
- }
</del><span class="cx"> m_state.fillGradient.clear();
</span><del>- m_state.fillPattern = pattern;
</del><ins>+ m_state.fillPattern = WTF::move(pattern);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setStrokeGradient(PassRefPtr<Gradient> gradient)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> ColorSpace strokeColorSpace() const;
</span><span class="cx"> WEBCORE_EXPORT void setStrokeColor(const Color&, ColorSpace);
</span><span class="cx">
</span><del>- void setStrokePattern(PassRefPtr<Pattern>);
</del><ins>+ void setStrokePattern(PassRef<Pattern>);
</ins><span class="cx"> Pattern* strokePattern() const;
</span><span class="cx">
</span><span class="cx"> void setStrokeGradient(PassRefPtr<Gradient>);
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> ColorSpace fillColorSpace() const;
</span><span class="cx"> WEBCORE_EXPORT void setFillColor(const Color&, ColorSpace);
</span><span class="cx">
</span><del>- void setFillPattern(PassRefPtr<Pattern>);
</del><ins>+ void setFillPattern(PassRef<Pattern>);
</ins><span class="cx"> Pattern* fillPattern() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setFillGradient(PassRefPtr<Gradient>);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Pattern.cpp (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Pattern.cpp 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/platform/graphics/Pattern.cpp 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<Pattern> Pattern::create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
</del><ins>+PassRef<Pattern> Pattern::create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Pattern(tileImage, repeatX, repeatY));
</del><ins>+ return adoptRef(*new Pattern(tileImage, repeatX, repeatY));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Pattern::Pattern(PassRefPtr<Image> image, bool repeatX, bool repeatY)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Pattern.h (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Pattern.h 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/platform/graphics/Pattern.h 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class Pattern : public RefCounted<Pattern> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY);
</del><ins>+ static PassRef<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY);
</ins><span class="cx"> virtual ~Pattern();
</span><span class="cx">
</span><span class="cx"> Image* tileImage() const { return m_tileImage.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFETilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FETile.cpp (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -71,13 +71,13 @@
</span><span class="cx"> tileImageContext->translate(-inMaxEffectLocation.x(), -inMaxEffectLocation.y());
</span><span class="cx"> tileImageContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, in->absolutePaintRect().location());
</span><span class="cx">
</span><del>- RefPtr<Pattern> pattern = Pattern::create(tileImage->copyImage(CopyBackingStore), true, true);
</del><ins>+ auto pattern = Pattern::create(tileImage->copyImage(CopyBackingStore), true, true);
</ins><span class="cx">
</span><span class="cx"> AffineTransform patternTransform;
</span><span class="cx"> patternTransform.translate(inMaxEffectLocation.x() - maxEffectLocation.x(), inMaxEffectLocation.y() - maxEffectLocation.y());
</span><del>- pattern->setPatternSpaceTransform(patternTransform);
</del><ins>+ pattern.get().setPatternSpaceTransform(patternTransform);
</ins><span class="cx"> GraphicsContext* filterContext = resultImage->context();
</span><del>- filterContext->setFillPattern(pattern);
</del><ins>+ filterContext->setFillPattern(WTF::move(pattern));
</ins><span class="cx"> filterContext->fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> if (Gradient* gradient = context->strokeGradient())
</span><span class="cx"> context->setFillGradient(gradient);
</span><span class="cx"> else if (Pattern* pattern = context->strokePattern())
</span><del>- context->setFillPattern(pattern);
</del><ins>+ context->setFillPattern(*pattern);
</ins><span class="cx"> else
</span><span class="cx"> context->setFillColor(context->strokeColor(), context->strokeColorSpace());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (174381 => 174382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-10-07 03:10:05 UTC (rev 174381)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-10-07 03:28:32 UTC (rev 174382)
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx">
</span><span class="cx"> if (resourceMode & ApplyToFillMode) {
</span><span class="cx"> context->setAlpha(svgStyle.fillOpacity());
</span><del>- context->setFillPattern(patternData->pattern);
</del><ins>+ context->setFillPattern(*patternData->pattern);
</ins><span class="cx"> context->setFillRule(svgStyle.fillRule());
</span><span class="cx"> } else if (resourceMode & ApplyToStrokeMode) {
</span><span class="cx"> if (svgStyle.vectorEffect() == VE_NON_SCALING_STROKE)
</span><span class="cx"> patternData->pattern->setPatternSpaceTransform(transformOnNonScalingStroke(&renderer, patternData->transform));
</span><span class="cx"> context->setAlpha(svgStyle.strokeOpacity());
</span><del>- context->setStrokePattern(patternData->pattern);
</del><ins>+ context->setStrokePattern(*patternData->pattern);
</ins><span class="cx"> SVGRenderSupport::applyStrokeStyleToContext(context, style, renderer);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>