<!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>[200058] 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/200058">200058</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 16:39:01 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web IDL] Specify default values for optional parameters of type 'float' / 'unrestricted float'
https://bugs.webkit.org/show_bug.cgi?id=156995
Reviewed by Darin Adler.
Specify default values for optional parameters of type 'float' / 'unrestricted float'
and let the bindings generator use WTF::Optional<> for the ones that do not have a
default value.
* bindings/scripts/CodeGeneratorJS.pm:
(CanUseWTFOptionalForParameter): Deleted.
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::setStrokeColor):
(WebCore::CanvasRenderingContext2D::setFillColor):
(WebCore::CanvasRenderingContext2D::setShadow):
(WebCore::CanvasRenderingContext2D::fillText):
(WebCore::CanvasRenderingContext2D::strokeText):
(WebCore::CanvasRenderingContext2D::drawTextInternal):
(WebCore::CanvasRenderingContext2D::clearShadow): Deleted.
(WebCore::normalizeSpaces): Deleted.
(WebCore::CanvasRenderingContext2D::measureText): Deleted.
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
* testing/Internals.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.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>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/ChangeLog 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-04-25 Chris Dumez <cdumez@apple.com>
+
+ [Web IDL] Specify default values for optional parameters of type 'float' / 'unrestricted float'
+ https://bugs.webkit.org/show_bug.cgi?id=156995
+
+ Reviewed by Darin Adler.
+
+ Specify default values for optional parameters of type 'float' / 'unrestricted float'
+ and let the bindings generator use WTF::Optional<> for the ones that do not have a
+ default value.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (CanUseWTFOptionalForParameter): Deleted.
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setStrokeColor):
+ (WebCore::CanvasRenderingContext2D::setFillColor):
+ (WebCore::CanvasRenderingContext2D::setShadow):
+ (WebCore::CanvasRenderingContext2D::fillText):
+ (WebCore::CanvasRenderingContext2D::strokeText):
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ (WebCore::CanvasRenderingContext2D::clearShadow): Deleted.
+ (WebCore::normalizeSpaces): Deleted.
+ (WebCore::CanvasRenderingContext2D::measureText): Deleted.
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-04-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Add port 4190 (managesieve) to port blacklist
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -3386,9 +3386,7 @@
</span><span class="cx"> return 0 if $type eq "DOMString";
</span><span class="cx"> return 0 if $type eq "Dictionary";
</span><span class="cx"> return 0 if $type eq "any";
</span><del>- return 0 if $type eq "float";
</del><span class="cx"> return 0 if $type eq "long";
</span><del>- return 0 if $type eq "unrestricted float";
</del><span class="cx"> return 0 if $type eq "unrestricted double";
</span><span class="cx"> return 0 if $type eq "unsigned long";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -499,12 +499,7 @@
</span><span class="cx"> String color = state->argument(3).toString(state)->value(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- if (argsCount <= 4) {
- impl.setShadow(width, height, blur, color);
- return JSValue::encode(jsUndefined());
- }
-
- float alpha = state->argument(4).toFloat(state);
</del><ins>+ Optional<float> alpha = state->argument(4).isUndefined() ? Optional<float>() : state->uncheckedArgument(4).toFloat(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.setShadow(width, height, blur, color, alpha);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -819,27 +819,21 @@
</span><span class="cx"> transform(m11, m12, m21, m22, dx, dy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setStrokeColor(const String& color)
</del><ins>+void CanvasRenderingContext2D::setStrokeColor(const String& color, Optional<float> alpha)
</ins><span class="cx"> {
</span><ins>+ if (alpha) {
+ setStrokeStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha.value()));
+ return;
+ }
+
</ins><span class="cx"> if (color == state().unparsedStrokeColor)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> realizeSaves();
</span><span class="cx"> setStrokeStyle(CanvasStyle::createFromString(color, &canvas()->document()));
</span><span class="cx"> modifiableState().unparsedStrokeColor = color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setStrokeColor(float grayLevel)
-{
- if (state().strokeStyle.isValid() && state().strokeStyle.isEquivalentRGBA(grayLevel, grayLevel, grayLevel, 1.0f))
- return;
- setStrokeStyle(CanvasStyle(grayLevel, 1.0f));
-}
-
-void CanvasRenderingContext2D::setStrokeColor(const String& color, float alpha)
-{
- setStrokeStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha));
-}
-
</del><span class="cx"> void CanvasRenderingContext2D::setStrokeColor(float grayLevel, float alpha)
</span><span class="cx"> {
</span><span class="cx"> if (state().strokeStyle.isValid() && state().strokeStyle.isEquivalentRGBA(grayLevel, grayLevel, grayLevel, alpha))
</span><span class="lines">@@ -861,27 +855,21 @@
</span><span class="cx"> setStrokeStyle(CanvasStyle(c, m, y, k, a));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setFillColor(const String& color)
</del><ins>+void CanvasRenderingContext2D::setFillColor(const String& color, Optional<float> alpha)
</ins><span class="cx"> {
</span><ins>+ if (alpha) {
+ setFillStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha.value()));
+ return;
+ }
+
</ins><span class="cx"> if (color == state().unparsedFillColor)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> realizeSaves();
</span><span class="cx"> setFillStyle(CanvasStyle::createFromString(color, &canvas()->document()));
</span><span class="cx"> modifiableState().unparsedFillColor = color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setFillColor(float grayLevel)
-{
- if (state().fillStyle.isValid() && state().fillStyle.isEquivalentRGBA(grayLevel, grayLevel, grayLevel, 1.0f))
- return;
- setFillStyle(CanvasStyle(grayLevel, 1.0f));
-}
-
-void CanvasRenderingContext2D::setFillColor(const String& color, float alpha)
-{
- setFillStyle(CanvasStyle::createFromStringWithOverrideAlpha(color, alpha));
-}
-
</del><span class="cx"> void CanvasRenderingContext2D::setFillColor(float grayLevel, float alpha)
</span><span class="cx"> {
</span><span class="cx"> if (state().fillStyle.isValid() && state().fillStyle.isEquivalentRGBA(grayLevel, grayLevel, grayLevel, alpha))
</span><span class="lines">@@ -1271,24 +1259,11 @@
</span><span class="cx"> setShadow(FloatSize(width, height), blur, Color::transparent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setShadow(float width, float height, float blur, const String& color)
</del><ins>+void CanvasRenderingContext2D::setShadow(float width, float height, float blur, const String& color, Optional<float> alpha)
</ins><span class="cx"> {
</span><span class="cx"> RGBA32 rgba;
</span><span class="cx"> if (!parseColorOrCurrentColor(rgba, color, canvas()))
</span><span class="cx"> return;
</span><del>- setShadow(FloatSize(width, height), blur, rgba);
-}
-
-void CanvasRenderingContext2D::setShadow(float width, float height, float blur, float grayLevel)
-{
- setShadow(FloatSize(width, height), blur, makeRGBA32FromFloats(grayLevel, grayLevel, grayLevel, 1));
-}
-
-void CanvasRenderingContext2D::setShadow(float width, float height, float blur, const String& color, float alpha)
-{
- RGBA32 rgba;
- if (!parseColorOrCurrentColor(rgba, color, canvas()))
- return;
</del><span class="cx"> setShadow(FloatSize(width, height), blur, colorWithOverrideAlpha(rgba, alpha));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2327,26 +2302,16 @@
</span><span class="cx"> modifiableState().direction = direction;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::fillText(const String& text, float x, float y)
</del><ins>+void CanvasRenderingContext2D::fillText(const String& text, float x, float y, Optional<float> maxWidth)
</ins><span class="cx"> {
</span><del>- drawTextInternal(text, x, y, true);
</del><ins>+ drawTextInternal(text, x, y, true, maxWidth);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::fillText(const String& text, float x, float y, float maxWidth)
</del><ins>+void CanvasRenderingContext2D::strokeText(const String& text, float x, float y, Optional<float> maxWidth)
</ins><span class="cx"> {
</span><del>- drawTextInternal(text, x, y, true, maxWidth, true);
</del><ins>+ drawTextInternal(text, x, y, false, maxWidth);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::strokeText(const String& text, float x, float y)
-{
- drawTextInternal(text, x, y, false);
-}
-
-void CanvasRenderingContext2D::strokeText(const String& text, float x, float y, float maxWidth)
-{
- drawTextInternal(text, x, y, false, maxWidth, true);
-}
-
</del><span class="cx"> static inline bool isSpaceThatNeedsReplacing(UChar c)
</span><span class="cx"> {
</span><span class="cx"> // According to specification all space characters should be replaced with 0x0020 space character.
</span><span class="lines">@@ -2390,7 +2355,7 @@
</span><span class="cx"> return metrics;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth, bool useMaxWidth)
</del><ins>+void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, Optional<float> maxWidth)
</ins><span class="cx"> {
</span><span class="cx"> const auto& fontProxy = this->fontProxy();
</span><span class="cx"> const FontMetrics& fontMetrics = fontProxy.fontMetrics();
</span><span class="lines">@@ -2402,7 +2367,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if (!std::isfinite(x) | !std::isfinite(y))
</span><span class="cx"> return;
</span><del>- if (useMaxWidth && (!std::isfinite(maxWidth) || maxWidth <= 0))
</del><ins>+ if (maxWidth && (!std::isfinite(maxWidth.value()) || maxWidth.value() <= 0))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If gradient size is zero, then paint nothing.
</span><span class="lines">@@ -2447,8 +2412,8 @@
</span><span class="cx">
</span><span class="cx"> float fontWidth = fontProxy.width(TextRun(normalizedText, 0, 0, AllowTrailingExpansion, direction, override));
</span><span class="cx">
</span><del>- useMaxWidth = (useMaxWidth && maxWidth < fontWidth);
- float width = useMaxWidth ? maxWidth : fontWidth;
</del><ins>+ bool useMaxWidth = maxWidth && maxWidth.value() < fontWidth;
+ float width = useMaxWidth ? maxWidth.value() : fontWidth;
</ins><span class="cx">
</span><span class="cx"> TextAlign align = state().textAlign;
</span><span class="cx"> if (align == StartTextAlign)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -117,17 +117,13 @@
</span><span class="cx"> void transform(float m11, float m12, float m21, float m22, float dx, float dy);
</span><span class="cx"> void setTransform(float m11, float m12, float m21, float m22, float dx, float dy);
</span><span class="cx">
</span><del>- void setStrokeColor(const String& color);
- void setStrokeColor(float grayLevel);
- void setStrokeColor(const String& color, float alpha);
- void setStrokeColor(float grayLevel, float alpha);
</del><ins>+ void setStrokeColor(const String& color, Optional<float> alpha = Nullopt);
+ void setStrokeColor(float grayLevel, float alpha = 1.0);
</ins><span class="cx"> void setStrokeColor(float r, float g, float b, float a);
</span><span class="cx"> void setStrokeColor(float c, float m, float y, float k, float a);
</span><span class="cx">
</span><del>- void setFillColor(const String& color);
- void setFillColor(float grayLevel);
- void setFillColor(const String& color, float alpha);
- void setFillColor(float grayLevel, float alpha);
</del><ins>+ void setFillColor(const String& color, Optional<float> alpha = Nullopt);
+ void setFillColor(float grayLevel, float alpha = 1.0f);
</ins><span class="cx"> void setFillColor(float r, float g, float b, float a);
</span><span class="cx"> void setFillColor(float c, float m, float y, float k, float a);
</span><span class="cx">
</span><span class="lines">@@ -152,10 +148,9 @@
</span><span class="cx"> void strokeRect(float x, float y, float width, float height);
</span><span class="cx">
</span><span class="cx"> void setShadow(float width, float height, float blur);
</span><del>- void setShadow(float width, float height, float blur, const String& color);
</del><span class="cx"> void setShadow(float width, float height, float blur, float grayLevel);
</span><del>- void setShadow(float width, float height, float blur, const String& color, float alpha);
- void setShadow(float width, float height, float blur, float grayLevel, float alpha);
</del><ins>+ void setShadow(float width, float height, float blur, const String& color, Optional<float> alpha = Nullopt);
+ void setShadow(float width, float height, float blur, float grayLevel, float alpha = 1.0);
</ins><span class="cx"> void setShadow(float width, float height, float blur, float r, float g, float b, float a);
</span><span class="cx"> void setShadow(float width, float height, float blur, float c, float m, float y, float k, float a);
</span><span class="cx">
</span><span class="lines">@@ -217,10 +212,8 @@
</span><span class="cx"> String direction() const;
</span><span class="cx"> void setDirection(const String&);
</span><span class="cx">
</span><del>- void fillText(const String& text, float x, float y);
- void fillText(const String& text, float x, float y, float maxWidth);
- void strokeText(const String& text, float x, float y);
- void strokeText(const String& text, float x, float y, float maxWidth);
</del><ins>+ void fillText(const String& text, float x, float y, Optional<float> maxWidth = Nullopt);
+ void strokeText(const String& text, float x, float y, Optional<float> maxWidth = Nullopt);
</ins><span class="cx"> Ref<TextMetrics> measureText(const String& text);
</span><span class="cx">
</span><span class="cx"> LineCap getLineCap() const { return state().lineCap; }
</span><span class="lines">@@ -345,7 +338,7 @@
</span><span class="cx"> void applyStrokePattern();
</span><span class="cx"> void applyFillPattern();
</span><span class="cx">
</span><del>- void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false);
</del><ins>+ void drawTextInternal(const String& text, float x, float y, bool fill, Optional<float> maxWidth = Nullopt);
</ins><span class="cx">
</span><span class="cx"> // The relationship between FontCascade and CanvasRenderingContext2D::FontProxy must hold certain invariants.
</span><span class="cx"> // Therefore, all font operations must pass through the State.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -128,12 +128,12 @@
</span><span class="cx"> void strokeText(DOMString text, unrestricted float x, unrestricted float y, optional unrestricted float maxWidth);
</span><span class="cx">
</span><span class="cx"> void setStrokeColor([StrictTypeChecking] DOMString color, optional unrestricted float alpha);
</span><del>- void setStrokeColor(unrestricted float grayLevel, optional float alpha);
</del><ins>+ void setStrokeColor(unrestricted float grayLevel, optional float alpha = 1);
</ins><span class="cx"> void setStrokeColor(unrestricted float r, unrestricted float g, unrestricted float b, unrestricted float a);
</span><span class="cx"> void setStrokeColor(unrestricted float c, unrestricted float m, unrestricted float y, unrestricted float k, unrestricted float a);
</span><span class="cx">
</span><span class="cx"> void setFillColor([StrictTypeChecking] DOMString color, optional unrestricted float alpha);
</span><del>- void setFillColor(unrestricted float grayLevel, optional unrestricted float alpha);
</del><ins>+ void setFillColor(unrestricted float grayLevel, optional unrestricted float alpha = 1);
</ins><span class="cx"> void setFillColor(unrestricted float r, unrestricted float g, unrestricted float b, unrestricted float a);
</span><span class="cx"> void setFillColor(unrestricted float c, unrestricted float m, unrestricted float y, unrestricted float k, unrestricted float a);
</span><span class="cx">
</span><span class="lines">@@ -156,14 +156,14 @@
</span><span class="cx"> unrestricted float sh, unrestricted float dx, unrestricted float dy, unrestricted float dw, unrestricted float dh);
</span><span class="cx">
</span><span class="cx"> void drawImageFromRect(HTMLImageElement image,
</span><del>- optional unrestricted float sx, optional unrestricted float sy, optional unrestricted float sw, optional unrestricted float sh,
- optional unrestricted float dx, optional unrestricted float dy, optional unrestricted float dw, optional unrestricted float dh,
- optional DOMString compositeOperation);
</del><ins>+ optional unrestricted float sx = 0, optional unrestricted float sy = 0, optional unrestricted float sw = 0, optional unrestricted float sh = 0,
+ optional unrestricted float dx = 0, optional unrestricted float dy = 0, optional unrestricted float dw = 0, optional unrestricted float dh = 0,
+ optional DOMString compositeOperation = "");
</ins><span class="cx">
</span><span class="cx"> void setShadow(unrestricted float width, unrestricted float height, unrestricted float blur,
</span><span class="cx"> [StrictTypeChecking] optional DOMString color, optional unrestricted float alpha);
</span><span class="cx"> void setShadow(unrestricted float width, unrestricted float height, unrestricted float blur, unrestricted float grayLevel,
</span><del>- optional unrestricted float alpha);
</del><ins>+ optional unrestricted float alpha = 1);
</ins><span class="cx"> void setShadow(unrestricted float width, unrestricted float height, unrestricted float blur, unrestricted float r,
</span><span class="cx"> unrestricted float g, unrestricted float b, unrestricted float a);
</span><span class="cx"> void setShadow(float width, unrestricted float height, unrestricted float blur, unrestricted float c, unrestricted float m,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <cmath>
</span><span class="cx"> #include <unicode/uchar.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/LChar.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -55,6 +56,8 @@
</span><span class="cx"> WEBCORE_EXPORT RGBA32 makeRGBA(int r, int g, int b, int a);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha);
</span><ins>+WEBCORE_EXPORT RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha);
+
</ins><span class="cx"> WEBCORE_EXPORT RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a);
</span><span class="cx"> RGBA32 makeRGBAFromHSLA(double h, double s, double l, double a);
</span><span class="cx"> RGBA32 makeRGBAFromCMYKA(float c, float m, float y, float k, float a);
</span><span class="lines">@@ -295,6 +298,11 @@
</span><span class="cx"> return approximation + (remainder >> 8);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline RGBA32 colorWithOverrideAlpha(RGBA32 color, Optional<float> overrideAlpha)
+{
+ return overrideAlpha ? colorWithOverrideAlpha(color, overrideAlpha.value()) : color;
+}
+
</ins><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(TextStream&, const Color&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (200057 => 200058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-04-25 23:34:06 UTC (rev 200057)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-04-25 23:39:01 UTC (rev 200058)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> [RaisesException] void setInspectorIsUnderTest(boolean isUnderTest);
</span><span class="cx">
</span><span class="cx"> DOMString counterValue(Element element);
</span><del>- long pageNumber(Element element, optional unrestricted float pageWidth, optional unrestricted float pageHeight);
</del><ins>+ long pageNumber(Element element, optional unrestricted float pageWidth = 800, optional unrestricted float pageHeight = 600);
</ins><span class="cx"> DOMString[] shortcutIconURLs();
</span><span class="cx"> long numberOfPages(optional unrestricted double pageWidthInPixels, optional unrestricted double pageHeightInPixels);
</span><span class="cx"> [RaisesException] DOMString pageProperty(DOMString propertyName, long pageNumber);
</span></span></pre>
</div>
</div>
</body>
</html>