<!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>[210470] 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/210470">210470</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2017-01-06 22:19:44 -0800 (Fri, 06 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebIDL] Remove custom bindings from CanvasRenderingContext2D
https://bugs.webkit.org/show_bug.cgi?id=166793
Reviewed by Darin Adler.
* WebCore.xcodeproj/project.pbxproj:
Move JSCanvasRenderingContext2DCustom.cpp to the GC only group.
* bindings/js/JSCanvasRenderingContext2DCustom.cpp:
(WebCore::toJS): Deleted.
(WebCore::toHTMLCanvasStyle): Deleted.
(WebCore::JSCanvasRenderingContext2D::strokeStyle): Deleted.
(WebCore::JSCanvasRenderingContext2D::setStrokeStyle): Deleted.
(WebCore::JSCanvasRenderingContext2D::fillStyle): Deleted.
(WebCore::JSCanvasRenderingContext2D::setFillStyle): Deleted.
Remove non-GC related custom bindings.
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::setStrokeStyle):
(WebCore::CanvasRenderingContext2D::setFillStyle):
(WebCore::toStyle):
(WebCore::CanvasRenderingContext2D::strokeStyle):
(WebCore::CanvasRenderingContext2D::fillStyle):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
Made existing setStrokeStyle/setFillStyle functions (which take CanvasStyle's)
private, and implemented new ones that operate on Variants, matching the spec.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCanvasRenderingContext2DCustomcpp">trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp</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="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/ChangeLog 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-01-06 Sam Weinig <sam@webkit.org>
+
+ [WebIDL] Remove custom bindings from CanvasRenderingContext2D
+ https://bugs.webkit.org/show_bug.cgi?id=166793
+
+ Reviewed by Darin Adler.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Move JSCanvasRenderingContext2DCustom.cpp to the GC only group.
+
+ * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+ (WebCore::toJS): Deleted.
+ (WebCore::toHTMLCanvasStyle): Deleted.
+ (WebCore::JSCanvasRenderingContext2D::strokeStyle): Deleted.
+ (WebCore::JSCanvasRenderingContext2D::setStrokeStyle): Deleted.
+ (WebCore::JSCanvasRenderingContext2D::fillStyle): Deleted.
+ (WebCore::JSCanvasRenderingContext2D::setFillStyle): Deleted.
+ Remove non-GC related custom bindings.
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setStrokeStyle):
+ (WebCore::CanvasRenderingContext2D::setFillStyle):
+ (WebCore::toStyle):
+ (WebCore::CanvasRenderingContext2D::strokeStyle):
+ (WebCore::CanvasRenderingContext2D::fillStyle):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+ Made existing setStrokeStyle/setFillStyle functions (which take CanvasStyle's)
+ private, and implemented new ones that operate on Variants, matching the spec.
+
</ins><span class="cx"> 2017-01-05 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from "rendering" directory, other improvements
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -18324,6 +18324,7 @@
</span><span class="cx"> BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
</span><span class="cx"> BE6DF710171CA2DA00DD52B8 /* JSAudioTrackListCustom.cpp */,
</span><span class="cx"> 8931DE5A14C44C44000DC9D2 /* JSBlobCustom.cpp */,
</span><ins>+ 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
</ins><span class="cx"> BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */,
</span><span class="cx"> AD726FE916D9F40A003A4E6D /* JSCSSRuleCustom.h */,
</span><span class="cx"> 9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */,
</span><span class="lines">@@ -22092,7 +22093,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 7C3D8EE41E08BABE0023B084 /* GC / Wrapping Only */,
</span><span class="cx"> BE6DF70E171CA2DA00DD52B8 /* JSAudioTrackCustom.cpp */,
</span><del>- 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
</del><span class="cx"> A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
</span><span class="cx"> 7CEF26181D6A92E300BE905D /* JSCryptoCustom.cpp */,
</span><span class="cx"> E157A8E618184C67009F821D /* JSCryptoKeyCustom.cpp */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCanvasRenderingContext2DCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -50,55 +50,4 @@
</span><span class="cx"> visitor.addOpaqueRoot(root(wrapped().canvas()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, const CanvasStyle& style)
-{
- if (style.canvasGradient())
- return toJS(exec, globalObject, style.canvasGradient());
- if (style.canvasPattern())
- return toJS(exec, globalObject, style.canvasPattern());
- return jsStringWithCache(exec, style.color());
-}
-
-static CanvasStyle toHTMLCanvasStyle(ExecState*, JSValue value)
-{
- if (!value.isObject())
- return CanvasStyle();
- JSObject* object = asObject(value);
- if (object->inherits(JSCanvasGradient::info()))
- return jsCast<JSCanvasGradient*>(object)->wrapped();
- if (object->inherits(JSCanvasPattern::info()))
- return jsCast<JSCanvasPattern*>(object)->wrapped();
- return CanvasStyle();
-}
-
-JSValue JSCanvasRenderingContext2D::strokeStyle(ExecState& state) const
-{
- return toJS(&state, globalObject(), wrapped().strokeStyle());
-}
-
-void JSCanvasRenderingContext2D::setStrokeStyle(ExecState& state, JSValue value)
-{
- CanvasRenderingContext2D& context = wrapped();
- if (value.isString()) {
- context.setStrokeColor(asString(value)->value(&state));
- return;
- }
- context.setStrokeStyle(toHTMLCanvasStyle(&state, value));
-}
-
-JSValue JSCanvasRenderingContext2D::fillStyle(ExecState& state) const
-{
- return toJS(&state, globalObject(), wrapped().fillStyle());
-}
-
-void JSCanvasRenderingContext2D::setFillStyle(ExecState& state, JSValue value)
-{
- CanvasRenderingContext2D& context = wrapped();
- if (value.isString()) {
- context.setFillColor(asString(value)->value(&state));
- return;
- }
- context.setFillStyle(toHTMLCanvasStyle(&state, value));
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -1704,6 +1704,43 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static CanvasRenderingContext2D::Style toStyle(const CanvasStyle& style)
+{
+ if (auto* gradient = style.canvasGradient())
+ return RefPtr<CanvasGradient> { gradient };
+ if (auto* pattern = style.canvasPattern())
+ return RefPtr<CanvasPattern> { pattern };
+ return style.color();
+}
+
+CanvasRenderingContext2D::Style CanvasRenderingContext2D::strokeStyle() const
+{
+ return toStyle(state().strokeStyle);
+}
+
+void CanvasRenderingContext2D::setStrokeStyle(CanvasRenderingContext2D::Style&& style)
+{
+ WTF::switchOn(style,
+ [this] (const String& string) { this->setStrokeColor(string); },
+ [this] (const RefPtr<CanvasGradient>& gradient) { this->setStrokeStyle(CanvasStyle(*gradient)); },
+ [this] (const RefPtr<CanvasPattern>& pattern) { this->setStrokeStyle(CanvasStyle(*pattern)); }
+ );
+}
+
+CanvasRenderingContext2D::Style CanvasRenderingContext2D::fillStyle() const
+{
+ return toStyle(state().fillStyle);
+}
+
+void CanvasRenderingContext2D::setFillStyle(CanvasRenderingContext2D::Style&& style)
+{
+ WTF::switchOn(style,
+ [this] (const String& string) { this->setFillColor(string); },
+ [this] (const RefPtr<CanvasGradient>& gradient) { this->setFillStyle(CanvasStyle(*gradient)); },
+ [this] (const RefPtr<CanvasPattern>& pattern) { this->setFillStyle(CanvasStyle(*pattern)); }
+ );
+}
+
</ins><span class="cx"> ExceptionOr<Ref<CanvasGradient>> CanvasRenderingContext2D::createLinearGradient(float x0, float y0, float x1, float y1)
</span><span class="cx"> {
</span><span class="cx"> if (!std::isfinite(x0) || !std::isfinite(y0) || !std::isfinite(x1) || !std::isfinite(y1))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -66,12 +66,6 @@
</span><span class="cx"> CanvasRenderingContext2D(HTMLCanvasElement&, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode);
</span><span class="cx"> virtual ~CanvasRenderingContext2D();
</span><span class="cx">
</span><del>- const CanvasStyle& strokeStyle() const { return state().strokeStyle; }
- void setStrokeStyle(CanvasStyle);
-
- const CanvasStyle& fillStyle() const { return state().fillStyle; }
- void setFillStyle(CanvasStyle);
-
</del><span class="cx"> float lineWidth() const;
</span><span class="cx"> void setLineWidth(float);
</span><span class="cx">
</span><span class="lines">@@ -172,6 +166,12 @@
</span><span class="cx">
</span><span class="cx"> void setCompositeOperation(const String&);
</span><span class="cx">
</span><ins>+ using Style = Variant<String, RefPtr<CanvasGradient>, RefPtr<CanvasPattern>>;
+ Style strokeStyle() const;
+ void setStrokeStyle(Style&&);
+ Style fillStyle() const;
+ void setFillStyle(Style&&);
+
</ins><span class="cx"> ExceptionOr<Ref<CanvasGradient>> createLinearGradient(float x0, float y0, float x1, float y1);
</span><span class="cx"> ExceptionOr<Ref<CanvasGradient>> createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1);
</span><span class="cx"> ExceptionOr<RefPtr<CanvasPattern>> createPattern(CanvasImageSource&&, const String& repetition);
</span><span class="lines">@@ -321,6 +321,9 @@
</span><span class="cx"> void applyStrokePattern();
</span><span class="cx"> void applyFillPattern();
</span><span class="cx">
</span><ins>+ void setStrokeStyle(CanvasStyle);
+ void setFillStyle(CanvasStyle);
+
</ins><span class="cx"> ExceptionOr<RefPtr<CanvasPattern>> createPattern(HTMLImageElement&, bool repeatX, bool repeatY);
</span><span class="cx"> ExceptionOr<RefPtr<CanvasPattern>> createPattern(HTMLCanvasElement&, bool repeatX, bool repeatY);
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (210469 => 210470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2017-01-07 05:23:54 UTC (rev 210469)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2017-01-07 06:19:44 UTC (rev 210470)
</span><span class="lines">@@ -166,8 +166,8 @@
</span><span class="cx"> [MayThrowException] ImageData createImageData(ImageData? imagedata);
</span><span class="cx"> [MayThrowException] ImageData createImageData(float sw, float sh);
</span><span class="cx">
</span><del>- [Custom] attribute custom strokeStyle;
- [Custom] attribute custom fillStyle;
</del><ins>+ attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle;
+ attribute (DOMString or CanvasGradient or CanvasPattern) fillStyle;
</ins><span class="cx"> [MayThrowException] CanvasGradient createLinearGradient(float x0, float y0, float x1, float y1);
</span><span class="cx"> [MayThrowException] CanvasGradient createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1);
</span><span class="cx"> [MayThrowException] CanvasPattern? createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition);
</span></span></pre>
</div>
</div>
</body>
</html>