<!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>[200037] 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/200037">200037</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 11:38:56 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Web IDL] Specify default values for parameters of type 'unsigned short'
https://bugs.webkit.org/show_bug.cgi?id=156967
Reviewed by Darin Adler.
Specify default values for parameters of type 'unsigned short' and let
the bindings generator use WTF::Optional<> for the ones without a
default value.
* bindings/scripts/CodeGeneratorJS.pm:
(CanUseWTFOptionalForParameter):
(GenerateParametersCheck):
* testing/Internals.cpp:
(WebCore::Internals::layerTreeAsText): Deleted.
(WebCore::Internals::displayListForElement): Deleted.
(WebCore::Internals::replayDisplayListForElement): Deleted.
* testing/Internals.h:
* 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="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.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 (200036 => 200037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-25 18:38:20 UTC (rev 200036)
+++ trunk/Source/WebCore/ChangeLog 2016-04-25 18:38:56 UTC (rev 200037)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-04-25 Chris Dumez <cdumez@apple.com>
+
+ [Web IDL] Specify default values for parameters of type 'unsigned short'
+ https://bugs.webkit.org/show_bug.cgi?id=156967
+
+ Reviewed by Darin Adler.
+
+ Specify default values for parameters of type 'unsigned short' and let
+ the bindings generator use WTF::Optional<> for the ones without a
+ default value.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (CanUseWTFOptionalForParameter):
+ (GenerateParametersCheck):
+ * testing/Internals.cpp:
+ (WebCore::Internals::layerTreeAsText): Deleted.
+ (WebCore::Internals::displayListForElement): Deleted.
+ (WebCore::Internals::replayDisplayListForElement): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-04-25 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win][IndexedDB] Fix build errors.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200036 => 200037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-25 18:38:20 UTC (rev 200036)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-25 18:38:56 UTC (rev 200037)
</span><span class="lines">@@ -3370,12 +3370,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub CanUseWTFOptionalForParameterType
</del><ins>+sub CanUseWTFOptionalForParameter
</ins><span class="cx"> {
</span><del>- my $type = shift;
</del><ins>+ my $parameter = shift;
+ my $type = $parameter->type;
</ins><span class="cx">
</span><span class="cx"> # FIXME: We should progressively stop blacklisting each type below
</span><span class="cx"> # and eventually get rid of this function entirely.
</span><ins>+ return 0 if $parameter->extendedAttributes->{"Clamp"};
+ return 0 if $parameter->isVariadic;
+ return 0 if $codeGenerator->IsCallbackInterface($type);
</ins><span class="cx"> return 0 if $codeGenerator->IsEnumType($type);
</span><span class="cx"> return 0 if $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return 0 if $codeGenerator->IsWrapperType($type);
</span><span class="lines">@@ -3387,7 +3391,6 @@
</span><span class="cx"> return 0 if $type eq "unrestricted float";
</span><span class="cx"> return 0 if $type eq "unrestricted double";
</span><span class="cx"> return 0 if $type eq "unsigned long";
</span><del>- return 0 if $type eq "unsigned short";
</del><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -3441,7 +3444,7 @@
</span><span class="cx"> # Optional arguments with [Optional=...] should not generate the early call.
</span><span class="cx"> # Optional Dictionary arguments always considered to have default of empty dictionary.
</span><span class="cx"> my $optional = $parameter->isOptional;
</span><del>- if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameterType($parameter->type) && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($argType)) {
</del><ins>+ if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter) && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($argType)) {
</ins><span class="cx"> # Generate early call if there are enough parameters.
</span><span class="cx"> if (!$hasOptionalArguments) {
</span><span class="cx"> push(@$outputArray, "\n size_t argsCount = state->argumentCount();\n");
</span><span class="lines">@@ -3621,7 +3624,7 @@
</span><span class="cx">
</span><span class="cx"> $outer = "state->argument($argsIndex).isUndefined() ? $defaultValue : ";
</span><span class="cx"> $inner = "state->uncheckedArgument($argsIndex)";
</span><del>- } elsif ($optional && !defined($parameter->default) && CanUseWTFOptionalForParameterType($parameter->type)) {
</del><ins>+ } elsif ($optional && !defined($parameter->default) && CanUseWTFOptionalForParameter($parameter)) {
</ins><span class="cx"> # Use WTF::Optional<>() for optional parameters that are missing or undefined and that do not have
</span><span class="cx"> # a default value in the IDL.
</span><span class="cx"> my $defaultValue = "Optional<$nativeType>()";
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (200036 => 200037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-04-25 18:38:20 UTC (rev 200036)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-04-25 18:38:56 UTC (rev 200037)
</span><span class="lines">@@ -1826,13 +1826,8 @@
</span><span class="cx"> // contextDocument(), with the exception of a few tests that pass a
</span><span class="cx"> // different document, and could just make the call through another Internals
</span><span class="cx"> // instance instead.
</span><del>-String Internals::layerTreeAsText(Document& document, ExceptionCode& ec) const
</del><ins>+String Internals::layerTreeAsText(Document& document, unsigned short flags, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- return layerTreeAsText(document, 0, ec);
-}
-
-String Internals::layerTreeAsText(Document& document, unsigned flags, ExceptionCode& ec) const
-{
</del><span class="cx"> if (!document.frame()) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return String();
</span><span class="lines">@@ -1973,13 +1968,8 @@
</span><span class="cx"> layer->backing()->setIsTrackingDisplayListReplay(isTrackingReplay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Internals::displayListForElement(Element& element, ExceptionCode& ec)
</del><ins>+String Internals::displayListForElement(Element& element, unsigned short flags, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- return displayListForElement(element, 0, ec);
-}
-
-String Internals::displayListForElement(Element& element, unsigned flags, ExceptionCode& ec)
-{
</del><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->renderView()) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="lines">@@ -2012,13 +2002,8 @@
</span><span class="cx"> return layer->backing()->displayListAsText(displayListFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Internals::replayDisplayListForElement(Element& element, ExceptionCode& ec)
</del><ins>+String Internals::replayDisplayListForElement(Element& element, unsigned short flags, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- return replayDisplayListForElement(element, 0, ec);
-}
-
-String Internals::replayDisplayListForElement(Element& element, unsigned flags, ExceptionCode& ec)
-{
</del><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->renderView()) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (200036 => 200037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-04-25 18:38:20 UTC (rev 200036)
+++ trunk/Source/WebCore/testing/Internals.h 2016-04-25 18:38:56 UTC (rev 200037)
</span><span class="lines">@@ -243,8 +243,7 @@
</span><span class="cx"> LAYER_TREE_INCLUDES_PAINTING_PHASES = 8,
</span><span class="cx"> LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16
</span><span class="cx"> };
</span><del>- String layerTreeAsText(Document&, unsigned flags, ExceptionCode&) const;
- String layerTreeAsText(Document&, ExceptionCode&) const;
</del><ins>+ String layerTreeAsText(Document&, unsigned short flags, ExceptionCode&) const;
</ins><span class="cx"> String repaintRectsAsText(ExceptionCode&) const;
</span><span class="cx"> String scrollingStateTreeAsText(ExceptionCode&) const;
</span><span class="cx"> String mainThreadScrollingReasons(ExceptionCode&) const;
</span><span class="lines">@@ -257,11 +256,9 @@
</span><span class="cx"> // Values need to be kept in sync with Internals.idl.
</span><span class="cx"> DISPLAY_LIST_INCLUDES_PLATFORM_OPERATIONS = 1,
</span><span class="cx"> };
</span><del>- String displayListForElement(Element&, unsigned flags, ExceptionCode&);
- String displayListForElement(Element&, ExceptionCode&);
</del><ins>+ String displayListForElement(Element&, unsigned short flags, ExceptionCode&);
</ins><span class="cx">
</span><del>- String replayDisplayListForElement(Element&, unsigned flags, ExceptionCode&);
- String replayDisplayListForElement(Element&, ExceptionCode&);
</del><ins>+ String replayDisplayListForElement(Element&, unsigned short flags, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void garbageCollectDocumentResources(ExceptionCode&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (200036 => 200037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-04-25 18:38:20 UTC (rev 200036)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-04-25 18:38:56 UTC (rev 200037)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_REPAINT_RECTS = 4;
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_PAINTING_PHASES = 8;
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16;
</span><del>- [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags);
</del><ins>+ [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags = 0);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] DOMString scrollingStateTreeAsText();
</span><span class="cx"> [RaisesException] DOMString mainThreadScrollingReasons(); // FIXME: rename to synchronousScrollingReasons().
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx"> // Flags for displayListForElement.
</span><span class="cx"> const unsigned short DISPLAY_LIST_INCLUDES_PLATFORM_OPERATIONS = 1;
</span><span class="cx"> // Returns the recorded display list.
</span><del>- [RaisesException] DOMString displayListForElement(Element element, optional unsigned short flags);
</del><ins>+ [RaisesException] DOMString displayListForElement(Element element, optional unsigned short flags = 0);
</ins><span class="cx"> // Returns the display list that was actually painted.
</span><del>- [RaisesException] DOMString replayDisplayListForElement(Element element, optional unsigned short flags);
</del><ins>+ [RaisesException] DOMString replayDisplayListForElement(Element element, optional unsigned short flags = 0);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void garbageCollectDocumentResources();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>