<!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>[200547] trunk</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/200547">200547</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-05-07 14:14:20 -0700 (Sat, 07 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Next step on dictionary bindings, along with other bindings refinements
https://bugs.webkit.org/show_bug.cgi?id=157451
Reviewed by Chris Dumez.
Source/WebCore:
Converted one dictionary, the one passed to the constructor in FontFace.
* WebCore.xcodeproj/project.pbxproj: Updated for name change of JSDOMBuild.h to
JSDOMConvert.h and also let Xcode update a file type.
* bindings/js/JSDOMBinding.cpp:
(WebCore::propertyValue): Added.
* bindings/js/JSDOMBinding.h: Use pragma once. Remove unnecessary forward declaration.
Move all declarations to the top of the file, separating them from definitions. This
is a small step toward better overview of what's in this file and paves the way for
future simplifications and improvements we can make after we observe patterns.
Also removed a couple unused functions.
* bindings/js/JSDOMConvert.h: Renamed from JSDOMBuild.h.
Renamed function templates from build to convert. Added convertOptional.
* bindings/js/ReadableStreamController.cpp:
(WebCore::callFunction): Use auto and remove some unneeded namespacing.
(WebCore::ReadableStreamController::invoke): Ditto. Also remove use of helper function
getPropertyFromObject, since this was the only call site and it was not very helpful.
(WebCore::ReadableStreamController::isControlledReadableStreamLocked): Ditto.
(WebCore::createReadableStream): Ditto.
(WebCore::getReadableStreamReader): Ditto.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateEnumerationImplementationContent): Updated for name change from build to
convert and JSDOMBuild.h to JSDOMConvert.h.
(GenerateDictionaryImplementationContent): Ditto. Also added code to handle optional
and added explicit exception checking, using local variables. Not clear longer term
if the local variable approach is OK since this will unnecessarily change types like
const String& to String.
(GenerateParametersCheck): Removed local variable $optional and use $parameter->isOptional
directly consistently. This is slightly clearer because the old code used a mix of the
two, and also is a better pattern for when we refactor this into smaller functions.
Note that this function name is not good any more--this is a lot more then parameter checks.
(GetNativeType): Return appropriate name for dictionary types.
(JSValueToNative): Updated for name change from build to convert and JSDOMBuild.h to
JSDOMConvert.h.
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
Regenerated results.
* bindings/scripts/test/TestObj.idl: Added another dictionary test case, just a copy
of the current state of the one in FontFace.idl.
* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::setUnicodeRange): Update for simplified UnicodeRange struct.
(WebCore::CSSFontFace::setFeatureSettings): Fix to correctly handle being called
with "normal". Also fix so it doesn't call fontPropertyChanged if nothing changed.
Also got rid of return value, which had no real value: it was returning false for
some bad inputs, but others would just lead to assertions, and the real reason this
was OK is that this function is only passed known-valid values.
* css/CSSFontFace.h: Used prama once. Tweaked formatting. Removed return value from
the setFeatureSettings function. Changed UnicodeRange to be struct with public data
members instead a struct with a constructor and getter functions.
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::addFontFaceRule): Updated since setFeatureSettings no
longer has a boolean return value.
* css/CSSSegmentedFontFace.cpp:
(WebCore::appendFontWithInvalidUnicodeRangeIfLoading): Updated for simplified
UnicodeRange struct.
* css/FontFace.cpp:
(WebCore::valueFromDictionary): Deleted.
(WebCore::FontFace::create): Updated to take the descriptors as a struct instead of
a WebCore::Dictionary. Also made that argument optional as specified in the current
specification draft.
(WebCore::FontFace::setFeatureSettings): Updated since setFeatureSettings no longer
has a boolean return value.
(WebCore::FontFace::unicodeRange): Updated for simplified UnicodeRange struct.
* css/FontFace.h: Used pragma once. Removed unneeded includes and forward declarations.
Derived privately from CSSFontFace::Client. Added a FontFace::Descriptors struct and
used it as an argument to the create function as described above.
* css/FontFace.idl: Added FontFaceDescriptors and changed the argument to the
constructor to be an optional FontFaceDescriptors instead of a Dictionary.
Tools:
* Scripts/do-webcore-rename: Use this to rename JSDOMBuild.h to JSDOMConvert.h.
Also skip test expectations in a directory that this was modifying unnecessarily.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamControllercpp">trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceh">trunk/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSegmentedFontFacecpp">trunk/Source/WebCore/css/CSSSegmentedFontFace.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>
<li><a href="#trunkSourceWebCorecssFontFaceidl">trunk/Source/WebCore/css/FontFace.idl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsdowebcorerename">trunk/Tools/Scripts/do-webcore-rename</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConverth">trunk/Source/WebCore/bindings/js/JSDOMConvert.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBuildh">trunk/Source/WebCore/bindings/js/JSDOMBuild.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2016-05-07 Darin Adler <darin@apple.com>
+
+ Next step on dictionary bindings, along with other bindings refinements
+ https://bugs.webkit.org/show_bug.cgi?id=157451
+
+ Reviewed by Chris Dumez.
+
+ Converted one dictionary, the one passed to the constructor in FontFace.
+
+ * WebCore.xcodeproj/project.pbxproj: Updated for name change of JSDOMBuild.h to
+ JSDOMConvert.h and also let Xcode update a file type.
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::propertyValue): Added.
+ * bindings/js/JSDOMBinding.h: Use pragma once. Remove unnecessary forward declaration.
+ Move all declarations to the top of the file, separating them from definitions. This
+ is a small step toward better overview of what's in this file and paves the way for
+ future simplifications and improvements we can make after we observe patterns.
+ Also removed a couple unused functions.
+
+ * bindings/js/JSDOMConvert.h: Renamed from JSDOMBuild.h.
+ Renamed function templates from build to convert. Added convertOptional.
+
+ * bindings/js/ReadableStreamController.cpp:
+ (WebCore::callFunction): Use auto and remove some unneeded namespacing.
+ (WebCore::ReadableStreamController::invoke): Ditto. Also remove use of helper function
+ getPropertyFromObject, since this was the only call site and it was not very helpful.
+ (WebCore::ReadableStreamController::isControlledReadableStreamLocked): Ditto.
+ (WebCore::createReadableStream): Ditto.
+ (WebCore::getReadableStreamReader): Ditto.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateEnumerationImplementationContent): Updated for name change from build to
+ convert and JSDOMBuild.h to JSDOMConvert.h.
+ (GenerateDictionaryImplementationContent): Ditto. Also added code to handle optional
+ and added explicit exception checking, using local variables. Not clear longer term
+ if the local variable approach is OK since this will unnecessarily change types like
+ const String& to String.
+ (GenerateParametersCheck): Removed local variable $optional and use $parameter->isOptional
+ directly consistently. This is slightly clearer because the old code used a mix of the
+ two, and also is a better pattern for when we refactor this into smaller functions.
+ Note that this function name is not good any more--this is a lot more then parameter checks.
+ (GetNativeType): Return appropriate name for dictionary types.
+ (JSValueToNative): Updated for name change from build to convert and JSDOMBuild.h to
+ JSDOMConvert.h.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ Regenerated results.
+
+ * bindings/scripts/test/TestObj.idl: Added another dictionary test case, just a copy
+ of the current state of the one in FontFace.idl.
+
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::setUnicodeRange): Update for simplified UnicodeRange struct.
+ (WebCore::CSSFontFace::setFeatureSettings): Fix to correctly handle being called
+ with "normal". Also fix so it doesn't call fontPropertyChanged if nothing changed.
+ Also got rid of return value, which had no real value: it was returning false for
+ some bad inputs, but others would just lead to assertions, and the real reason this
+ was OK is that this function is only passed known-valid values.
+
+ * css/CSSFontFace.h: Used prama once. Tweaked formatting. Removed return value from
+ the setFeatureSettings function. Changed UnicodeRange to be struct with public data
+ members instead a struct with a constructor and getter functions.
+
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::addFontFaceRule): Updated since setFeatureSettings no
+ longer has a boolean return value.
+
+ * css/CSSSegmentedFontFace.cpp:
+ (WebCore::appendFontWithInvalidUnicodeRangeIfLoading): Updated for simplified
+ UnicodeRange struct.
+
+ * css/FontFace.cpp:
+ (WebCore::valueFromDictionary): Deleted.
+ (WebCore::FontFace::create): Updated to take the descriptors as a struct instead of
+ a WebCore::Dictionary. Also made that argument optional as specified in the current
+ specification draft.
+ (WebCore::FontFace::setFeatureSettings): Updated since setFeatureSettings no longer
+ has a boolean return value.
+ (WebCore::FontFace::unicodeRange): Updated for simplified UnicodeRange struct.
+
+ * css/FontFace.h: Used pragma once. Removed unneeded includes and forward declarations.
+ Derived privately from CSSFontFace::Client. Added a FontFace::Descriptors struct and
+ used it as an argument to the create function as described above.
+
+ * css/FontFace.idl: Added FontFaceDescriptors and changed the argument to the
+ constructor to be an optional FontFaceDescriptors instead of a Dictionary.
+
</ins><span class="cx"> 2016-05-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Rework FontFace promise attribute handling
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -3515,6 +3515,7 @@
</span><span class="cx"> 9307F1130AF2C8BE00DBA31A /* DOMNodeInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85B498FA0ADB340200925CBB /* DOMNodeInternal.h */; };
</span><span class="cx"> 9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */; };
</span><span class="cx"> 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 9307F1D60AF2D59000DBA31A /* HitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 930841341CDDB15500B0958C /* JSDOMConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 930841331CDDB15500B0958C /* JSDOMConvert.h */; };
</ins><span class="cx"> 930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 930908900AF7EDE40081DF01 /* HitTestRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 930C90DD19CF965300D6C21A /* InlineIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 930C90DC19CF965300D6C21A /* InlineIterator.cpp */; };
</span><span class="cx"> 93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BD914181F7A00FCF5BE /* missingImage@2x.png */; };
</span><span class="lines">@@ -9666,7 +9667,7 @@
</span><span class="cx"> 51741D0B0B07259A00ED442C /* BackForwardClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 51741D0D0B07259A00ED442C /* HistoryItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HistoryItem.h; sourceTree = "<group>"; };
</span><span class="cx"> 51741D0E0B07259A00ED442C /* HistoryItem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryItem.cpp; sourceTree = "<group>"; };
</span><del>- 51748FA21CC6EEEB00728D84 /* WorkerGlobalScopeConstructors.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; path = WorkerGlobalScopeConstructors.idl; sourceTree = "<group>"; };
</del><ins>+ 51748FA21CC6EEEB00728D84 /* WorkerGlobalScopeConstructors.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WorkerGlobalScopeConstructors.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 5174E20810A1F44F00F95E6F /* PopStateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopStateEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 5174E20B10A1F49A00F95E6F /* PopStateEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PopStateEvent.idl; sourceTree = "<group>"; };
</span><span class="cx"> 51771DFC1BDB475600CAE8E4 /* MemoryObjectStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryObjectStore.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11163,6 +11164,7 @@
</span><span class="cx"> 9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; lineEnding = 0; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
</span><span class="cx"> 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9307F1D60AF2D59000DBA31A /* HitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestResult.h; sourceTree = "<group>"; };
</span><ins>+ 930841331CDDB15500B0958C /* JSDOMConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMConvert.h; sourceTree = "<group>"; };
</ins><span class="cx"> 930908900AF7EDE40081DF01 /* HitTestRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 930C90DC19CF965300D6C21A /* InlineIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 93153BD914181F7A00FCF5BE /* missingImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "missingImage@2x.png"; sourceTree = "<group>"; };
</span><span class="lines">@@ -22302,6 +22304,7 @@
</span><span class="cx"> 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */,
</span><span class="cx"> 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
</span><span class="cx"> 413C2C331BC29A7B0075204C /* JSDOMConstructor.h */,
</span><ins>+ 930841331CDDB15500B0958C /* JSDOMConvert.h */,
</ins><span class="cx"> E1C36CBC0EB08062007410BC /* JSDOMGlobalObject.cpp */,
</span><span class="cx"> E1C36C020EB076D6007410BC /* JSDOMGlobalObject.h */,
</span><span class="cx"> 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */,
</span><span class="lines">@@ -25480,6 +25483,7 @@
</span><span class="cx"> BC80C9880CD294EE00A0B7B3 /* CSSTimingFunctionValue.h in Headers */,
</span><span class="cx"> 9AB1F38018E2489A00534743 /* CSSToLengthConversionData.h in Headers */,
</span><span class="cx"> A882DA231593848D000115ED /* CSSToStyleMap.h in Headers */,
</span><ins>+ 930841341CDDB15500B0958C /* JSDOMConvert.h in Headers */,
</ins><span class="cx"> 371F53E90D2704F900ECE0D5 /* CSSUnicodeRangeValue.h in Headers */,
</span><span class="cx"> DD7CDF250A23CF9800069928 /* CSSUnknownRule.h in Headers */,
</span><span class="cx"> BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "IDBDatabaseException.h"
</span><ins>+#include "JSDOMConvert.h"
</ins><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="cx"> #include "JSExceptionBase.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -839,4 +840,9 @@
</span><span class="cx"> return CallType::Host;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue propertyValue(ExecState& state, JSValue value, const char* propertyName)
+{
+ return value.get(&state, Identifier::fromString(&state, propertyName));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -21,8 +21,7 @@
</span><span class="cx"> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef JSDOMBinding_h
-#define JSDOMBinding_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "JSDOMGlobalObject.h"
</span><span class="cx"> #include "JSDOMWrapper.h"
</span><span class="lines">@@ -55,7 +54,6 @@
</span><span class="cx"> // and function definitions below, even for template and inline functions.
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><del>-class HashEntry;
</del><span class="cx"> class JSFunction;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -69,6 +67,9 @@
</span><span class="cx"> class Node;
</span><span class="cx">
</span><span class="cx"> struct ExceptionCodeWithMessage;
</span><ins>+
+typedef int ExceptionCode;
+
</ins><span class="cx"> struct ExceptionDetails {
</span><span class="cx"> String message;
</span><span class="cx"> int lineNumber { 0 };
</span><span class="lines">@@ -76,8 +77,35 @@
</span><span class="cx"> String sourceURL;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
</del><ins>+// Base class for all constructor objects in the JSC bindings.
+class DOMConstructorObject : public JSDOMObject {
+public:
+ typedef JSDOMObject Base;
+ static const unsigned StructureFlags = Base::StructureFlags | JSC::ImplementsHasInstance | JSC::ImplementsDefaultHasInstance | JSC::TypeOfShouldCallGetCallData;
+ static JSC::Structure* createStructure(JSC::VM&, JSC::JSGlobalObject*, JSC::JSValue);
</ins><span class="cx">
</span><ins>+protected:
+ DOMConstructorObject(JSC::Structure*, JSDOMGlobalObject&);
+
+ static String className(const JSObject*);
+ static JSC::CallType getCallData(JSCell*, JSC::CallData&);
+};
+
+class DOMConstructorJSBuiltinObject : public DOMConstructorObject {
+public:
+ typedef DOMConstructorObject Base;
+
+protected:
+ DOMConstructorJSBuiltinObject(JSC::Structure*, JSDOMGlobalObject&);
+ static void visitChildren(JSC::JSCell*, JSC::SlotVisitor&);
+
+ JSC::JSFunction* initializeFunction();
+ void setInitializeFunction(JSC::VM&, JSC::JSFunction&);
+
+private:
+ JSC::WriteBarrier<JSC::JSFunction> m_initializeFunction;
+};
+
</ins><span class="cx"> DOMWindow& callerDOMWindow(JSC::ExecState*);
</span><span class="cx"> DOMWindow& activeDOMWindow(JSC::ExecState*);
</span><span class="cx"> DOMWindow& firstDOMWindow(JSC::ExecState*);
</span><span class="lines">@@ -100,47 +128,210 @@
</span><span class="cx"> WEBCORE_EXPORT JSC::EncodedJSValue throwGetterTypeError(JSC::ExecState&, const char* interfaceName, const char* attributeName);
</span><span class="cx"> WEBCORE_EXPORT JSC::EncodedJSValue throwThisTypeError(JSC::ExecState&, const char* interfaceName, const char* functionName);
</span><span class="cx">
</span><del>-// Base class for all constructor objects in the JSC bindings.
-class DOMConstructorObject : public JSDOMObject {
-public:
- typedef JSDOMObject Base;
- static const unsigned StructureFlags = Base::StructureFlags | JSC::ImplementsHasInstance | JSC::ImplementsDefaultHasInstance | JSC::TypeOfShouldCallGetCallData;
</del><ins>+WEBCORE_EXPORT JSC::Structure* getCachedDOMStructure(JSDOMGlobalObject&, const JSC::ClassInfo*);
+WEBCORE_EXPORT JSC::Structure* cacheDOMStructure(JSDOMGlobalObject&, JSC::Structure*, const JSC::ClassInfo*);
</ins><span class="cx">
</span><del>- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
</del><ins>+template<typename WrapperClass> JSC::Structure* getDOMStructure(JSC::VM&, JSDOMGlobalObject&);
+template<typename WrapperClass> JSC::Structure* deprecatedGetDOMStructure(JSC::ExecState*);
+template<typename WrapperClass> JSC::JSObject* getDOMPrototype(JSC::VM&, JSC::JSGlobalObject*);
</ins><span class="cx">
</span><del>-protected:
- DOMConstructorObject(JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- : JSDOMObject(structure, globalObject)
- {
- }
</del><ins>+void callFunctionWithCurrentArguments(JSC::ExecState&, JSC::JSObject& thisObject, JSC::JSFunction&);
</ins><span class="cx">
</span><del>- static String className(const JSObject*) { return ASCIILiteral("Function"); }
- static JSC::CallType getCallData(JSCell*, JSC::CallData&);
-};
</del><ins>+template<typename JSClass> JSC::EncodedJSValue createJSBuiltin(JSC::ExecState&, JSC::JSFunction& initializeFunction, JSDOMGlobalObject&);
</ins><span class="cx">
</span><del>-class DOMConstructorJSBuiltinObject : public DOMConstructorObject {
-public:
- typedef DOMConstructorObject Base;
</del><ins>+JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld&, JSC::ArrayBuffer*);
+void* wrapperKey(JSC::ArrayBuffer*);
</ins><span class="cx">
</span><del>-protected:
- DOMConstructorJSBuiltinObject(JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- : DOMConstructorObject(structure, globalObject) { }
</del><ins>+JSDOMObject* getInlineCachedWrapper(DOMWrapperWorld&, void*);
+JSDOMObject* getInlineCachedWrapper(DOMWrapperWorld&, ScriptWrappable*);
+JSC::JSArrayBuffer* getInlineCachedWrapper(DOMWrapperWorld&, JSC::ArrayBuffer*);
</ins><span class="cx">
</span><del>- static void visitChildren(JSC::JSCell*, JSC::SlotVisitor&);
</del><ins>+bool setInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMObject*, JSC::WeakHandleOwner*);
+bool setInlineCachedWrapper(DOMWrapperWorld&, ScriptWrappable*, JSDOMObject* wrapper, JSC::WeakHandleOwner* wrapperOwner);
+bool setInlineCachedWrapper(DOMWrapperWorld&, JSC::ArrayBuffer*, JSC::JSArrayBuffer* wrapper, JSC::WeakHandleOwner* wrapperOwner);
</ins><span class="cx">
</span><del>- JSC::JSFunction* initializeFunction() { return m_initializeFunction.get(); }
- void setInitializeFunction(JSC::VM& vm, JSC::JSFunction& function) { m_initializeFunction.set(vm, this, &function); }
</del><ins>+bool clearInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMObject*);
+bool clearInlineCachedWrapper(DOMWrapperWorld&, ScriptWrappable*, JSDOMObject* wrapper);
+bool clearInlineCachedWrapper(DOMWrapperWorld&, JSC::ArrayBuffer*, JSC::JSArrayBuffer* wrapper);
</ins><span class="cx">
</span><del>-private:
- JSC::WriteBarrier<JSC::JSFunction> m_initializeFunction;
</del><ins>+#define CREATE_DOM_WRAPPER(globalObject, className, object) createWrapper<JS##className>(globalObject, static_cast<className*>(object))
+
+template<typename DOMClass> JSC::JSObject* getCachedWrapper(DOMWrapperWorld&, DOMClass*);
+template<typename DOMClass, typename WrapperClass> void cacheWrapper(DOMWrapperWorld&, DOMClass*, WrapperClass*);
+template<typename DOMClass, typename WrapperClass> void uncacheWrapper(DOMWrapperWorld&, DOMClass*, WrapperClass*);
+
+template<typename WrapperClass, typename DOMClass> JSDOMObject* createWrapper(JSDOMGlobalObject*, DOMClass*);
+template<typename WrapperClass, typename DOMClass> JSC::JSValue wrap(JSDOMGlobalObject*, DOMClass&);
+template<typename WrapperClass, typename DOMClass> JSC::JSValue getExistingWrapper(JSDOMGlobalObject*, DOMClass*);
+template<typename WrapperClass, typename DOMClass> JSC::JSValue createNewWrapper(JSDOMGlobalObject*, DOMClass*);
+
+void addImpureProperty(const AtomicString&);
+
+const JSC::HashTable& getHashTableForGlobalData(JSC::VM&, const JSC::HashTable& staticTable);
+
+WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::JSValue exception, CachedScript* = nullptr);
+WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::Exception*, CachedScript* = nullptr, ExceptionDetails* = nullptr);
+void reportCurrentException(JSC::ExecState*);
+
+JSC::JSValue createDOMException(JSC::ExecState*, ExceptionCode);
+
+// Convert a DOM implementation exception code into a JavaScript exception in the execution state.
+WEBCORE_EXPORT void setDOMException(JSC::ExecState*, ExceptionCode);
+void setDOMException(JSC::ExecState*, const ExceptionCodeWithMessage&);
+
+JSC::JSValue jsString(JSC::ExecState*, const URL&); // empty if the URL is null
+
+JSC::JSValue jsStringOrNull(JSC::ExecState*, const String&); // null if the string is null
+JSC::JSValue jsStringOrNull(JSC::ExecState*, const URL&); // null if the URL is null
+
+JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const String&); // undefined if the string is null
+JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const URL&); // undefined if the URL is null
+
+// See JavaScriptCore for explanation: Should be used for any string that is already owned by another
+// object, to let the engine know that collecting the JSString wrapper is unlikely to save memory.
+JSC::JSValue jsOwnedStringOrNull(JSC::ExecState*, const String&);
+
+String propertyNameToString(JSC::PropertyName);
+
+AtomicString propertyNameToAtomicString(JSC::PropertyName);
+
+// FIXME: This is only used by legacy code and should go away. Use valueToStringTreatingNullAsEmptyString() instead.
+String valueToStringWithNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null
+
+String valueToStringTreatingNullAsEmptyString(JSC::ExecState*, JSC::JSValue);
+String valueToStringWithUndefinedOrNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null or undefined
+
+template<typename T> JSC::JSValue toNullableJSNumber(Optional<T>); // null if the optional is null
+
+int32_t finiteInt32Value(JSC::JSValue, JSC::ExecState*, bool& okay);
+
+// The following functions convert values to integers as per the WebIDL specification.
+// The conversion fails if the value cannot be converted to a number or, if EnforceRange is specified,
+// the value is outside the range of the destination integer type.
+
+enum IntegerConversionConfiguration { NormalConversion, EnforceRange, Clamp };
+
+WEBCORE_EXPORT int32_t toInt32EnforceRange(JSC::ExecState*, JSC::JSValue);
+WEBCORE_EXPORT uint32_t toUInt32EnforceRange(JSC::ExecState*, JSC::JSValue);
+
+WEBCORE_EXPORT int32_t toInt32Clamp(JSC::ExecState*, JSC::JSValue);
+WEBCORE_EXPORT uint32_t toUInt32Clamp(JSC::ExecState*, JSC::JSValue);
+
+WEBCORE_EXPORT int8_t toInt8(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+WEBCORE_EXPORT uint8_t toUInt8(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+
+WEBCORE_EXPORT int16_t toInt16(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+WEBCORE_EXPORT uint16_t toUInt16(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+
+int32_t toInt32(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+uint32_t toUInt32(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+
+WEBCORE_EXPORT int64_t toInt64(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+WEBCORE_EXPORT uint64_t toUInt64(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
+
+// Returns a Date instance for the specified value, or NaN if the date is not a number.
+JSC::JSValue jsDateOrNaN(JSC::ExecState*, double);
+
+// Returns a Date instance for the specified value, or null if the value is NaN or infinity.
+JSC::JSValue jsDateOrNull(JSC::ExecState*, double);
+
+// NaN if the value can't be converted to a date.
+double valueToDate(JSC::ExecState*, JSC::JSValue);
+
+// Validates that the passed object is a sequence type per section 4.1.13 of the WebIDL spec.
+JSC::JSObject* toJSSequence(JSC::ExecState*, JSC::JSValue, unsigned& length);
+
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSC::ArrayBuffer*);
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSC::ArrayBufferView*);
+JSC::JSValue toJS(JSC::ExecState*, JSC::JSGlobalObject*, JSC::ArrayBufferView*);
+template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, RefPtr<T>);
+template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<T>);
+template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<T>&);
+template<typename T> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const Vector<RefPtr<T>>&);
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, const String&);
+
+JSC::JSValue toJSIterator(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSValue);
+template<typename T> JSC::JSValue toJSIterator(JSC::ExecState&, JSDOMGlobalObject&, const T&);
+
+JSC::JSValue toJSIteratorEnd(JSC::ExecState&);
+
+template<typename T, size_t inlineCapacity> JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, const Vector<T, inlineCapacity>&);
+template<typename T, size_t inlineCapacity> JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, const Vector<T, inlineCapacity>*);
+WEBCORE_EXPORT JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<DOMStringList>);
+
+template<typename Value1, typename Value2> JSC::JSValue jsPair(JSC::ExecState&, JSDOMGlobalObject*, const Value1&, const Value2&);
+
+RefPtr<JSC::ArrayBufferView> toArrayBufferView(JSC::JSValue);
+RefPtr<JSC::Int8Array> toInt8Array(JSC::JSValue);
+RefPtr<JSC::Int16Array> toInt16Array(JSC::JSValue);
+RefPtr<JSC::Int32Array> toInt32Array(JSC::JSValue);
+RefPtr<JSC::Uint8Array> toUint8Array(JSC::JSValue);
+RefPtr<JSC::Uint8ClampedArray> toUint8ClampedArray(JSC::JSValue);
+RefPtr<JSC::Uint16Array> toUint16Array(JSC::JSValue);
+RefPtr<JSC::Uint32Array> toUint32Array(JSC::JSValue);
+RefPtr<JSC::Float32Array> toFloat32Array(JSC::JSValue);
+RefPtr<JSC::Float64Array> toFloat64Array(JSC::JSValue);
+
+template<typename T, typename JSType> Vector<RefPtr<T>> toRefPtrNativeArray(JSC::ExecState*, JSC::JSValue, T* (*)(JSC::JSValue));
+template<typename T> Vector<T> toNativeArray(JSC::ExecState*, JSC::JSValue);
+template<typename T> Vector<T> toNativeArguments(JSC::ExecState*, size_t startIndex = 0);
+
+bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
+bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*);
+bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, String& message);
+bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, String& message);
+
+enum SecurityReportingOption { DoNotReportSecurityError, ReportSecurityError };
+
+class BindingSecurity {
+public:
+ static bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
+ static bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, SecurityReportingOption = ReportSecurityError);
+ static bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, SecurityReportingOption = ReportSecurityError);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WEBCORE_EXPORT JSC::Structure* getCachedDOMStructure(JSDOMGlobalObject&, const JSC::ClassInfo*);
-WEBCORE_EXPORT JSC::Structure* cacheDOMStructure(JSDOMGlobalObject&, JSC::Structure*, const JSC::ClassInfo*);
</del><ins>+void printErrorMessageForFrame(Frame*, const String& message);
</ins><span class="cx">
</span><ins>+String propertyNameToString(JSC::PropertyName);
+AtomicString propertyNameToAtomicString(JSC::PropertyName);
+
+template<typename DOMClass> const JSC::HashTableValue* getStaticValueSlotEntryWithoutCaching(JSC::ExecState*, JSC::PropertyName);
+template<JSC::NativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
+
+JSC::JSValue propertyValue(JSC::ExecState&, JSC::JSValue, const char* propertyName);
+
+// Inline functions and template definitions.
+
+inline JSC::Structure* DOMConstructorObject::createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+{
+ return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+}
+
+inline DOMConstructorObject::DOMConstructorObject(JSC::Structure* structure, JSDOMGlobalObject& globalObject)
+ : JSDOMObject(structure, globalObject)
+{
+}
+
+inline String DOMConstructorObject::className(const JSObject*)
+{
+ return ASCIILiteral("Function");
+}
+
+inline DOMConstructorJSBuiltinObject::DOMConstructorJSBuiltinObject(JSC::Structure* structure, JSDOMGlobalObject& globalObject)
+ : DOMConstructorObject(structure, globalObject)
+{
+}
+
+inline JSC::JSFunction* DOMConstructorJSBuiltinObject::initializeFunction()
+{
+ return m_initializeFunction.get();
+}
+
+inline void DOMConstructorJSBuiltinObject::setInitializeFunction(JSC::VM& vm, JSC::JSFunction& function)
+{
+ m_initializeFunction.set(vm, this, &function);
+}
+
</ins><span class="cx"> inline JSDOMGlobalObject* deprecatedGlobalObjectForPrototype(JSC::ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Callers to this function should be using the global object
</span><span class="lines">@@ -167,8 +358,6 @@
</span><span class="cx"> return JSC::jsCast<JSC::JSObject*>(asObject(getDOMStructure<WrapperClass>(vm, *JSC::jsCast<JSDOMGlobalObject*>(globalObject))->storedPrototype()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void callFunctionWithCurrentArguments(JSC::ExecState&, JSC::JSObject& thisObject, JSC::JSFunction&);
-
</del><span class="cx"> template<typename JSClass> inline JSC::EncodedJSValue createJSBuiltin(JSC::ExecState& state, JSC::JSFunction& initializeFunction, JSDOMGlobalObject& globalObject)
</span><span class="cx"> {
</span><span class="cx"> JSC::JSObject* object = JSClass::create(getDOMStructure<JSClass>(globalObject.vm(), globalObject), &globalObject);
</span><span class="lines">@@ -258,7 +447,6 @@
</span><span class="cx"> weakRemove(world.m_wrappers, wrapperKey(domObject), wrapper);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define CREATE_DOM_WRAPPER(globalObject, className, object) createWrapper<JS##className>(globalObject, static_cast<className*>(object))
</del><span class="cx"> template<typename WrapperClass, typename DOMClass> inline JSDOMObject* createWrapper(JSDOMGlobalObject* globalObject, DOMClass* node)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="lines">@@ -288,44 +476,6 @@
</span><span class="cx"> return createWrapper<WrapperClass>(globalObject, domObject);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void addImpureProperty(const AtomicString&);
-
-const JSC::HashTable& getHashTableForGlobalData(JSC::VM&, const JSC::HashTable& staticTable);
-
-WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::JSValue exception, CachedScript* = nullptr);
-WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::Exception*, CachedScript* = nullptr, ExceptionDetails* = nullptr);
-void reportCurrentException(JSC::ExecState*);
-
-JSC::JSValue createDOMException(JSC::ExecState*, ExceptionCode);
-
-// Convert a DOM implementation exception code into a JavaScript exception in the execution state.
-WEBCORE_EXPORT void setDOMException(JSC::ExecState*, ExceptionCode);
-void setDOMException(JSC::ExecState*, const ExceptionCodeWithMessage&);
-
-JSC::JSValue jsString(JSC::ExecState*, const URL&); // empty if the URL is null
-
-JSC::JSValue jsStringOrNull(JSC::ExecState*, const String&); // null if the string is null
-JSC::JSValue jsStringOrNull(JSC::ExecState*, const URL&); // null if the URL is null
-
-JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const String&); // undefined if the string is null
-JSC::JSValue jsStringOrUndefined(JSC::ExecState*, const URL&); // undefined if the URL is null
-
-// See JavaScriptCore for explanation: Should be used for any string that is already owned by another
-// object, to let the engine know that collecting the JSString wrapper is unlikely to save memory.
-JSC::JSValue jsOwnedStringOrNull(JSC::ExecState*, const String&);
-
-String propertyNameToString(JSC::PropertyName);
-
-AtomicString propertyNameToAtomicString(JSC::PropertyName);
-
-// FIXME: This is only used by legacy code and should go away. Use valueToStringTreatingNullAsEmptyString() instead.
-String valueToStringWithNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null
-
-String valueToStringTreatingNullAsEmptyString(JSC::ExecState*, JSC::JSValue);
-String valueToStringWithUndefinedOrNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null or undefined
-
-template<typename T> JSC::JSValue toNullableJSNumber(Optional<T>); // null if the optional is null
-
</del><span class="cx"> inline int32_t finiteInt32Value(JSC::JSValue value, JSC::ExecState* exec, bool& okay)
</span><span class="cx"> {
</span><span class="cx"> double number = value.toNumber(exec);
</span><span class="lines">@@ -333,24 +483,6 @@
</span><span class="cx"> return JSC::toInt32(number);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-enum IntegerConversionConfiguration {
- NormalConversion,
- EnforceRange,
- Clamp
-};
-
-WEBCORE_EXPORT int32_t toInt32EnforceRange(JSC::ExecState*, JSC::JSValue);
-WEBCORE_EXPORT uint32_t toUInt32EnforceRange(JSC::ExecState*, JSC::JSValue);
-
-WEBCORE_EXPORT int32_t toInt32Clamp(JSC::ExecState*, JSC::JSValue);
-WEBCORE_EXPORT uint32_t toUInt32Clamp(JSC::ExecState*, JSC::JSValue);
-
-WEBCORE_EXPORT int8_t toInt8(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-WEBCORE_EXPORT uint8_t toUInt8(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-
-WEBCORE_EXPORT int16_t toInt16(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-WEBCORE_EXPORT uint16_t toUInt16(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-
</del><span class="cx"> /*
</span><span class="cx"> Convert a value to an integer as per <http://www.w3.org/TR/WebIDL/>.
</span><span class="cx"> The conversion fails if the value cannot be converted to a number or,
</span><span class="lines">@@ -383,18 +515,6 @@
</span><span class="cx"> return value.toUInt32(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WEBCORE_EXPORT int64_t toInt64(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-WEBCORE_EXPORT uint64_t toUInt64(JSC::ExecState*, JSC::JSValue, IntegerConversionConfiguration);
-
-// Returns a Date instance for the specified value, or NaN if the date is not a number.
-JSC::JSValue jsDateOrNaN(JSC::ExecState*, double);
-
-// Returns a Date instance for the specified value, or null if the value is NaN or infinity.
-JSC::JSValue jsDateOrNull(JSC::ExecState*, double);
-
-// NaN if the value can't be converted to a date.
-double valueToDate(JSC::ExecState*, JSC::JSValue);
-
</del><span class="cx"> // Validates that the passed object is a sequence type per section 4.1.13 of the WebIDL spec.
</span><span class="cx"> inline JSC::JSObject* toJSSequence(JSC::ExecState* exec, JSC::JSValue value, unsigned& length)
</span><span class="cx"> {
</span><span class="lines">@@ -550,8 +670,6 @@
</span><span class="cx"> return constructArray(&state, 0, globalObject, args);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WEBCORE_EXPORT JSC::JSValue jsArray(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<DOMStringList>);
-
</del><span class="cx"> inline RefPtr<JSC::ArrayBufferView> toArrayBufferView(JSC::JSValue value)
</span><span class="cx"> {
</span><span class="cx"> auto* wrapper = JSC::jsDynamicCast<JSC::JSArrayBufferView*>(value);
</span><span class="lines">@@ -575,7 +693,7 @@
</span><span class="cx"> template<> struct NativeValueTraits<String> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState* exec, JSC::JSValue jsValue, String& indexedValue)
</span><span class="cx"> {
</span><del>- indexedValue = jsValue.toString(exec)->value(exec);
</del><ins>+ indexedValue = jsValue.toWTFString(exec);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -657,7 +775,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> Vector<T> toNativeArguments(JSC::ExecState* exec, size_t startIndex = 0)
</del><ins>+template<typename T> Vector<T> toNativeArguments(JSC::ExecState* exec, size_t startIndex)
</ins><span class="cx"> {
</span><span class="cx"> size_t length = exec->argumentCount();
</span><span class="cx"> ASSERT(startIndex <= length);
</span><span class="lines">@@ -675,13 +793,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
-bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*);
-bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, String& message);
-bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, String& message);
-
-void printErrorMessageForFrame(Frame*, const String& message);
-
</del><span class="cx"> inline String propertyNameToString(JSC::PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!propertyName.isSymbol());
</span><span class="lines">@@ -707,40 +818,14 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<JSC::NativeFunction nativeFunction, int length>
-JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName)
</del><ins>+template<JSC::NativeFunction nativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName)
</ins><span class="cx"> {
</span><span class="cx"> return JSC::JSValue::encode(JSC::JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-enum SecurityReportingOption {
- DoNotReportSecurityError,
- ReportSecurityError,
-};
-
-class BindingSecurity {
-public:
- static bool shouldAllowAccessToNode(JSC::ExecState*, Node*);
- static bool shouldAllowAccessToDOMWindow(JSC::ExecState*, DOMWindow&, SecurityReportingOption = ReportSecurityError);
- static bool shouldAllowAccessToFrame(JSC::ExecState*, Frame*, SecurityReportingOption = ReportSecurityError);
-};
-
-inline JSC::JSValue getPropertyFromObject(JSC::ExecState& exec, JSC::JSObject& object, const char* identifier)
-{
- return object.get(&exec, JSC::Identifier::fromString(&exec, identifier));
-}
-
-inline void setPropertyToObject(JSC::ExecState& exec, JSC::JSObject& object, const char* name, JSC::JSValue value)
-{
- JSC::PutPropertySlot propertySlot(&object);
- JSC::JSObject::put(&object, &exec, JSC::Identifier::fromString(&exec, name), value, propertySlot);
-}
-
</del><span class="cx"> template<typename T> inline JSC::JSValue toNullableJSNumber(Optional<T> optionalNumber)
</span><span class="cx"> {
</span><span class="cx"> return optionalNumber ? JSC::jsNumber(optionalNumber.value()) : JSC::jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // JSDOMBinding_h
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBuildh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSDOMBuild.h (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBuild.h 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/js/JSDOMBuild.h 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
-
-Copyright (C) 2016 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#pragma once
-
-#include "JSDOMBinding.h"
-
-namespace WebCore {
-
-template<typename T> T build(JSC::ExecState&, JSC::JSValue);
-template<typename T, unsigned characterCount> T build(JSC::ExecState&, JSC::JSValue, const char (&propertyName)[characterCount]);
-enum class ShouldAllowNonFinite { No, Yes };
-template<typename T> T build(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
-
-template<typename T, unsigned characterCount> inline T build(JSC::ExecState& state, JSC::JSValue value, const char (&propertyName)[characterCount])
-{
- return build<T>(state, value.get(&state, JSC::Identifier::fromString(&state, propertyName)));
-}
-
-template<typename T> inline T build(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allowNonFinite)
-{
- static_assert(std::is_same<T, float>::value || std::is_same<T, double>::value, "Should be called with converting to float or double");
- double number = value.toNumber(&state);
- if (allowNonFinite == ShouldAllowNonFinite::No && UNLIKELY(!std::isfinite(number)))
- throwNonFiniteTypeError(state);
- return static_cast<T>(number);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConverthfromrev200546trunkSourceWebCorebindingsjsJSDOMBuildh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/bindings/js/JSDOMConvert.h (from rev 200546, trunk/Source/WebCore/bindings/js/JSDOMBuild.h) (0 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConvert.h (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDOMConvert.h 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+
+Copyright (C) 2016 Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#pragma once
+
+#include "JSDOMBinding.h"
+
+namespace WebCore {
+
+enum class ShouldAllowNonFinite { No, Yes };
+
+template<typename T> T convert(JSC::ExecState&, JSC::JSValue);
+template<typename T> T convert(JSC::ExecState&, JSC::JSValue, ShouldAllowNonFinite);
+
+template<typename T> Optional<T> convertOptional(JSC::ExecState&, JSC::JSValue);
+template<typename T, typename U> T convertOptional(JSC::ExecState&, JSC::JSValue, U&& defaultValue);
+
+template<typename T> Optional<T> inline convertOptional(JSC::ExecState& state, JSC::JSValue value)
+{
+ return value.isUndefined() ? Nullopt : convert<T>(state, value);
+}
+
+template<typename T, typename U> inline T convertOptional(JSC::ExecState& state, JSC::JSValue value, U&& defaultValue)
+{
+ return value.isUndefined() ? std::forward<U>(defaultValue) : convert<T>(state, value);
+}
+
+template<> inline String convert<String>(JSC::ExecState& state, JSC::JSValue value)
+{
+ return value.toWTFString(&state);
+}
+
+template<typename T> inline T convert(JSC::ExecState& state, JSC::JSValue value, ShouldAllowNonFinite allowNonFinite)
+{
+ static_assert(std::is_same<T, float>::value || std::is_same<T, double>::value, "Should be called with converting to float or double");
+ double number = value.toNumber(&state);
+ if (allowNonFinite == ShouldAllowNonFinite::No && UNLIKELY(!std::isfinite(number)))
+ throwNonFiniteTypeError(state);
+ return static_cast<T>(number);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamController.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -41,15 +41,15 @@
</span><span class="cx"> static inline JSC::JSValue callFunction(JSC::ExecState& state, JSC::JSValue jsFunction, JSC::JSValue thisValue, const JSC::ArgList& arguments)
</span><span class="cx"> {
</span><span class="cx"> JSC::CallData callData;
</span><del>- JSC::CallType callType = JSC::getCallData(jsFunction, callData);
- return JSC::call(&state, jsFunction, callType, callData, thisValue, arguments);
</del><ins>+ auto callType = JSC::getCallData(jsFunction, callData);
+ return call(&state, jsFunction, callType, callData, thisValue, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue ReadableStreamController::invoke(JSC::ExecState& state, JSC::JSObject& object, const char* propertyName, JSC::JSValue parameter)
</span><span class="cx"> {
</span><span class="cx"> JSC::JSLockHolder lock(&state);
</span><span class="cx">
</span><del>- JSC::JSValue function = getPropertyFromObject(state, object, propertyName);
</del><ins>+ auto function = object.get(&state, JSC::Identifier::fromString(&state, propertyName));
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return JSC::jsUndefined();
</span><span class="cx">
</span><span class="lines">@@ -67,18 +67,18 @@
</span><span class="cx">
</span><span class="cx"> bool ReadableStreamController::isControlledReadableStreamLocked() const
</span><span class="cx"> {
</span><del>- JSC::ExecState& state = *globalObject()->globalExec();
</del><ins>+ auto& state = *globalObject()->globalExec();
</ins><span class="cx"> JSC::JSLockHolder lock(&state);
</span><span class="cx">
</span><del>- JSVMClientData& clientData = *static_cast<JSVMClientData*>(state.vm().clientData);
- JSC::JSValue readableStream = m_jsController->get(&state, clientData.builtinNames().controlledReadableStreamPrivateName());
</del><ins>+ auto& clientData = *static_cast<JSVMClientData*>(state.vm().clientData);
+ auto readableStream = m_jsController->get(&state, clientData.builtinNames().controlledReadableStreamPrivateName());
</ins><span class="cx"> ASSERT(!state.hadException());
</span><span class="cx">
</span><del>- JSC::JSValue isLocked = globalObject()->builtinInternalFunctions().readableStreamInternals().m_isReadableStreamLockedFunction.get();
</del><ins>+ auto isLocked = globalObject()->builtinInternalFunctions().readableStreamInternals().m_isReadableStreamLockedFunction.get();
</ins><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(readableStream);
</span><del>- JSC::JSValue result = callFunction(state, isLocked, JSC::jsUndefined(), arguments);
</del><ins>+ auto result = callFunction(state, isLocked, JSC::jsUndefined(), arguments);
</ins><span class="cx"> ASSERT(!state.hadException());
</span><span class="cx">
</span><span class="cx"> return result.isTrue();
</span><span class="lines">@@ -88,29 +88,29 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::JSLockHolder lock(&state);
</span><span class="cx">
</span><del>- JSC::JSValue jsSource = source ? toJS(&state, globalObject, source) : JSC::jsUndefined();
</del><ins>+ auto jsSource = source ? toJS(&state, globalObject, source) : JSC::jsUndefined();
</ins><span class="cx"> JSC::Strong<JSC::Unknown> protect(state.vm(), jsSource);
</span><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(jsSource);
</span><span class="cx">
</span><del>- JSC::JSValue constructor = JSReadableStream::getConstructor(state.vm(), globalObject);
</del><ins>+ auto constructor = JSReadableStream::getConstructor(state.vm(), globalObject);
</ins><span class="cx">
</span><span class="cx"> JSC::ConstructData constructData;
</span><del>- JSC::ConstructType constructType = JSC::getConstructData(constructor, constructData);
</del><ins>+ auto constructType = JSC::getConstructData(constructor, constructData);
</ins><span class="cx"> ASSERT(constructType != JSC::ConstructType::None);
</span><span class="cx">
</span><del>- return JSC::construct(&state, constructor, constructType, constructData, arguments);
</del><ins>+ return construct(&state, constructor, constructType, constructData, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue getReadableStreamReader(JSC::ExecState& state, JSC::JSValue readableStream)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(readableStream.isObject());
</span><span class="cx">
</span><del>- JSC::JSValue getReader = readableStream.getObject()->get(&state, JSC::Identifier::fromString(&state, "getReader"));
</del><ins>+ auto getReader = readableStream.getObject()->get(&state, JSC::Identifier::fromString(&state, "getReader"));
</ins><span class="cx"> ASSERT(!state.hadException());
</span><span class="cx">
</span><del>- JSC::JSValue reader = callFunction(state, getReader, readableStream, JSC::MarkedArgumentBuffer());
</del><ins>+ auto reader = callFunction(state, getReader, readableStream, JSC::MarkedArgumentBuffer());
</ins><span class="cx"> ASSERT(!state.hadException());
</span><span class="cx">
</span><span class="cx"> return reader;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -916,9 +916,9 @@
</span><span class="cx"> $result .= "}\n\n";
</span><span class="cx">
</span><span class="cx"> # FIXME: A little ugly to have this be a side effect instead of a return value.
</span><del>- AddToImplIncludes("JSDOMBuild.h");
</del><ins>+ AddToImplIncludes("JSDOMConvert.h");
</ins><span class="cx">
</span><del>- $result .= "template<> $className build<$className>(ExecState& state, JSValue value)\n";
</del><ins>+ $result .= "template<> $className convert<$className>(ExecState& state, JSValue value)\n";
</ins><span class="cx"> $result .= "{\n";
</span><span class="cx"> $result .= " auto result = parse<$className>(state, value);\n";
</span><span class="cx"> $result .= " if (UNLIKELY(!result)) {\n";
</span><span class="lines">@@ -959,17 +959,30 @@
</span><span class="cx"> my $className = GetDictionaryClassName($interface, $name);
</span><span class="cx">
</span><span class="cx"> # FIXME: A little ugly to have this be a side effect instead of a return value.
</span><del>- AddToImplIncludes("JSDOMBuild.h");
</del><ins>+ AddToImplIncludes("JSDOMConvert.h");
</ins><span class="cx">
</span><del>- $result .= "template<> $className build<$className>(ExecState& state, JSValue value)\n";
</del><ins>+ $result .= "template<> $className convert<$className>(ExecState& state, JSValue value)\n";
</ins><span class="cx"> $result .= "{\n";
</span><del>- $result .= " return { \n";
-
</del><ins>+ my $needExceptionCheck = 0;
</ins><span class="cx"> foreach my $member (@{$dictionary->members}) {
</span><del>- $result .= " build<" . GetNativeTypeFromSignature($interface, $member) . ">(state, value, \"" . $member->name . "\"),\n";
</del><ins>+ if ($needExceptionCheck) {
+ $result .= " if (UNLIKELY(state.hadException()))\n";
+ $result .= " return { };\n";
+ }
+ # FIXME: Eventually we will want this to call JSValueToNative.
+ my $function = $member->isOptional ? "convertOptional" : "convert";
+ my $defaultValueWithLeadingComma = $member->isOptional ? ", " . $member->default : "";
+ $result .= " auto " . $member->name . " = " . $function . "<" . GetNativeTypeFromSignature($interface, $member) . ">"
+ . "(state, propertyValue(state, value, \"" . $member->name . "\")" . $defaultValueWithLeadingComma . ");\n";
+ $needExceptionCheck = 1;
</ins><span class="cx"> }
</span><del>-
- $result .= " };\n";
</del><ins>+ $result .= " return { ";
+ my $comma = "";
+ foreach my $member (@{$dictionary->members}) {
+ $result .= $comma . "WTFMove(" . $member->name . ")";
+ $comma = ", ";
+ }
+ $result .= " };\n";
</ins><span class="cx"> $result .= "}\n\n";
</span><span class="cx">
</span><span class="cx"> $result .= "#endif\n\n" if $conditionalString;
</span><span class="lines">@@ -3586,11 +3599,10 @@
</span><span class="cx"> my $argsIndex = 0;
</span><span class="cx"> foreach my $parameter (@{$function->parameters}) {
</span><span class="cx"> my $argType = $parameter->type;
</span><del>- my $optional = $parameter->isOptional;
</del><span class="cx">
</span><del>- die "Optional parameters of non-nullable wrapper types are not supported" if $optional && !$parameter->isNullable && $codeGenerator->IsWrapperType($argType);
</del><ins>+ die "Optional parameters of non-nullable wrapper types are not supported" if $parameter->isOptional && !$parameter->isNullable && $codeGenerator->IsWrapperType($argType);
</ins><span class="cx">
</span><del>- if ($optional && !defined($parameter->default)) {
</del><ins>+ if ($parameter->isOptional && !defined($parameter->default)) {
</ins><span class="cx"> # As per Web IDL, optional dictionary parameters are always considered to have a default value of an empty dictionary, unless otherwise specified.
</span><span class="cx"> $parameter->default("[]") if $argType eq "Dictionary";
</span><span class="cx">
</span><span class="lines">@@ -3623,7 +3635,7 @@
</span><span class="cx"> } elsif ($codeGenerator->IsCallbackInterface($argType)) {
</span><span class="cx"> my $callbackClassName = GetCallbackClassName($argType);
</span><span class="cx"> $implIncludes{"$callbackClassName.h"} = 1;
</span><del>- if ($optional) {
</del><ins>+ if ($parameter->isOptional) {
</ins><span class="cx"> push(@$outputArray, " RefPtr<$argType> $name;\n");
</span><span class="cx"> push(@$outputArray, " if (!state->argument($argsIndex).isUndefinedOrNull()) {\n");
</span><span class="cx"> if ($codeGenerator->IsFunctionOnlyCallbackInterface($argType)) {
</span><span class="lines">@@ -3740,7 +3752,7 @@
</span><span class="cx"> my $inner;
</span><span class="cx"> my $nativeType = GetNativeTypeFromSignature($interface, $parameter);
</span><span class="cx">
</span><del>- if ($optional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($parameter->type, $parameter->default)) {
</del><ins>+ if ($parameter->isOptional && defined($parameter->default) && !WillConvertUndefinedToDefaultParameterValue($parameter->type, $parameter->default)) {
</ins><span class="cx"> my $defaultValue = $parameter->default;
</span><span class="cx">
</span><span class="cx"> # String-related optimizations.
</span><span class="lines">@@ -3762,7 +3774,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)) {
</del><ins>+ } elsif ($parameter->isOptional && !defined($parameter->default)) {
</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"> $outer = "state->argument($argsIndex).isUndefined() ? Optional<$nativeType>() : ";
</span><span class="lines">@@ -4255,6 +4267,7 @@
</span><span class="cx"> return $nativeType{$type} if exists $nativeType{$type};
</span><span class="cx">
</span><span class="cx"> return GetEnumerationClassName($interface, $type) if $codeGenerator->IsEnumType($type);
</span><ins>+ return GetDictionaryClassName($interface, $type) if $codeGenerator->IsDictionaryType($type);
</ins><span class="cx">
</span><span class="cx"> my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($type);
</span><span class="cx"> return "${tearOffType}*" if $tearOffType;
</span><span class="lines">@@ -4404,11 +4417,11 @@
</span><span class="cx"> return ("$value.toBoolean(state)", 1) if $type eq "boolean";
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->IsFloatingPointType($type)) {
</span><del>- AddToImplIncludes("JSDOMBuild.h");
- return ("build<double>(*state, $value, ShouldAllowNonFinite::No)", 1) if $type eq "double";
- return ("build<double>(*state, $value, ShouldAllowNonFinite::Yes)", 1) if $type eq "unrestricted double";
- return ("build<float>(*state, $value, ShouldAllowNonFinite::No)", 1) if $type eq "float";
- return ("build<float>(*state, $value, ShouldAllowNonFinite::Yes)", 1) if $type eq "unrestricted float";
</del><ins>+ AddToImplIncludes("JSDOMConvert.h");
+ return ("convert<double>(*state, $value, ShouldAllowNonFinite::No)", 1) if $type eq "double";
+ return ("convert<double>(*state, $value, ShouldAllowNonFinite::Yes)", 1) if $type eq "unrestricted double";
+ return ("convert<float>(*state, $value, ShouldAllowNonFinite::No)", 1) if $type eq "float";
+ return ("convert<float>(*state, $value, ShouldAllowNonFinite::Yes)", 1) if $type eq "unrestricted float";
</ins><span class="cx"> die "Unhandled floating point type: " . $type;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4416,7 +4429,7 @@
</span><span class="cx">
</span><span class="cx"> return ("to$type($value)", 1) if $codeGenerator->IsTypedArrayType($type);
</span><span class="cx"> return ("parse<" . GetEnumerationClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsEnumType($type);
</span><del>- return ("build<" . GetDictionaryClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsDictionaryType($type);
</del><ins>+ return ("convert<" . GetDictionaryClassName($interface, $type) . ">(*state, $value)", 1) if $codeGenerator->IsDictionaryType($type);
</ins><span class="cx">
</span><span class="cx"> AddToImplIncludes("JS$type.h", $conditional);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><del>-#include "JSDOMBuild.h"
</del><span class="cx"> #include "JSDOMConstructor.h"
</span><ins>+#include "JSDOMConvert.h"
</ins><span class="cx"> #include "JSDOMIterator.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "JSDOMStringList.h"
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::EnumType build<TestObj::EnumType>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::EnumType convert<TestObj::EnumType>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::EnumType>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::Optional build<TestObj::Optional>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::Optional convert<TestObj::Optional>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::Optional>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::EnumA build<TestObj::EnumA>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::EnumA convert<TestObj::EnumA>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::EnumA>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::EnumB build<TestObj::EnumB>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::EnumB convert<TestObj::EnumB>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::EnumB>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::EnumC build<TestObj::EnumC>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::EnumC convert<TestObj::EnumC>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::EnumC>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::Kind build<TestObj::Kind>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::Kind convert<TestObj::Kind>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::Kind>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::Size build<TestObj::Size>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::Size convert<TestObj::Size>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::Size>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::Confidence build<TestObj::Confidence>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::Confidence convert<TestObj::Confidence>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::Confidence>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::ShadowRootMode build<TestObj::ShadowRootMode>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::ShadowRootMode convert<TestObj::ShadowRootMode>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> auto result = parse<TestObj::ShadowRootMode>(state, value);
</span><span class="cx"> if (UNLIKELY(!result)) {
</span><span class="lines">@@ -483,13 +483,33 @@
</span><span class="cx"> return "\"open\", \"closed\"";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> TestObj::ShadowRootInit build<TestObj::ShadowRootInit>(ExecState& state, JSValue value)
</del><ins>+template<> TestObj::ShadowRootInit convert<TestObj::ShadowRootInit>(ExecState& state, JSValue value)
</ins><span class="cx"> {
</span><del>- return {
- build<TestObj::ShadowRootMode>(state, value, "mode"),
- };
</del><ins>+ auto mode = convert<TestObj::ShadowRootMode>(state, propertyValue(state, value, "mode"));
+ return { WTFMove(mode) };
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> TestObj::FontFaceDescriptors convert<TestObj::FontFaceDescriptors>(ExecState& state, JSValue value)
+{
+ auto style = convertOptional<String>(state, propertyValue(state, value, "style"), "normal");
+ if (state.hadException())
+ return { };
+ auto weight = convertOptional<String>(state, propertyValue(state, value, "weight"), "normal");
+ if (state.hadException())
+ return { };
+ auto stretch = convertOptional<String>(state, propertyValue(state, value, "stretch"), "normal");
+ if (state.hadException())
+ return { };
+ auto unicodeRange = convertOptional<String>(state, propertyValue(state, value, "unicodeRange"), "U+0-10FFFF");
+ if (state.hadException())
+ return { };
+ auto variant = convertOptional<String>(state, propertyValue(state, value, "variant"), "normal");
+ if (state.hadException())
+ return { };
+ auto featureSettings = convertOptional<String>(state, propertyValue(state, value, "featureSettings"), "normal");
+ return { WTFMove(style), WTFMove(weight), WTFMove(stretch), WTFMove(unicodeRange), WTFMove(variant), WTFMove(featureSettings) };
+}
+
</ins><span class="cx"> // Functions
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEST_FEATURE)
</span><span class="lines">@@ -3630,7 +3650,7 @@
</span><span class="cx"> return throwSetterTypeError(*state, "TestObj", "strictFloat");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto nativeValue = build<float>(*state, value, ShouldAllowNonFinite::Yes);
</del><ins>+ auto nativeValue = convert<float>(*state, value, ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return false;
</span><span class="cx"> impl.setStrictFloat(WTFMove(nativeValue));
</span><span class="lines">@@ -4688,7 +4708,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalDoubleIsNaN");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto number = build<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</del><ins>+ auto number = convert<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalDoubleIsNaN(WTFMove(number));
</span><span class="lines">@@ -4703,7 +4723,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestObj", "methodWithOptionalFloatIsNaN");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- auto number = build<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</del><ins>+ auto number = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalFloatIsNaN(WTFMove(number));
</span><span class="lines">@@ -5692,7 +5712,7 @@
</span><span class="cx"> auto str = state->argument(0).toWTFString(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto a = build<float>(*state, state->argument(1), ShouldAllowNonFinite::Yes);
</del><ins>+ auto a = convert<float>(*state, state->argument(1), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto b = toInt32(state, state->argument(2), NormalConversion);
</span><span class="lines">@@ -5784,7 +5804,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>- auto head = build<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</del><ins>+ auto head = convert<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<double> tail = toNativeArguments<double>(state, 1);
</span><span class="lines">@@ -5827,7 +5847,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- auto a = build<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</del><ins>+ auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto b = toInt32(state, state->argument(1), NormalConversion);
</span><span class="lines">@@ -5871,7 +5891,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>- auto a = build<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</del><ins>+ auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.testPromiseFunctionWithFloatArgument(WTFMove(a), DeferredWrapper(state, castedThis->globalObject(), promiseDeferred));
</span><span class="lines">@@ -5935,7 +5955,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>- auto a = build<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</del><ins>+ auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.testPromiseOverloadedFunction(WTFMove(a), DeferredWrapper(state, castedThis->globalObject(), promiseDeferred));
</span><span class="lines">@@ -6029,7 +6049,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>- auto init = build<TestObj::ShadowRootInit>(*state, state->argument(0));
</del><ins>+ auto init = convert<TestObj::ShadowRootInit>(*state, state->argument(0));
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.attachShadowRoot(WTFMove(init));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include "DOMStringList.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><del>-#include "JSDOMBuild.h"
</del><span class="cx"> #include "JSDOMConstructor.h"
</span><ins>+#include "JSDOMConvert.h"
</ins><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSSVGPoint.h"
</span><span class="cx"> #include "JSSerializedScriptValue.h"
</span><span class="lines">@@ -481,19 +481,19 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, createNotEnoughArgumentsError(state));
</span><del>- auto width = build<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</del><ins>+ auto width = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto height = build<float>(*state, state->argument(1), ShouldAllowNonFinite::Yes);
</del><ins>+ auto height = convert<float>(*state, state->argument(1), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto blur = build<float>(*state, state->argument(2), ShouldAllowNonFinite::Yes);
</del><ins>+ auto blur = convert<float>(*state, state->argument(2), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto color = state->argument(3).isUndefined() ? String() : state->uncheckedArgument(3).toWTFString(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- auto alpha = state->argument(4).isUndefined() ? Optional<float>() : build<float>(*state, state->uncheckedArgument(4), ShouldAllowNonFinite::Yes);
</del><ins>+ auto alpha = state->argument(4).isUndefined() ? Optional<float>() : convert<float>(*state, state->uncheckedArgument(4), ShouldAllowNonFinite::Yes);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.setShadow(WTFMove(width), WTFMove(height), WTFMove(blur), WTFMove(color), WTFMove(alpha));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -381,3 +381,12 @@
</span><span class="cx"> dictionary ShadowRootInit {
</span><span class="cx"> required ShadowRootMode mode;
</span><span class="cx"> };
</span><ins>+
+dictionary FontFaceDescriptors {
+ DOMString style = "normal";
+ DOMString weight = "normal";
+ DOMString stretch = "normal";
+ DOMString unicodeRange = "U+0-10FFFF";
+ DOMString variant = "normal";
+ DOMString featureSettings = "normal";
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -209,8 +209,8 @@
</span><span class="cx"> m_ranges.clear();
</span><span class="cx"> auto& list = downcast<CSSValueList>(unicodeRange);
</span><span class="cx"> for (auto& rangeValue : list) {
</span><del>- CSSUnicodeRangeValue& range = downcast<CSSUnicodeRangeValue>(rangeValue.get());
- m_ranges.append(UnicodeRange(range.from(), range.to()));
</del><ins>+ auto& range = downcast<CSSUnicodeRangeValue>(rangeValue.get());
+ m_ranges.append({ range.from(), range.to() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> iterateClients(m_clients, [&](Client& client) {
</span><span class="lines">@@ -223,6 +223,7 @@
</span><span class="cx"> bool CSSFontFace::setVariantLigatures(CSSValue& variantLigatures)
</span><span class="cx"> {
</span><span class="cx"> auto ligatures = extractFontVariantLigatures(variantLigatures);
</span><ins>+
</ins><span class="cx"> m_variantSettings.commonLigatures = ligatures.commonLigatures;
</span><span class="cx"> m_variantSettings.discretionaryLigatures = ligatures.discretionaryLigatures;
</span><span class="cx"> m_variantSettings.historicalLigatures = ligatures.historicalLigatures;
</span><span class="lines">@@ -239,6 +240,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(variantPosition))
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> m_variantSettings.position = downcast<CSSPrimitiveValue>(variantPosition);
</span><span class="cx">
</span><span class="cx"> iterateClients(m_clients, [&](Client& client) {
</span><span class="lines">@@ -252,6 +254,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(variantCaps))
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> m_variantSettings.caps = downcast<CSSPrimitiveValue>(variantCaps);
</span><span class="cx">
</span><span class="cx"> iterateClients(m_clients, [&](Client& client) {
</span><span class="lines">@@ -264,6 +267,7 @@
</span><span class="cx"> bool CSSFontFace::setVariantNumeric(CSSValue& variantNumeric)
</span><span class="cx"> {
</span><span class="cx"> auto numeric = extractFontVariantNumeric(variantNumeric);
</span><ins>+
</ins><span class="cx"> m_variantSettings.numericFigure = numeric.figure;
</span><span class="cx"> m_variantSettings.numericSpacing = numeric.spacing;
</span><span class="cx"> m_variantSettings.numericFraction = numeric.fraction;
</span><span class="lines">@@ -281,6 +285,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!is<CSSPrimitiveValue>(variantAlternates))
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> m_variantSettings.alternates = downcast<CSSPrimitiveValue>(variantAlternates);
</span><span class="cx">
</span><span class="cx"> iterateClients(m_clients, [&](Client& client) {
</span><span class="lines">@@ -293,6 +298,7 @@
</span><span class="cx"> bool CSSFontFace::setVariantEastAsian(CSSValue& variantEastAsian)
</span><span class="cx"> {
</span><span class="cx"> auto eastAsian = extractFontVariantEastAsian(variantEastAsian);
</span><ins>+
</ins><span class="cx"> m_variantSettings.eastAsianVariant = eastAsian.variant;
</span><span class="cx"> m_variantSettings.eastAsianWidth = eastAsian.width;
</span><span class="cx"> m_variantSettings.eastAsianRuby = eastAsian.ruby;
</span><span class="lines">@@ -304,23 +310,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSFontFace::setFeatureSettings(CSSValue& featureSettings)
</del><ins>+void CSSFontFace::setFeatureSettings(CSSValue& featureSettings)
</ins><span class="cx"> {
</span><del>- if (!is<CSSValueList>(featureSettings))
- return false;
</del><ins>+ // Can only call this with a primitive value of normal, or a value list containing font feature values.
+ ASSERT(is<CSSPrimitiveValue>(featureSettings) || is<CSSValueList>(featureSettings));
</ins><span class="cx">
</span><del>- m_featureSettings = FontFeatureSettings();
- auto& list = downcast<CSSValueList>(featureSettings);
- for (auto& rangeValue : list) {
- CSSFontFeatureValue& feature = downcast<CSSFontFeatureValue>(rangeValue.get());
- m_featureSettings.insert(FontFeature(feature.tag(), feature.value()));
</del><ins>+ FontFeatureSettings settings;
+
+ if (is<CSSValueList>(featureSettings)) {
+ auto& list = downcast<CSSValueList>(featureSettings);
+ for (auto& rangeValue : list) {
+ auto& feature = downcast<CSSFontFeatureValue>(rangeValue.get());
+ settings.insert({ feature.tag(), feature.value() });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_featureSettings == settings)
+ return;
+
+ m_featureSettings = WTFMove(settings);
+
</ins><span class="cx"> iterateClients(m_clients, [&](Client& client) {
</span><span class="cx"> client.fontPropertyChanged(*this);
</span><span class="cx"> });
</span><del>-
- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSFontFace::allSourcesFailed() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CSSFontFace_h
-#define CSSFontFace_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "FontFeatureSettings.h"
</span><span class="lines">@@ -61,6 +60,8 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~CSSFontFace();
</span><span class="cx">
</span><ins>+ // FIXME: These functions don't need to have boolean return values.
+ // Callers only call this with known-valid CSS values.
</ins><span class="cx"> bool setFamilies(CSSValue&);
</span><span class="cx"> bool setStyle(CSSValue&);
</span><span class="cx"> bool setWeight(CSSValue&);
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx"> bool setVariantNumeric(CSSValue&);
</span><span class="cx"> bool setVariantAlternates(CSSValue&);
</span><span class="cx"> bool setVariantEastAsian(CSSValue&);
</span><del>- bool setFeatureSettings(CSSValue&);
</del><ins>+ void setFeatureSettings(CSSValue&);
</ins><span class="cx">
</span><span class="cx"> enum class Status;
</span><span class="cx"> struct UnicodeRange;
</span><span class="lines">@@ -109,8 +110,8 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Client() { }
</span><span class="cx"> virtual void fontLoaded(CSSFontFace&) { }
</span><del>- virtual void fontStateChanged(CSSFontFace&, Status oldState, Status newState) { UNUSED_PARAM(oldState); UNUSED_PARAM(newState); }
- virtual void fontPropertyChanged(CSSFontFace&, CSSValueList* oldFamilies = nullptr) { UNUSED_PARAM(oldFamilies); }
</del><ins>+ virtual void fontStateChanged(CSSFontFace&, Status /*oldState*/, Status /*newState*/) { }
+ virtual void fontPropertyChanged(CSSFontFace&, CSSValueList* /*oldFamilies*/ = nullptr) { }
</ins><span class="cx"> virtual void ref() = 0;
</span><span class="cx"> virtual void deref() = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -124,27 +125,11 @@
</span><span class="cx"> // || // \\ ||
</span><span class="cx"> // \/ \/ \/ \/
</span><span class="cx"> // Success Failure
</span><del>- enum class Status {
- Pending,
- Loading,
- TimedOut,
- Success,
- Failure
- };
</del><ins>+ enum class Status { Pending, Loading, TimedOut, Success, Failure };
</ins><span class="cx">
</span><span class="cx"> struct UnicodeRange {
</span><del>- UnicodeRange(UChar32 from, UChar32 to)
- : m_from(from)
- , m_to(to)
- {
- }
-
- UChar32 from() const { return m_from; }
- UChar32 to() const { return m_to; }
-
- private:
- UChar32 m_from;
- UChar32 m_to;
</del><ins>+ UChar32 from;
+ UChar32 to;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // We don't guarantee that the FontFace wrapper will be the same every time you ask for it.
</span><span class="lines">@@ -177,5 +162,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -159,8 +159,8 @@
</span><span class="cx"> return;
</span><span class="cx"> if (variantEastAsian && !fontFace->setVariantEastAsian(*variantEastAsian))
</span><span class="cx"> return;
</span><del>- if (featureSettings && !fontFace->setFeatureSettings(*featureSettings))
- return;
</del><ins>+ if (featureSettings)
+ fontFace->setFeatureSettings(*featureSettings);
</ins><span class="cx">
</span><span class="cx"> CSSFontFace::appendSources(fontFace, srcList, m_document, isInitiatingElementInUserAgentShadowTree);
</span><span class="cx"> if (fontFace->allSourcesFailed())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSegmentedFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -62,18 +62,17 @@
</span><span class="cx"> static void appendFontWithInvalidUnicodeRangeIfLoading(FontRanges& ranges, Ref<Font>&& font, const Vector<CSSFontFace::UnicodeRange>& unicodeRanges)
</span><span class="cx"> {
</span><span class="cx"> if (font->isLoading()) {
</span><del>- ranges.appendRange(FontRanges::Range(0, 0, WTFMove(font)));
</del><ins>+ ranges.appendRange({ 0, 0, WTFMove(font) });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned numRanges = unicodeRanges.size();
- if (!numRanges) {
- ranges.appendRange(FontRanges::Range(0, 0x7FFFFFFF, WTFMove(font)));
</del><ins>+ if (unicodeRanges.isEmpty()) {
+ ranges.appendRange({ 0, 0x7FFFFFFF, WTFMove(font) });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (unsigned j = 0; j < numRanges; ++j)
- ranges.appendRange(FontRanges::Range(unicodeRanges[j].from(), unicodeRanges[j].to(), font.copyRef()));
</del><ins>+ for (auto& range : unicodeRanges)
+ ranges.appendRange({ range.from, range.to, font.copyRef() });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontRanges CSSSegmentedFontFace::fontRanges(const FontDescription& fontDescription)
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -26,81 +26,56 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FontFace.h"
</span><span class="cx">
</span><del>-#include "CSSFontFace.h"
</del><span class="cx"> #include "CSSFontFeatureValue.h"
</span><del>-#include "CSSFontSelector.h"
</del><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><del>-#include "CSSValue.h"
</del><span class="cx"> #include "CSSValuePool.h"
</span><del>-#include "Dictionary.h"
</del><span class="cx"> #include "Document.h"
</span><del>-#include "ExceptionCode.h"
</del><span class="cx"> #include "FontVariantBuilder.h"
</span><del>-#include "JSDOMCoreException.h"
</del><span class="cx"> #include "JSFontFace.h"
</span><del>-#include "ScriptExecutionContext.h"
</del><span class="cx"> #include "StyleProperties.h"
</span><del>-#include <wtf/text/StringBuilder.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static inline Optional<String> valueFromDictionary(const Dictionary& dictionary, const char* key)
</del><ins>+RefPtr<FontFace> FontFace::create(JSC::ExecState& state, Document& document, const String& family, JSC::JSValue source, const Optional<Descriptors>& descriptors, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- String result;
- dictionary.get(key, result);
- return result.isNull() ? Nullopt : Optional<String>(result);
-}
</del><ins>+ auto result = adoptRef(*new FontFace(document.fontSelector()));
</ins><span class="cx">
</span><del>-RefPtr<FontFace> FontFace::create(JSC::ExecState& execState, ScriptExecutionContext& context, const String& family, JSC::JSValue source, const Dictionary& descriptors, ExceptionCode& ec)
-{
- if (!context.isDocument()) {
- ec = TypeError;
- return nullptr;
- }
-
- Ref<FontFace> result = adoptRef(*new FontFace(downcast<Document>(context).fontSelector()));
-
</del><span class="cx"> ec = 0;
</span><span class="cx"> result->setFamily(family, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (source.isString()) {
</span><del>- String sourceString = source.toString(&execState)->value(&execState);
- auto value = FontFace::parseString(sourceString, CSSPropertySrc);
</del><ins>+ auto value = FontFace::parseString(source.getString(&state), CSSPropertySrc);
</ins><span class="cx"> if (!is<CSSValueList>(value.get())) {
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- CSSFontFace::appendSources(result->backing(), downcast<CSSValueList>(*value), &downcast<Document>(context), false);
</del><ins>+ CSSFontFace::appendSources(result->backing(), downcast<CSSValueList>(*value), &document, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto style = valueFromDictionary(descriptors, "style"))
- result->setStyle(style.value(), ec);
- if (ec)
- return nullptr;
- if (auto style = valueFromDictionary(descriptors, "weight"))
- result->setWeight(style.value(), ec);
- if (ec)
- return nullptr;
- if (auto style = valueFromDictionary(descriptors, "stretch"))
- result->setStretch(style.value(), ec);
- if (ec)
- return nullptr;
- if (auto style = valueFromDictionary(descriptors, "unicodeRange"))
- result->setUnicodeRange(style.value(), ec);
- if (ec)
- return nullptr;
- if (auto style = valueFromDictionary(descriptors, "variant"))
- result->setVariant(style.value(), ec);
- if (ec)
- return nullptr;
- if (auto style = valueFromDictionary(descriptors, "featureSettings"))
- result->setFeatureSettings(style.value(), ec);
- if (ec)
- return nullptr;
</del><ins>+ if (descriptors) {
+ result->setStyle(descriptors->style, ec);
+ if (ec)
+ return nullptr;
+ result->setWeight(descriptors->weight, ec);
+ if (ec)
+ return nullptr;
+ result->setStretch(descriptors->stretch, ec);
+ if (ec)
+ return nullptr;
+ result->setUnicodeRange(descriptors->unicodeRange, ec);
+ if (ec)
+ return nullptr;
+ result->setVariant(descriptors->variant, ec);
+ if (ec)
+ return nullptr;
+ result->setFeatureSettings(descriptors->featureSettings, ec);
+ if (ec)
+ return nullptr;
+ }
</ins><span class="cx">
</span><del>- return result.ptr();
</del><ins>+ return WTFMove(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<FontFace> FontFace::create(CSSFontFace& face)
</span><span class="lines">@@ -109,10 +84,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontFace::FontFace(CSSFontSelector& fontSelector)
</span><del>- : m_weakPtrFactory(this)
- , m_backing(CSSFontFace::create(&fontSelector, nullptr, this))
</del><ins>+ : FontFace(CSSFontFace::create(&fontSelector, nullptr, this))
</ins><span class="cx"> {
</span><del>- m_backing->addClient(*this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontFace::FontFace(CSSFontFace& face)
</span><span class="lines">@@ -134,9 +107,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> FontFace::parseString(const String& string, CSSPropertyID propertyID)
</span><span class="cx"> {
</span><del>- Ref<MutableStyleProperties> style = MutableStyleProperties::create();
- auto result = CSSParser::parseValue(style.ptr(), propertyID, string, true, CSSStrictMode, nullptr);
- if (result == CSSParser::ParseResult::Error)
</del><ins>+ auto style = MutableStyleProperties::create();
+ if (CSSParser::parseValue(style.ptr(), propertyID, string, true, CSSStrictMode, nullptr) == CSSParser::ParseResult::Error)
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return style->getPropertyCSSValue(propertyID);
</span><span class="cx"> }
</span><span class="lines">@@ -184,56 +156,64 @@
</span><span class="cx">
</span><span class="cx"> void FontFace::setVariant(const String& variant, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- Ref<MutableStyleProperties> style = MutableStyleProperties::create();
</del><ins>+ auto style = MutableStyleProperties::create();
</ins><span class="cx"> auto result = CSSParser::parseValue(style.ptr(), CSSPropertyFontVariant, variant, true, CSSStrictMode, nullptr);
</span><del>- if (result != CSSParser::ParseResult::Error) {
- FontVariantSettings backup = m_backing->variantSettings();
- auto normal = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- bool success = true;
- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantLigatures))
- success &= m_backing->setVariantLigatures(*value);
- else
- m_backing->setVariantLigatures(normal);
</del><ins>+ if (result == CSSParser::ParseResult::Error) {
+ ec = SYNTAX_ERR;
+ return;
+ }
</ins><span class="cx">
</span><del>- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantPosition))
- success &= m_backing->setVariantPosition(*value);
- else
- m_backing->setVariantPosition(normal);
</del><ins>+ // FIXME: Would be much better to stage the new settings and set them all at once
+ // instead of this dance where we make a backup and revert to it if something fails.
+ FontVariantSettings backup = m_backing->variantSettings();
</ins><span class="cx">
</span><del>- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantCaps))
- success &= m_backing->setVariantCaps(*value);
- else
- m_backing->setVariantCaps(normal);
</del><ins>+ auto normal = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
+ bool success = true;
</ins><span class="cx">
</span><del>- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantNumeric))
- success &= m_backing->setVariantNumeric(*value);
- else
- m_backing->setVariantNumeric(normal);
</del><ins>+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantLigatures))
+ success &= m_backing->setVariantLigatures(*value);
+ else
+ m_backing->setVariantLigatures(normal);
</ins><span class="cx">
</span><del>- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantAlternates))
- success &= m_backing->setVariantAlternates(*value);
- else
- m_backing->setVariantAlternates(normal);
</del><ins>+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantPosition))
+ success &= m_backing->setVariantPosition(*value);
+ else
+ m_backing->setVariantPosition(normal);
</ins><span class="cx">
</span><del>- if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantEastAsian))
- success &= m_backing->setVariantEastAsian(*value);
- else
- m_backing->setVariantEastAsian(normal);
</del><ins>+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantCaps))
+ success &= m_backing->setVariantCaps(*value);
+ else
+ m_backing->setVariantCaps(normal);
</ins><span class="cx">
</span><del>- if (success)
- return;
</del><ins>+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantNumeric))
+ success &= m_backing->setVariantNumeric(*value);
+ else
+ m_backing->setVariantNumeric(normal);
+
+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantAlternates))
+ success &= m_backing->setVariantAlternates(*value);
+ else
+ m_backing->setVariantAlternates(normal);
+
+ if (auto value = style->getPropertyCSSValue(CSSPropertyFontVariantEastAsian))
+ success &= m_backing->setVariantEastAsian(*value);
+ else
+ m_backing->setVariantEastAsian(normal);
+
+ if (!success) {
</ins><span class="cx"> m_backing->setVariantSettings(backup);
</span><ins>+ ec = SYNTAX_ERR;
</ins><span class="cx"> }
</span><del>- ec = SYNTAX_ERR;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontFace::setFeatureSettings(const String& featureSettings, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- bool success = false;
- if (auto value = parseString(featureSettings, CSSPropertyFontFeatureSettings))
- success = m_backing->setFeatureSettings(*value);
- if (!success)
</del><ins>+ auto value = parseString(featureSettings, CSSPropertyFontFeatureSettings);
+ if (!value) {
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><ins>+ return;
+ }
+ m_backing->setFeatureSettings(*value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FontFace::family() const
</span><span class="lines">@@ -290,7 +270,7 @@
</span><span class="cx"> return "U+0-10FFFF";
</span><span class="cx"> RefPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
</span><span class="cx"> for (auto& range : m_backing->ranges())
</span><del>- values->append(CSSUnicodeRangeValue::create(range.from(), range.to()));
</del><ins>+ values->append(CSSUnicodeRangeValue::create(range.from, range.to));
</ins><span class="cx"> return values->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.h (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.h 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/FontFace.h 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -23,28 +23,26 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef FontFace_h
-#define FontFace_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CSSFontFace.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
</del><span class="cx"> #include <wtf/WeakPtr.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSFontFace;
-class CSSValue;
-class Dictionary;
-
-using ExceptionCode = int;
-
-class FontFace final : public RefCounted<FontFace>, public CSSFontFace::Client {
</del><ins>+class FontFace final : public RefCounted<FontFace>, private CSSFontFace::Client {
</ins><span class="cx"> public:
</span><del>- static RefPtr<FontFace> create(JSC::ExecState&, ScriptExecutionContext&, const String& family, JSC::JSValue source, const Dictionary& descriptors, ExceptionCode&);
</del><ins>+ struct Descriptors {
+ String style;
+ String weight;
+ String stretch;
+ String unicodeRange;
+ String variant;
+ String featureSettings;
+ };
+ static RefPtr<FontFace> create(JSC::ExecState&, Document&, const String& family, JSC::JSValue source, const Optional<Descriptors>&, ExceptionCode&);
</ins><span class="cx"> static Ref<FontFace> create(CSSFontFace&);
</span><span class="cx"> virtual ~FontFace();
</span><span class="cx">
</span><span class="lines">@@ -76,17 +74,16 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<CSSValue> parseString(const String&, CSSPropertyID);
</span><span class="cx">
</span><del>- void fontStateChanged(CSSFontFace&, CSSFontFace::Status oldState, CSSFontFace::Status newState) override;
</del><ins>+ void fontStateChanged(CSSFontFace&, CSSFontFace::Status oldState, CSSFontFace::Status newState) final;
</ins><span class="cx">
</span><span class="cx"> WeakPtr<FontFace> createWeakPtr() const;
</span><span class="cx">
</span><del>- // CSSFontFace::Client needs to be able to be held in a RefPtr.
- void ref() override { RefCounted<FontFace>::ref(); }
- void deref() override { RefCounted<FontFace>::deref(); }
</del><ins>+ void ref() final { RefCounted::ref(); }
+ void deref() final { RefCounted::deref(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- FontFace(CSSFontSelector&);
- FontFace(CSSFontFace&);
</del><ins>+ explicit FontFace(CSSFontSelector&);
+ explicit FontFace(CSSFontFace&);
</ins><span class="cx">
</span><span class="cx"> WeakPtrFactory<FontFace> m_weakPtrFactory;
</span><span class="cx"> Ref<CSSFontFace> m_backing;
</span><span class="lines">@@ -94,5 +91,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.idl (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.idl 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Source/WebCore/css/FontFace.idl 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -30,10 +30,19 @@
</span><span class="cx"> "error"
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+dictionary FontFaceDescriptors {
+ DOMString style = "normal";
+ DOMString weight = "normal";
+ DOMString stretch = "normal";
+ DOMString unicodeRange = "U+0-10FFFF";
+ DOMString variant = "normal";
+ DOMString featureSettings = "normal";
+};
+
</ins><span class="cx"> [
</span><del>- ConstructorCallWith=ScriptExecutionContext&ScriptState,
</del><ins>+ ConstructorCallWith=Document&ScriptState,
</ins><span class="cx"> ConstructorRaisesException,
</span><del>- Constructor(DOMString family, any source, Dictionary descriptors)
</del><ins>+ Constructor(DOMString family, any source, optional FontFaceDescriptors descriptors)
</ins><span class="cx"> ] interface FontFace {
</span><span class="cx"> [SetterRaisesException] attribute DOMString family;
</span><span class="cx"> [SetterRaisesException] attribute DOMString style;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Tools/ChangeLog 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-07 Darin Adler <darin@apple.com>
+
+ Next step on dictionary bindings, along with other bindings refinements
+ https://bugs.webkit.org/show_bug.cgi?id=157451
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/do-webcore-rename: Use this to rename JSDOMBuild.h to JSDOMConvert.h.
+ Also skip test expectations in a directory that this was modifying unnecessarily.
+
</ins><span class="cx"> 2016-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
</span></span></pre></div>
<a id="trunkToolsScriptsdowebcorerename"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/do-webcore-rename (200546 => 200547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/do-webcore-rename 2016-05-07 20:04:27 UTC (rev 200546)
+++ trunk/Tools/Scripts/do-webcore-rename 2016-05-07 21:14:20 UTC (rev 200547)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my @directoriesToIgnoreList = (
</span><ins>+ "expected",
</ins><span class="cx"> "icu",
</span><span class="cx"> );
</span><span class="cx"> my %directoriesToIgnore = map { $_ => 1 } @directoriesToIgnoreList;
</span><span class="lines">@@ -98,7 +99,7 @@
</span><span class="cx"> my $isDOMTypeRename = 0;
</span><span class="cx"> my %renames = (
</span><span class="cx"> # Renames go here in the form of:
</span><del>- "CaseFoldingHash" => "ASCIICaseInsensitiveHash",
</del><ins>+ "JSDOMBuild" => "JSDOMConvert",
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my %renamesContemplatedForTheFuture = (
</span></span></pre>
</div>
</div>
</body>
</html>