<!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>[200288] trunk/Source</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/200288">200288</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 22:09:10 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>First step in using "enum class" instead of "String" for enumerations in DOM
https://bugs.webkit.org/show_bug.cgi?id=157163
Reviewed by Chris Dumez.
Source/JavaScriptCore:
* runtime/JSString.h:
(JSC::jsStringWithCache): Deleted unneeded overload for AtomicString.
Source/WebCore:
This patch adds the basic support for using "enum class" to implement enumerations
in the C++ DOM. This is enough so we can use it for one case, but not enough for
others. For example, it correctly generates code to get an attribute, but likely
does not correctly generate code to set an attribute or call a function with an
argument type that is the new style of enum.
* bindings/scripts/CodeGenerator.pm: Cleaned up the formatting of the hashes
at the start of this file. Added a new one named stringBasedEnumerationHash
and a comment explaining that we need to eventually make it empty.
(ProcessDocument): Pass the enumerations into the GenerateInterface function.
(IsStringBasedEnumType): Added. Returns 1 for the old-style string-based enumerations,
as opposed to enumerations we use "enum class" for.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateInterface): Take the enumerations argument and pass it along to the
functions that generate headers and implementation files.
(EnumerationClassName): Added. Maps from an enumeration type name as seen
in the IDL file to the enumeration class name used in the C++ DOM implementation.
(EnumerationValueName): Added. Maps from an anumeration string value as seen
in the IDL file to an enumeration value name used in the C++ DOM implementatino.
(EnumerationImplementationContent): Added. Generates a string with all the content
needed in the implementation file to define the helper functions for enumerations.
(GenerateHeader): Tweak.
(GenerateImplementation): Added call to EnumerationImplementationContent.
(GenerateParametersCheck): Use toWTFString instead of toString/value, which is a
longer way of writing out the same thing.
(GenerateCallbackHeader): Tweak.
(GenerateCallbackImplementation): Added call to EnumerationImplementationContent.
(GetNativeType): Continue to return String for string-based enum types, but for
other enum types, return the result of EnumerationClassName instead.
(JSValueToNative): Use toWTFString instead of toString/value (see above), convert
to a string only for string-based enum types, and add a preliminary, probably not
yet working, version of the code for non-string-based enum types. Will finish this
in the next patch when we are trying to use one of the new enumerations for a setter
or a function argument.
(NativeToJSValue): Call the stringValue function to convert an enumeration value
into a string when it's not a string-based enumeration.
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
* bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
* bindings/scripts/test/JS/JSTestGlobalObject.cpp:
* bindings/scripts/test/JS/JSTestInterface.cpp:
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
* bindings/scripts/test/JS/JSTestNode.cpp:
* bindings/scripts/test/JS/JSTestNondeterministic.cpp:
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
Regenerated.
* css/FontFace.cpp:
(WebCore::FontFace::status): Updated to return enum values rather than strings.
* css/FontFace.h: Removed unneeded forward declaration of Deprecated::ScriptValue.
Added enum class for FontFaceLoadStatus, with names that match the names from the
enumeration in the IDL, but with our standard enum capitalization style. Changed
the return value of the status function to FontFaceLoadStatus.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceh">trunk/Source/WebCore/css/FontFace.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-28 Darin Adler <darin@apple.com>
+
+ First step in using "enum class" instead of "String" for enumerations in DOM
+ https://bugs.webkit.org/show_bug.cgi?id=157163
+
+ Reviewed by Chris Dumez.
+
+ * runtime/JSString.h:
+ (JSC::jsStringWithCache): Deleted unneeded overload for AtomicString.
+
</ins><span class="cx"> 2016-04-29 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC][ARMv7S] Arithmetic module results change when tiering up to DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -653,11 +653,6 @@
</span><span class="cx"> return jsStringWithCacheSlowCase(vm, *stringImpl);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE JSString* jsStringWithCache(ExecState* exec, const AtomicString& s)
-{
- return jsStringWithCache(exec, s.string());
-}
-
</del><span class="cx"> ALWAYS_INLINE bool JSString::getStringPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> if (propertyName == exec->propertyNames().length) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/ChangeLog 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2016-04-28 Darin Adler <darin@apple.com>
+
+ First step in using "enum class" instead of "String" for enumerations in DOM
+ https://bugs.webkit.org/show_bug.cgi?id=157163
+
+ Reviewed by Chris Dumez.
+
+ This patch adds the basic support for using "enum class" to implement enumerations
+ in the C++ DOM. This is enough so we can use it for one case, but not enough for
+ others. For example, it correctly generates code to get an attribute, but likely
+ does not correctly generate code to set an attribute or call a function with an
+ argument type that is the new style of enum.
+
+ * bindings/scripts/CodeGenerator.pm: Cleaned up the formatting of the hashes
+ at the start of this file. Added a new one named stringBasedEnumerationHash
+ and a comment explaining that we need to eventually make it empty.
+ (ProcessDocument): Pass the enumerations into the GenerateInterface function.
+ (IsStringBasedEnumType): Added. Returns 1 for the old-style string-based enumerations,
+ as opposed to enumerations we use "enum class" for.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateInterface): Take the enumerations argument and pass it along to the
+ functions that generate headers and implementation files.
+ (EnumerationClassName): Added. Maps from an enumeration type name as seen
+ in the IDL file to the enumeration class name used in the C++ DOM implementation.
+ (EnumerationValueName): Added. Maps from an anumeration string value as seen
+ in the IDL file to an enumeration value name used in the C++ DOM implementatino.
+ (EnumerationImplementationContent): Added. Generates a string with all the content
+ needed in the implementation file to define the helper functions for enumerations.
+ (GenerateHeader): Tweak.
+ (GenerateImplementation): Added call to EnumerationImplementationContent.
+ (GenerateParametersCheck): Use toWTFString instead of toString/value, which is a
+ longer way of writing out the same thing.
+ (GenerateCallbackHeader): Tweak.
+ (GenerateCallbackImplementation): Added call to EnumerationImplementationContent.
+ (GetNativeType): Continue to return String for string-based enum types, but for
+ other enum types, return the result of EnumerationClassName instead.
+ (JSValueToNative): Use toWTFString instead of toString/value (see above), convert
+ to a string only for string-based enum types, and add a preliminary, probably not
+ yet working, version of the code for non-string-based enum types. Will finish this
+ in the next patch when we are trying to use one of the new enumerations for a setter
+ or a function argument.
+ (NativeToJSValue): Call the stringValue function to convert an enumeration value
+ into a string when it's not a string-based enumeration.
+
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ * bindings/scripts/test/JS/JSTestNode.cpp:
+ * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ Regenerated.
+
+ * css/FontFace.cpp:
+ (WebCore::FontFace::status): Updated to return enum values rather than strings.
+
+ * css/FontFace.h: Removed unneeded forward declaration of Deprecated::ScriptValue.
+ Added enum class for FontFaceLoadStatus, with names that match the names from the
+ enumeration in the IDL, but with our standard enum capitalization style. Changed
+ the return value of the status function to FontFaceLoadStatus.
+
</ins><span class="cx"> 2016-04-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of unnecessary null check in wrap(JSDOMGlobalObject*, DOMClass*)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -44,33 +44,55 @@
</span><span class="cx">
</span><span class="cx"> my $verbose = 0;
</span><span class="cx">
</span><del>-my %numericTypeHash = ("int" => 1, "short" => 1, "long" => 1, "long long" => 1,
- "unsigned int" => 1, "unsigned short" => 1,
- "unsigned long" => 1, "unsigned long long" => 1,
- "float" => 1, "double" => 1,
- "unrestricted float" => 1, "unrestricted double" => 1,
- "byte" => 1, "octet" => 1);
</del><ins>+my %numericTypeHash = (
+ "byte" => 1,
+ "double" => 1,
+ "float" => 1,
+ "int" => 1,
+ "long long" => 1,
+ "long" => 1,
+ "octet" => 1,
+ "short" => 1,
+ "unrestricted double" => 1,
+ "unrestricted float" => 1,
+ "unsigned int" => 1,
+ "unsigned long long" => 1,
+ "unsigned long" => 1,
+ "unsigned short" => 1,
+);
</ins><span class="cx">
</span><del>-my %primitiveTypeHash = ( "boolean" => 1, "void" => 1, "Date" => 1);
</del><ins>+my %primitiveTypeHash = ( "boolean" => 1, "void" => 1, "Date" => 1 );
</ins><span class="cx">
</span><del>-my %stringTypeHash = ("DOMString" => 1);
</del><ins>+my %stringTypeHash = ( "DOMString" => 1 );
</ins><span class="cx">
</span><span class="cx"> # WebCore types used directly in IDL files.
</span><span class="cx"> my %webCoreTypeHash = (
</span><ins>+ "Dictionary" => 1,
</ins><span class="cx"> "SerializedScriptValue" => 1,
</span><del>- "Dictionary" => 1
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my %enumTypeHash = ();
</span><span class="cx">
</span><del>-my %nonPointerTypeHash = ("DOMTimeStamp" => 1);
</del><ins>+my %nonPointerTypeHash = ( "DOMTimeStamp" => 1 );
</ins><span class="cx">
</span><del>-my %svgAttributesInHTMLHash = ("class" => 1, "id" => 1, "onabort" => 1, "onclick" => 1,
- "onerror" => 1, "onload" => 1, "onmousedown" => 1,
- "onmouseenter" => 1, "onmouseleave" => 1,
- "onmousemove" => 1, "onmouseout" => 1, "onmouseover" => 1,
- "onmouseup" => 1, "onresize" => 1, "onscroll" => 1,
- "onunload" => 1);
</del><ins>+my %svgAttributesInHTMLHash = (
+ "class" => 1,
+ "id" => 1,
+ "onabort" => 1,
+ "onclick" => 1,
+ "onerror" => 1,
+ "onload" => 1,
+ "onmousedown" => 1,
+ "onmouseenter" => 1,
+ "onmouseleave" => 1,
+ "onmousemove" => 1,
+ "onmouseout" => 1,
+ "onmouseover" => 1,
+ "onmouseup" => 1,
+ "onresize" => 1,
+ "onscroll" => 1,
+ "onunload" => 1,
+);
</ins><span class="cx">
</span><span class="cx"> my %svgTypeNeedingTearOff = (
</span><span class="cx"> "SVGAngle" => "SVGPropertyTearOff<SVGAngle>",
</span><span class="lines">@@ -94,6 +116,48 @@
</span><span class="cx"> "SVGMatrix" => 1
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+# FIXME: Remove each enum from this hash as we convert it from the string-based
+# enumeration to using an actual enum class in the C++. Once that is done, we should
+# remove this hash and the function that calls it.
+my %stringBasedEnumerationHash = (
+ "AppendMode" => 1,
+ "AudioContextState" => 1,
+ "AutoFillButtonType" => 1,
+ "CachePolicy" => 1,
+ "CanvasWindingRule" => 1,
+ "DeviceType" => 1,
+ "EndOfStreamError" => 1,
+ "FontFaceSetLoadStatus" => 1,
+ "IDBCursorDirection" => 1,
+ "IDBRequestReadyState" => 1,
+ "IDBTransactionMode" => 1,
+ "ImageSmoothingQuality" => 1,
+ "KeyType" => 1,
+ "KeyUsage" => 1,
+ "MediaControlEvent" => 1,
+ "MediaDeviceKind" => 1,
+ "MediaSessionInterruptingCategory" => 1,
+ "MediaSessionKind" => 1,
+ "MediaStreamTrackState" => 1,
+ "OverSampleType" => 1,
+ "PageOverlayType" => 1,
+ "RTCBundlePolicyEnum" => 1,
+ "RTCIceTransportPolicyEnum" => 1,
+ "ReferrerPolicy" => 1,
+ "RequestCache" => 1,
+ "RequestCredentials" => 1,
+ "RequestDestination" => 1,
+ "RequestMode" => 1,
+ "RequestRedirect" => 1,
+ "RequestType" => 1,
+ "ResourceLoadPriority" => 1,
+ "ResponseType" => 1,
+ "TextTrackKind" => 1,
+ "TextTrackMode" => 1,
+ "VideoPresentationMode" => 1,
+ "XMLHttpRequestResponseType" => 1,
+);
+
</ins><span class="cx"> # Cache of IDL file pathnames.
</span><span class="cx"> my $idlFiles;
</span><span class="cx"> my $cachedInterfaces = {};
</span><span class="lines">@@ -141,7 +205,9 @@
</span><span class="cx"> my $interfaces = $useDocument->interfaces;
</span><span class="cx"> foreach my $interface (@$interfaces) {
</span><span class="cx"> print "Generating $useGenerator bindings code for IDL interface \"" . $interface->name . "\"...\n" if $verbose;
</span><del>- $codeGenerator->GenerateInterface($interface, $defines);
</del><ins>+ # FIXME: Repeating each enumeration for every interface would not work if we actually were using
+ # multiple interfaces per file, but we aren't, so this is fine for now.
+ $codeGenerator->GenerateInterface($interface, $defines, $useDocument->enumerations);
</ins><span class="cx"> $codeGenerator->WriteData($interface, $useOutputDir, $useOutputHeadersDir);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -335,6 +401,16 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub IsStringBasedEnumType
+{
+ my $object = shift;
+ my $type = shift;
+
+ return 0 if !$object->IsEnumType($type);
+ return 1 if exists $stringBasedEnumerationHash{$type};
+ return 0;
+}
+
</ins><span class="cx"> sub IsEnumType
</span><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -123,16 +123,17 @@
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $interface = shift;
</span><span class="cx"> my $defines = shift;
</span><ins>+ my $enumerations = shift;
</ins><span class="cx">
</span><span class="cx"> $codeGenerator->LinkOverloadedFunctions($interface);
</span><span class="cx">
</span><span class="cx"> # Start actual generation
</span><span class="cx"> if ($interface->isCallback) {
</span><span class="cx"> $object->GenerateCallbackHeader($interface);
</span><del>- $object->GenerateCallbackImplementation($interface);
</del><ins>+ $object->GenerateCallbackImplementation($interface, $enumerations);
</ins><span class="cx"> } else {
</span><span class="cx"> $object->GenerateHeader($interface);
</span><del>- $object->GenerateImplementation($interface);
</del><ins>+ $object->GenerateImplementation($interface, $enumerations);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -830,10 +831,73 @@
</span><span class="cx"> return $name;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub GetEnumerationClassName {
+ my ($name) = @_;
+ return $codeGenerator->WK_ucfirst($name);
+};
+
+sub GetEnumerationValueName {
+ my ($name) = @_;
+ return "EmptyString" if $name eq "";
+ return $codeGenerator->WK_ucfirst($name);
+};
+
+sub GetEnumerationImplementationContent
+{
+ my ($enumerations) = @_;
+
+ my $result = "";
+ foreach my $enumeration (@$enumerations) {
+ my $name = $enumeration->name;
+ next if $codeGenerator->IsStringBasedEnumType($name);
+
+ my $className = GetEnumerationClassName($name);
+
+ # Declare these instead of using "static" because these functions may be unused
+ # and we don't want to get warnings about unused static functions.
+ $result .= "const String& stringValue($className);\n";
+ $result .= "Optional<$className> enumerationValue$className(const String&);\n\n";
+
+ $result .= "const String& stringValue($className enumerationValue)\n";
+ $result .= "{\n";
+ # FIXME: Might be nice to make this global be "const", but NeverDestroyed does not currently support that.
+ # FIXME: Might be nice to make the entire array be NeverDestroyed instead of each value, but not sure the syntax for that.
+ $result .= " static NeverDestroyed<const String> values[] = {\n";
+ foreach my $value (@{$enumeration->values}) {
+ $result .= " ASCIILiteral(\"$value\"),\n";
+ }
+ $result .= " };\n";
+ my $index = 0;
+ foreach my $value (@{$enumeration->values}) {
+ my $enumerationValueName = GetEnumerationValueName($value);
+ if ($index) {
+ $result .= " static_assert(static_cast<size_t>($className::$enumerationValueName) == $index, \"$className::$enumerationValueName is not $index as expected\");\n";
+ } else {
+ # Keep the style checker happy. Not sure I still love this style guideline.
+ $result .= " static_assert(!static_cast<size_t>($className::$enumerationValueName), \"$className::$enumerationValueName is not $index as expected\");\n";
+ }
+ $index++;
+ }
+ $result .= " ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));\n";
+ $result .= " return values[static_cast<size_t>(enumerationValue)];\n";
+ $result .= "}\n\n";
+
+ $result .= "Optional<$className> enumerationValue$className(const String& stringValue)\n";
+ $result .= "{\n";
+ foreach my $value (@{$enumeration->values}) {
+ my $enumerationValueName = GetEnumerationValueName($value);
+ $result .= " if (stringValue == \"$value\")\n";
+ $result .= " return $className::$enumerationValueName;\n";
+ }
+ $result .= " return Nullopt;\n";
+ $result .= "}\n\n";
+ }
+ return $result;
+}
+
</ins><span class="cx"> sub GenerateHeader
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $interface = shift;
</del><ins>+ my ($object, $interface) = @_;
</ins><span class="cx">
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $className = "JS$interfaceName";
</span><span class="lines">@@ -1796,7 +1860,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateImplementation
</span><span class="cx"> {
</span><del>- my ($object, $interface) = @_;
</del><ins>+ my ($object, $interface, $enumerations) = @_;
</ins><span class="cx">
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $className = "JS$interfaceName";
</span><span class="lines">@@ -1828,6 +1892,8 @@
</span><span class="cx"> push(@implContent, "\nusing namespace JSC;\n\n");
</span><span class="cx"> push(@implContent, "namespace WebCore {\n\n");
</span><span class="cx">
</span><ins>+ push(@implContent, GetEnumerationImplementationContent($enumerations));
+
</ins><span class="cx"> my @functions = @{$interface->functions};
</span><span class="cx"> push(@functions, @{$interface->iterable->functions}) if $interface->iterable;
</span><span class="cx">
</span><span class="lines">@@ -3602,7 +3668,7 @@
</span><span class="cx"> push(@$outputArray, " if (${argValue}.isUndefined())\n");
</span><span class="cx"> push(@$outputArray, " $name = ASCIILiteral(" . $parameter->default . ");\n");
</span><span class="cx"> push(@$outputArray, " else {\n");
</span><del>- push(@$outputArray, " $name = state->uncheckedArgument($argsIndex).toString(state)->value(state);\n");
</del><ins>+ push(@$outputArray, " $name = state->uncheckedArgument($argsIndex).toWTFString(state);\n");
</ins><span class="cx"> &$exceptionCheck(" ");
</span><span class="cx"> &$enumValueCheck(" ");
</span><span class="cx"> push(@$outputArray, " }\n");
</span><span class="lines">@@ -3721,8 +3787,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateCallbackHeader
</span><span class="cx"> {
</span><del>- my $object = shift;
- my $interface = shift;
</del><ins>+ my ($object, $interface) = @_;
</ins><span class="cx">
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $className = "JS$interfaceName";
</span><span class="lines">@@ -3806,7 +3871,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateCallbackImplementation
</span><span class="cx"> {
</span><del>- my ($object, $interface) = @_;
</del><ins>+ my ($object, $interface, $enumerations) = @_;
</ins><span class="cx">
</span><span class="cx"> my $interfaceName = $interface->name;
</span><span class="cx"> my $visibleInterfaceName = $codeGenerator->GetVisibleInterfaceName($interface);
</span><span class="lines">@@ -3823,6 +3888,8 @@
</span><span class="cx"> push(@implContent, "\nusing namespace JSC;\n\n");
</span><span class="cx"> push(@implContent, "namespace WebCore {\n\n");
</span><span class="cx">
</span><ins>+ push(@implContent, GetEnumerationImplementationContent($enumerations));
+
</ins><span class="cx"> # Constructor
</span><span class="cx"> push(@implContent, "${className}::${className}(JSObject* callback, JSDOMGlobalObject* globalObject)\n");
</span><span class="cx"> if ($interface->extendedAttributes->{"CallbackNeedsOperatorEqual"}) {
</span><span class="lines">@@ -4179,7 +4246,8 @@
</span><span class="cx"> my $arrayOrSequenceType = $arrayType || $sequenceType;
</span><span class="cx">
</span><span class="cx"> return "Vector<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">" if $arrayOrSequenceType;
</span><del>- return "String" if $codeGenerator->IsEnumType($type);
</del><ins>+ return "String" if $codeGenerator->IsStringBasedEnumType($type);
+ return GetEnumerationClassName($type) if $codeGenerator->IsEnumType($type);
</ins><span class="cx">
</span><span class="cx"> # For all other types, the native type is a pointer with same type name as the IDL type.
</span><span class="cx"> return "${type}*";
</span><span class="lines">@@ -4296,7 +4364,7 @@
</span><span class="cx"> return "valueToStringWithUndefinedOrNullCheck(state, $value)" if $signature->isNullable;
</span><span class="cx"> return "$value.toString(state)->toAtomicString(state)" if $signature->extendedAttributes->{"AtomicString"};
</span><span class="cx">
</span><del>- return "$value.toString(state)->value(state)";
</del><ins>+ return "$value.toWTFString(state)";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($type eq "any") {
</span><span class="lines">@@ -4342,8 +4410,11 @@
</span><span class="cx"> return "toNativeArray<" . GetNativeVectorInnerType($arrayOrSequenceType) . ">(state, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ return "$value.toWTFString(state)" if $codeGenerator->IsStringBasedEnumType($type);
+
</ins><span class="cx"> if ($codeGenerator->IsEnumType($type)) {
</span><del>- return "$value.toString(state)->value(state)";
</del><ins>+ my $className = GetEnumerationClassName($type);
+ return "enumerationValue$className($value.toWTFString(state)).value()";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Default, assume autogenerated type conversion routines
</span><span class="lines">@@ -4394,6 +4465,7 @@
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->IsEnumType($type)) {
</span><span class="cx"> AddToImplIncludes("<runtime/JSString.h>", $conditional);
</span><ins>+ $value = "stringValue($value)" unless $codeGenerator->IsStringBasedEnumType($type);
</ins><span class="cx"> return "jsStringWithCache(state, $value)";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String message = state->argument(0).toString(state)->value(state);
</del><ins>+ String message = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.postMessage(message);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String str = state->argument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.anotherFunction(str);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestGlobalObject", "regularAttribute");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setRegularAttribute(nativeValue);
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestGlobalObject", "enabledAtRuntimeAttribute");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setEnabledAtRuntimeAttribute(nativeValue);
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String testParam = state->argument(0).toString(state)->value(state);
</del><ins>+ String testParam = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.regularOperation(testParam);
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String testParam = state->argument(0).toString(state)->value(state);
</del><ins>+ String testParam = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(testParam);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -228,10 +228,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String str1 = state->argument(0).toString(state)->value(state);
</del><ins>+ String str1 = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toString(state)->value(state);
</del><ins>+ String str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ScriptExecutionContext* context = castedThis->scriptExecutionContext();
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> bool setJSTestInterfaceConstructorImplementsStaticAttr(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> TestInterface::setImplementsStaticAttr(nativeValue);
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestInterface", "implementsStr2");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setImplementsStr2(nativeValue);
</span><span class="lines">@@ -698,7 +698,7 @@
</span><span class="cx"> bool setJSTestInterfaceConstructorSupplementalStaticAttr(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> WebCore::TestSupplemental::setSupplementalStaticAttr(nativeValue);
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestInterface", "supplementalStr2");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> WebCore::TestSupplemental::setSupplementalStr2(impl, nativeValue);
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx"> auto* context = jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!context)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(0).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> auto* context = jsCast<JSDOMGlobalObject*>(state->lexicalGlobalObject())->scriptExecutionContext();
</span><span class="cx"> if (!context)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(0).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(1));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -86,13 +86,13 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String str1 = state->argument(0).toString(state)->value(state);
</del><ins>+ String str1 = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toString(state)->value(state);
</del><ins>+ String str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String str3 = state->argument(2).isUndefined() ? String() : state->uncheckedArgument(2).toString(state)->value(state);
</del><ins>+ String str3 = state->argument(2).isUndefined() ? String() : state->uncheckedArgument(2).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> RefPtr<TestNamedConstructor> object = TestNamedConstructor::createForJSConstructor(*castedThis->document(), str1, str2, str3, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestNode", "name");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setName(nativeValue);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestNondeterministic", "nondeterministicWriteableAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicWriteableAttr(nativeValue);
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestNondeterministic", "nondeterministicExceptionAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicExceptionAttr(nativeValue);
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestNondeterministic", "nondeterministicGetterExceptionAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicGetterExceptionAttr(nativeValue);
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicSetterExceptionAttr(nativeValue, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -89,6 +89,70 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+const String& stringValue(TestEnumType);
+Optional<TestEnumType> enumerationValueTestEnumType(const String&);
+
+const String& stringValue(TestEnumType enumerationValue)
+{
+ static NeverDestroyed<const String> values[] = {
+ ASCIILiteral(""),
+ ASCIILiteral("EnumValue1"),
+ ASCIILiteral("EnumValue2"),
+ ASCIILiteral("EnumValue3"),
+ };
+ static_assert(!static_cast<size_t>(TestEnumType::EmptyString), "TestEnumType::EmptyString is not 0 as expected");
+ static_assert(static_cast<size_t>(TestEnumType::EnumValue1) == 1, "TestEnumType::EnumValue1 is not 1 as expected");
+ static_assert(static_cast<size_t>(TestEnumType::EnumValue2) == 2, "TestEnumType::EnumValue2 is not 2 as expected");
+ static_assert(static_cast<size_t>(TestEnumType::EnumValue3) == 3, "TestEnumType::EnumValue3 is not 3 as expected");
+ ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));
+ return values[static_cast<size_t>(enumerationValue)];
+}
+
+Optional<TestEnumType> enumerationValueTestEnumType(const String& stringValue)
+{
+ if (stringValue == "")
+ return TestEnumType::EmptyString;
+ if (stringValue == "EnumValue1")
+ return TestEnumType::EnumValue1;
+ if (stringValue == "EnumValue2")
+ return TestEnumType::EnumValue2;
+ if (stringValue == "EnumValue3")
+ return TestEnumType::EnumValue3;
+ return Nullopt;
+}
+
+const String& stringValue(Optional);
+Optional<Optional> enumerationValueOptional(const String&);
+
+const String& stringValue(Optional enumerationValue)
+{
+ static NeverDestroyed<const String> values[] = {
+ ASCIILiteral(""),
+ ASCIILiteral("OptionalValue1"),
+ ASCIILiteral("OptionalValue2"),
+ ASCIILiteral("OptionalValue3"),
+ };
+ static_assert(!static_cast<size_t>(Optional::EmptyString), "Optional::EmptyString is not 0 as expected");
+ static_assert(static_cast<size_t>(Optional::OptionalValue1) == 1, "Optional::OptionalValue1 is not 1 as expected");
+ static_assert(static_cast<size_t>(Optional::OptionalValue2) == 2, "Optional::OptionalValue2 is not 2 as expected");
+ static_assert(static_cast<size_t>(Optional::OptionalValue3) == 3, "Optional::OptionalValue3 is not 3 as expected");
+ ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));
+ return values[static_cast<size_t>(enumerationValue)];
+}
+
+Optional<Optional> enumerationValueOptional(const String& stringValue)
+{
+ if (stringValue == "")
+ return Optional::EmptyString;
+ if (stringValue == "OptionalValue1")
+ return Optional::OptionalValue1;
+ if (stringValue == "OptionalValue2")
+ return Optional::OptionalValue2;
+ if (stringValue == "OptionalValue3")
+ return Optional::OptionalValue3;
+ return Nullopt;
+}
+
</ins><span class="cx"> // Functions
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><span class="lines">@@ -990,7 +1054,7 @@
</span><span class="cx"> return throwGetterTypeError(*state, "TestObj", "enumAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = jsStringWithCache(state, impl.enumAttr());
</del><ins>+ JSValue result = jsStringWithCache(state, stringValue(impl.enumAttr()));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2147,7 +2211,7 @@
</span><span class="cx"> return throwGetterTypeError(*state, "TestObj", "attributeWithReservedEnumType");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = jsStringWithCache(state, impl.attributeWithReservedEnumType());
</del><ins>+ JSValue result = jsStringWithCache(state, stringValue(impl.attributeWithReservedEnumType()));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2205,7 +2269,7 @@
</span><span class="cx"> bool setJSTestObjConstructorStaticStringAttr(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
</span><span class="cx"> {
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> TestObj::setStaticStringAttr(nativeValue);
</span><span class="lines">@@ -2235,7 +2299,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "enumAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ TestEnumType nativeValue = enumerationValueTestEnumType(value.toWTFString(state)).value();
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> if (nativeValue != "" && nativeValue != "EnumValue1" && nativeValue != "EnumValue2" && nativeValue != "EnumValue3")
</span><span class="lines">@@ -2407,7 +2471,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "stringAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttr(nativeValue);
</span><span class="lines">@@ -2509,7 +2573,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "reflectedStringAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedstringattrAttr, nativeValue);
</span><span class="lines">@@ -2577,7 +2641,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "reflectedURLAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedurlattrAttr, nativeValue);
</span><span class="lines">@@ -2594,7 +2658,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "reflectedStringAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentStringAttrAttr, nativeValue);
</span><span class="lines">@@ -2645,7 +2709,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "reflectedCustomURLAttr");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentURLAttrAttr, nativeValue);
</span><span class="lines">@@ -2663,7 +2727,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "enabledAtRuntimeAttribute");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setEnabledAtRuntimeAttribute(nativeValue);
</span><span class="lines">@@ -2770,7 +2834,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "stringAttrWithGetterException");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithGetterException(nativeValue);
</span><span class="lines">@@ -2788,7 +2852,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithSetterException(nativeValue, ec);
</span><span class="lines">@@ -3302,7 +3366,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "attributeWithReservedEnumType");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ Optional nativeValue = enumerationValueOptional(value.toWTFString(state)).value();
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> if (nativeValue != "" && nativeValue != "OptionalValue1" && nativeValue != "OptionalValue2" && nativeValue != "OptionalValue3")
</span><span class="lines">@@ -3322,7 +3386,7 @@
</span><span class="cx"> }
</span><span class="cx"> Ref<TestNode> forwardedImpl = castedThis->wrapped().putForwardsAttribute();
</span><span class="cx"> auto& impl = forwardedImpl.get();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setName(nativeValue);
</span><span class="lines">@@ -3342,7 +3406,7 @@
</span><span class="cx"> if (!forwardedImpl)
</span><span class="cx"> return false;
</span><span class="cx"> auto& impl = *forwardedImpl;
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setName(nativeValue);
</span><span class="lines">@@ -3375,7 +3439,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String testParam = state->argument(0).toString(state)->value(state);
</del><ins>+ String testParam = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(testParam);
</span><span class="lines">@@ -3447,7 +3511,7 @@
</span><span class="cx"> int longArg = toInt32(state, state->argument(0), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="lines">@@ -3484,7 +3548,7 @@
</span><span class="cx"> int8_t byteArg = toInt8(state, state->argument(0), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="lines">@@ -3521,7 +3585,7 @@
</span><span class="cx"> uint8_t octetArg = toUInt8(state, state->argument(0), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="lines">@@ -3558,7 +3622,7 @@
</span><span class="cx"> int longArg = toInt32(state, state->argument(0), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="lines">@@ -3595,7 +3659,7 @@
</span><span class="cx"> int longArg = toInt32(state, state->argument(0), NormalConversion);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="lines">@@ -3738,7 +3802,7 @@
</span><span class="cx"> if (state->argument(0).isUndefined())
</span><span class="cx"> enumArg = ASCIILiteral("EnumValue1");
</span><span class="cx"> else {
</span><del>- enumArg = state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ enumArg = state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (enumArg != "" && enumArg != "EnumValue1" && enumArg != "EnumValue2" && enumArg != "EnumValue3")
</span><span class="lines">@@ -3759,7 +3823,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String strArg = state->argument(0).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="lines">@@ -3868,7 +3932,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String argument = state->argument(0).toString(state)->value(state);
</del><ins>+ String argument = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsStringWithCache(state, impl.privateMethod(argument));
</span><span class="lines">@@ -4140,7 +4204,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalString");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalString(str);
</span><span class="lines">@@ -4170,7 +4234,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalStringAndDefaultValue");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String str = state->argument(0).isUndefined() ? ASCIILiteral("foo") : state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).isUndefined() ? ASCIILiteral("foo") : state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringAndDefaultValue(str);
</span><span class="lines">@@ -4200,7 +4264,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalStringIsNull");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsNull(str);
</span><span class="lines">@@ -4215,7 +4279,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalStringIsUndefined");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String str = state->argument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsUndefined(str);
</span><span class="lines">@@ -4245,7 +4309,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalStringIsEmptyString");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String str = state->argument(0).isUndefined() ? emptyString() : state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).isUndefined() ? emptyString() : state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsEmptyString(str);
</span><span class="lines">@@ -4668,7 +4732,7 @@
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(0));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String strArg = state->argument(1).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(1).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(objArg, strArg);
</span><span class="lines">@@ -4705,7 +4769,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String strArg = state->argument(0).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(strArg);
</span><span class="lines">@@ -4843,7 +4907,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String strArg = state->argument(0).toString(state)->value(state);
</del><ins>+ String strArg = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(strArg);
</span><span class="lines">@@ -4997,7 +5061,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String type = state->argument(0).toString(state)->value(state);
</del><ins>+ String type = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj::overloadedMethod1(type);
</span><span class="lines">@@ -5225,7 +5289,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String value = state->argument(0).toString(state)->value(state);
</del><ins>+ String value = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.convert3(value);
</span><span class="lines">@@ -5296,7 +5360,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String str = state->argument(0).toString(state)->value(state);
</del><ins>+ String str = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> float a = state->argument(1).toFloat(state);
</span><span class="lines">@@ -5375,7 +5439,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String head = state->argument(0).toString(state)->value(state);
</del><ins>+ String head = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<String> tail = toNativeArguments<String>(state, 1);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> auto* castedThis = jsCast<JSTestOverloadedConstructorsConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String string = state->argument(0).toString(state)->value(state);
</del><ins>+ String string = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> RefPtr<TestOverloadedConstructors> object = TestOverloadedConstructors::create(string);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestOverrideBuiltins", "namedItem");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestOverrideBuiltins::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String name = state->argument(0).isUndefined() ? ASCIILiteral("test") : state->uncheckedArgument(0).toString(state)->value(state);
</del><ins>+ String name = state->argument(0).isUndefined() ? ASCIILiteral("test") : state->uncheckedArgument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), WTF::getPtr(impl.namedItem(name)));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> auto* castedThis = jsCast<JSTestTypedefsConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- String hello = state->argument(0).toString(state)->value(state);
</del><ins>+ String hello = state->argument(0).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!state->argument(1).isObject()))
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestTypedefs", "stringAttrWithGetterException");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithGetterException(nativeValue);
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- String nativeValue = value.toString(state)->value(state);
</del><ins>+ String nativeValue = value.toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithSetterException(nativeValue, ec);
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> float blur = state->argument(2).toFloat(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- String color = state->argument(3).isUndefined() ? String() : state->uncheckedArgument(3).toString(state)->value(state);
</del><ins>+ String color = state->argument(3).isUndefined() ? String() : state->uncheckedArgument(3).toWTFString(state);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Optional<float> alpha = state->argument(4).isUndefined() ? Optional<float>() : state->uncheckedArgument(4).toFloat(state);
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -317,22 +317,22 @@
</span><span class="cx"> return list->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String FontFace::status() const
</del><ins>+FontFaceLoadStatus FontFace::status() const
</ins><span class="cx"> {
</span><span class="cx"> switch (m_backing->status()) {
</span><span class="cx"> case CSSFontFace::Status::Pending:
</span><del>- return String("unloaded", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Unloaded;
</ins><span class="cx"> case CSSFontFace::Status::Loading:
</span><del>- return String("loading", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Loading;
</ins><span class="cx"> case CSSFontFace::Status::TimedOut:
</span><del>- return String("error", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Error;
</ins><span class="cx"> case CSSFontFace::Status::Success:
</span><del>- return String("loaded", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Loaded;
</ins><span class="cx"> case CSSFontFace::Status::Failure:
</span><del>- return String("error", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Error;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return String("error", String::ConstructFromLiteral);
</del><ins>+ return FontFaceLoadStatus::Error;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontFace::fontStateChanged(CSSFontFace& face, CSSFontFace::Status, CSSFontFace::Status newState)
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.h (200287 => 200288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.h 2016-04-30 04:51:31 UTC (rev 200287)
+++ trunk/Source/WebCore/css/FontFace.h 2016-04-30 05:09:10 UTC (rev 200288)
</span><span class="lines">@@ -36,16 +36,14 @@
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-namespace Deprecated {
-class ScriptValue;
-}
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSFontFace;
</span><span class="cx"> class CSSValue;
</span><span class="cx"> class Dictionary;
</span><span class="cx">
</span><ins>+enum class FontFaceLoadStatus { Unloaded, Loading, Loaded, Error };
+
</ins><span class="cx"> class FontFace final : public RefCounted<FontFace>, public CSSFontFace::Client {
</span><span class="cx"> public:
</span><span class="cx"> static RefPtr<FontFace> create(JSC::ExecState&, ScriptExecutionContext&, const String& family, JSC::JSValue source, const Dictionary& descriptors, ExceptionCode&);
</span><span class="lines">@@ -67,7 +65,7 @@
</span><span class="cx"> String unicodeRange() const;
</span><span class="cx"> String variant() const;
</span><span class="cx"> String featureSettings() const;
</span><del>- String status() const;
</del><ins>+ FontFaceLoadStatus status() const;
</ins><span class="cx">
</span><span class="cx"> typedef DOMPromise<FontFace&, DOMCoreException&> Promise;
</span><span class="cx"> Promise& promise() { return m_promise; }
</span></span></pre>
</div>
</div>
</body>
</html>