<!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>[149696] 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/149696">149696</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-07 15:14:04 -0700 (Tue, 07 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move CanvasGradient and CanvasPattern in the union of CanvasStyle
https://bugs.webkit.org/show_bug.cgi?id=115759

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2013-05-07
Reviewed by Andreas Kling.

The Gradient and Pattern are exclusive with the other values, but they
were left out of the union because they are ref-counted.

This patch moves them in the union, and simply does the ref-counting manually.

* html/canvas/CanvasStyle.cpp:
(WebCore::CanvasStyle::CanvasStyle):
(WebCore::CanvasStyle::~CanvasStyle):
* html/canvas/CanvasStyle.h:
(CanvasStyle):
(WebCore::CanvasStyle::canvasGradient):
(WebCore::CanvasStyle::canvasPattern):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasStylecpp">trunk/Source/WebCore/html/canvas/CanvasStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasStyleh">trunk/Source/WebCore/html/canvas/CanvasStyle.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149695 => 149696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-07 22:06:15 UTC (rev 149695)
+++ trunk/Source/WebCore/ChangeLog        2013-05-07 22:14:04 UTC (rev 149696)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-05-07  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
+
+        Move CanvasGradient and CanvasPattern in the union of CanvasStyle
+        https://bugs.webkit.org/show_bug.cgi?id=115759
+
+        Reviewed by Andreas Kling.
+
+        The Gradient and Pattern are exclusive with the other values, but they
+        were left out of the union because they are ref-counted.
+
+        This patch moves them in the union, and simply does the ref-counting manually.
+
+        * html/canvas/CanvasStyle.cpp:
+        (WebCore::CanvasStyle::CanvasStyle):
+        (WebCore::CanvasStyle::~CanvasStyle):
+        * html/canvas/CanvasStyle.h:
+        (CanvasStyle):
+        (WebCore::CanvasStyle::canvasGradient):
+        (WebCore::CanvasStyle::canvasPattern):
+
</ins><span class="cx"> 2013-05-07  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove custom allocator support from PODArena
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasStyle.cpp (149695 => 149696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasStyle.cpp        2013-05-07 22:06:15 UTC (rev 149695)
+++ trunk/Source/WebCore/html/canvas/CanvasStyle.cpp        2013-05-07 22:14:04 UTC (rev 149696)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2008, 2013 Apple Inc. All rights reserved.
</ins><span class="cx">  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx">  * Copyright (C) 2007 Alp Toker &lt;alp@atoker.com&gt;
</span><span class="cx">  * Copyright (C) 2008 Eric Seidel &lt;eric@webkit.org&gt;
</span><span class="lines">@@ -125,16 +125,26 @@
</span><span class="cx"> 
</span><span class="cx"> CanvasStyle::CanvasStyle(PassRefPtr&lt;CanvasGradient&gt; gradient)
</span><span class="cx">     : m_type(Gradient)
</span><del>-    , m_gradient(gradient)
</del><ins>+    , m_gradient(gradient.leakRef())
</ins><span class="cx"> {
</span><ins>+    m_gradient-&gt;ref();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CanvasStyle::CanvasStyle(PassRefPtr&lt;CanvasPattern&gt; pattern)
</span><span class="cx">     : m_type(ImagePattern)
</span><del>-    , m_pattern(pattern)
</del><ins>+    , m_pattern(pattern.leakRef())
</ins><span class="cx"> {
</span><ins>+    m_pattern-&gt;ref();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+CanvasStyle::~CanvasStyle()
+{
+    if (m_type == Gradient)
+        m_gradient-&gt;deref();
+    else if (m_type == ImagePattern)
+        m_pattern-&gt;deref();
+}
+
</ins><span class="cx"> PassRefPtr&lt;CanvasStyle&gt; CanvasStyle::createFromString(const String&amp; color, Document* document)
</span><span class="cx"> {
</span><span class="cx">     RGBA32 rgba;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasStyle.h (149695 => 149696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasStyle.h        2013-05-07 22:06:15 UTC (rev 149695)
+++ trunk/Source/WebCore/html/canvas/CanvasStyle.h        2013-05-07 22:14:04 UTC (rev 149696)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2008, 2013 Apple Inc. All rights reserved.
</ins><span class="cx">  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -41,7 +41,11 @@
</span><span class="cx">     class HTMLCanvasElement;
</span><span class="cx"> 
</span><span class="cx">     class CanvasStyle : public RefCounted&lt;CanvasStyle&gt; {
</span><ins>+        WTF_MAKE_FAST_ALLOCATED;
+        WTF_MAKE_NONCOPYABLE(CanvasStyle);
</ins><span class="cx">     public:
</span><ins>+        ~CanvasStyle();
+
</ins><span class="cx">         static PassRefPtr&lt;CanvasStyle&gt; createFromRGBA(RGBA32 rgba) { return adoptRef(new CanvasStyle(rgba)); }
</span><span class="cx">         static PassRefPtr&lt;CanvasStyle&gt; createFromString(const String&amp; color, Document* = 0);
</span><span class="cx">         static PassRefPtr&lt;CanvasStyle&gt; createFromStringWithOverrideAlpha(const String&amp; color, float alpha);
</span><span class="lines">@@ -56,8 +60,8 @@
</span><span class="cx">         float overrideAlpha() const { ASSERT(m_type == CurrentColorWithOverrideAlpha); return m_overrideAlpha; }
</span><span class="cx"> 
</span><span class="cx">         String color() const { ASSERT(m_type == RGBA || m_type == CMYKA); return Color(m_rgba).serialized(); }
</span><del>-        CanvasGradient* canvasGradient() const { return m_gradient.get(); }
-        CanvasPattern* canvasPattern() const { return m_pattern.get(); }
</del><ins>+        CanvasGradient* canvasGradient() const;
+        CanvasPattern* canvasPattern() const;
</ins><span class="cx"> 
</span><span class="cx">         void applyFillColor(GraphicsContext*);
</span><span class="cx">         void applyStrokeColor(GraphicsContext*);
</span><span class="lines">@@ -82,11 +86,10 @@
</span><span class="cx">         union {
</span><span class="cx">             RGBA32 m_rgba;
</span><span class="cx">             float m_overrideAlpha;
</span><ins>+            CanvasGradient* m_gradient;
+            CanvasPattern* m_pattern;
</ins><span class="cx">         };
</span><span class="cx"> 
</span><del>-        RefPtr&lt;CanvasGradient&gt; m_gradient;
-        RefPtr&lt;CanvasPattern&gt; m_pattern;
-
</del><span class="cx">         struct CMYKAValues {
</span><span class="cx">             CMYKAValues() : c(0), m(0), y(0), k(0), a(0) { }
</span><span class="cx">             CMYKAValues(float cyan, float magenta, float yellow, float black, float alpha) : c(cyan), m(magenta), y(yellow), k(black), a(alpha) { }
</span><span class="lines">@@ -101,6 +104,20 @@
</span><span class="cx">     RGBA32 currentColor(HTMLCanvasElement*);
</span><span class="cx">     bool parseColorOrCurrentColor(RGBA32&amp; parsedColor, const String&amp; colorString, HTMLCanvasElement*);
</span><span class="cx"> 
</span><ins>+    inline CanvasGradient* CanvasStyle::canvasGradient() const
+    {
+        if (m_type == Gradient)
+            return m_gradient;
+        return 0;
+    }
+
+    inline CanvasPattern* CanvasStyle::canvasPattern() const
+    {
+        if (m_type == ImagePattern)
+            return m_pattern;
+        return 0;
+    }
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>