<!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>[205411] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205411">205411</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-09-03 16:34:00 -0700 (Sat, 03 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline DOMImplementation, and move it to our new DOM exception system
https://bugs.webkit.org/show_bug.cgi?id=161295
Reviewed by Ryosuke Niwa.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Added new headers to project.
* bindings/js/JSDOMBinding.h:
(WebCore::toJS): Added an overload for ExceptionOr<>; this handles the
exception case here so it doesn't need to be handled in generated code
for the binding. Implemented here so that ExceptionOr.h does not know
about bindings. But since this is a template, it will only compile when
instantiated and there is no need to include ExceptionOr.h and indirectly
the Variant.h header in this header.
(WebCore::toJSNewlyCreated): Ditto.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallbackImplementation): Refer to JSC::Exception with explicit
namespace to avoid ambiguity with WebCore::Exception.
* dom/DOMImplementation.cpp:
(WebCore::DOMImplementation::createDocumentType): Changed to return
ExceptionOr.
(WebCore::createXMLDocument): Added. Helper used in createDocument.
(WebCore::DOMImplementation::getInterface): Deleted. This was unused.
(WebCore::DOMImplementation::createDocument): Changed to return
ExceptionOr.
(WebCore::DOMImplementation::createCSSStyleSheet): Removed the unused
ExceptionCode out argument.
(WebCore::isValidXMLMIMETypeChar): Deleted. Moved to MIMETypeRegistry.
(WebCore::DOMImplementation::isXMLMIMEType): Ditto.
(WebCore::DOMImplementation::isTextMIMEType): Ditto.
* dom/DOMImplementation.h: Changed functions as described above to
return ExceptionOr values. Also removed unused getInterface function,
and isXMLMIMEType and isTextMIMEType, which both moved to the
MIMETypeRegistry class alongside all the other similar MIME type
functions.
* dom/DOMImplementation.idl: Reorganized this to match the IDL files
in the specifications a little better. Also removed [RaisesException]
since that is only needed for the old legacy ExceptionCode& style.
* dom/Document.cpp:
(WebCore::Document::setXMLVersion): Removed call to the
DOMImplementation::hasFeature function since the values passed in
unconditionally result in the return value "true". This is left over
either from specification language, or from an ancient version of this
code that worked in a "no XML supported" mode.
(WebCore::Document::setXMLStandalone): Ditto.
* dom/Document.h: Removed the ExceptionCode& out argument from setXMLStandalone.
* dom/Document.idl: Removed [SetterRaisesException] from xmlStandalone.
* dom/Exception.h: Added.
* dom/ExceptionOr.h: Added.
* html/HTMLTemplateElement.cpp: Removed unneeded include of DOMImplementation.h.
* inspector/InspectorPageAgent.cpp:
(WebCore::createXHRTextDecoder): Use isXMLMIMEType in its new location in
MIMETypeRegistry.
* inspector/NetworkResourcesData.cpp:
(WebCore::createOtherResourceTextDecoder): Ditto.
* loader/FrameLoader.cpp: Removed unneeded include of DOMImplementation.h.
* loader/TextResourceDecoder.cpp:
(WebCore::TextResourceDecoder::determineContentType): Use isXMLMIMEType in its
new location in MIMETypeRegistry.
* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::isTextMIMEType): Added. Moved here from
DOMImplementation.
(WebCore::isValidXMLMIMETypeChar): Ditto.
(WebCore::MIMETypeRegistry::isXMLMIMEType): Ditto.
* platform/MIMETypeRegistry.h: Added isXMLMIMEType and isTextMIMEType.
Made isUnsupportedTextMIMEType private.
* svg/SVGElement.cpp:
(WebCore::SVGElement::isSupported): Deleted. This function was never called.
* svg/SVGElement.h: Updated for the above change.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseIsXML): Use isXMLMIMEType in its new
location in MIMETypeRegistry.
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::startDocument): Updated since setXMLStandalone
no longer can raise an exception.
Source/WebKit/mac:
* DOM/DOMDOMImplementation.mm:
(unwrap): Added. Use this instead of the IMPL macro.
(-[DOMImplementation dealloc]): Updated to use unwrap.
(-[DOMImplementation hasFeature:version:]): Ditto.
(-[DOMImplementation createDocumentType:publicId:systemId:]): Updated to work with
ExceptionOr.
(-[DOMImplementation createDocument:qualifiedName:doctype:]): Ditto.
(-[DOMImplementation createCSSStyleSheet:media:]): Removed exception logic since
this function can no longer raise an exception.
(-[DOMImplementation createHTMLDocument:]): Updated to use unwrap.
(-[DOMImplementation hasFeature::]): Changed to call the non-deprecated version
rather than duplicating its implementation. Also moved into the category as defined
in the header.
(-[DOMImplementation createDocumentType:::]): Ditto.
(-[DOMImplementation createDocument:::]): Ditto.
(-[DOMImplementation createCSSStyleSheet::]): Ditto.
* DOM/DOMDocument.mm: Removed unneeded include of DOMImplementation.h.
(-[DOMDocument setXmlStandalone:]): Updated since setXMLStandalone no longer can
raise an exception.
* WebView/WebFrame.mm:
(-[WebFrame _canProvideDocumentSource]): Updated to use isTextMIMEType in its new
location in MIMETypeRegistry instead of in DOMImplementation.
Source/WebKit/win:
* WebFrame.cpp:
(WebFrame::canProvideDocumentSource): Updated to use isXMLMIMEType in its new
location in MIMETypeRegistry instead of in DOMImplementation.
Source/WebKit2:
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::isDisplayingMarkupDocument): Use isXMLMIMEType in its
new location in MIMETypeRegistry rather than in DOMImplementation.
(WebKit::WebFrameProxy::isDisplayingPDFDocument): Removed unneeded redundant
check for empty string, already done by MIMETypeRegistry.</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="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationcpp">trunk/Source/WebCore/dom/DOMImplementation.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationh">trunk/Source/WebCore/dom/DOMImplementation.h</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationidl">trunk/Source/WebCore/dom/DOMImplementation.idl</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTemplateElementcpp">trunk/Source/WebCore/html/HTMLTemplateElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorNetworkResourcesDatacpp">trunk/Source/WebCore/inspector/NetworkResourcesData.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextResourceDecodercpp">trunk/Source/WebCore/loader/TextResourceDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistryh">trunk/Source/WebCore/platform/MIMETypeRegistry.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMDOMImplementationmm">trunk/Source/WebKit/mac/DOM/DOMDOMImplementation.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMDocumentmm">trunk/Source/WebKit/mac/DOM/DOMDocument.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDOMImplementationcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDocumentcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomExceptionh">trunk/Source/WebCore/dom/Exception.h</a></li>
<li><a href="#trunkSourceWebCoredomExceptionOrh">trunk/Source/WebCore/dom/ExceptionOr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/ChangeLog 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,3 +1,97 @@
</span><ins>+2016-09-03 Darin Adler <darin@apple.com>
+
+ Streamline DOMImplementation, and move it to our new DOM exception system
+ https://bugs.webkit.org/show_bug.cgi?id=161295
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCore.xcodeproj/project.pbxproj: Added new headers to project.
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::toJS): Added an overload for ExceptionOr<>; this handles the
+ exception case here so it doesn't need to be handled in generated code
+ for the binding. Implemented here so that ExceptionOr.h does not know
+ about bindings. But since this is a template, it will only compile when
+ instantiated and there is no need to include ExceptionOr.h and indirectly
+ the Variant.h header in this header.
+ (WebCore::toJSNewlyCreated): Ditto.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallbackImplementation): Refer to JSC::Exception with explicit
+ namespace to avoid ambiguity with WebCore::Exception.
+
+ * dom/DOMImplementation.cpp:
+ (WebCore::DOMImplementation::createDocumentType): Changed to return
+ ExceptionOr.
+ (WebCore::createXMLDocument): Added. Helper used in createDocument.
+ (WebCore::DOMImplementation::getInterface): Deleted. This was unused.
+ (WebCore::DOMImplementation::createDocument): Changed to return
+ ExceptionOr.
+ (WebCore::DOMImplementation::createCSSStyleSheet): Removed the unused
+ ExceptionCode out argument.
+ (WebCore::isValidXMLMIMETypeChar): Deleted. Moved to MIMETypeRegistry.
+ (WebCore::DOMImplementation::isXMLMIMEType): Ditto.
+ (WebCore::DOMImplementation::isTextMIMEType): Ditto.
+
+ * dom/DOMImplementation.h: Changed functions as described above to
+ return ExceptionOr values. Also removed unused getInterface function,
+ and isXMLMIMEType and isTextMIMEType, which both moved to the
+ MIMETypeRegistry class alongside all the other similar MIME type
+ functions.
+
+ * dom/DOMImplementation.idl: Reorganized this to match the IDL files
+ in the specifications a little better. Also removed [RaisesException]
+ since that is only needed for the old legacy ExceptionCode& style.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setXMLVersion): Removed call to the
+ DOMImplementation::hasFeature function since the values passed in
+ unconditionally result in the return value "true". This is left over
+ either from specification language, or from an ancient version of this
+ code that worked in a "no XML supported" mode.
+ (WebCore::Document::setXMLStandalone): Ditto.
+
+ * dom/Document.h: Removed the ExceptionCode& out argument from setXMLStandalone.
+ * dom/Document.idl: Removed [SetterRaisesException] from xmlStandalone.
+
+ * dom/Exception.h: Added.
+ * dom/ExceptionOr.h: Added.
+
+ * html/HTMLTemplateElement.cpp: Removed unneeded include of DOMImplementation.h.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::createXHRTextDecoder): Use isXMLMIMEType in its new location in
+ MIMETypeRegistry.
+ * inspector/NetworkResourcesData.cpp:
+ (WebCore::createOtherResourceTextDecoder): Ditto.
+
+ * loader/FrameLoader.cpp: Removed unneeded include of DOMImplementation.h.
+
+ * loader/TextResourceDecoder.cpp:
+ (WebCore::TextResourceDecoder::determineContentType): Use isXMLMIMEType in its
+ new location in MIMETypeRegistry.
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::MIMETypeRegistry::isTextMIMEType): Added. Moved here from
+ DOMImplementation.
+ (WebCore::isValidXMLMIMETypeChar): Ditto.
+ (WebCore::MIMETypeRegistry::isXMLMIMEType): Ditto.
+
+ * platform/MIMETypeRegistry.h: Added isXMLMIMEType and isTextMIMEType.
+ Made isUnsupportedTextMIMEType private.
+
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::isSupported): Deleted. This function was never called.
+ * svg/SVGElement.h: Updated for the above change.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseIsXML): Use isXMLMIMEType in its new
+ location in MIMETypeRegistry.
+
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::startDocument): Updated since setXMLStandalone
+ no longer can raise an exception.
+
</ins><span class="cx"> 2016-09-03 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unbreak customElements.whenDefined after r205383 with a crash fix
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -3275,6 +3275,8 @@
</span><span class="cx"> 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */; };
</span><span class="cx"> 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */; };
</span><ins>+ 93D196311D6CAB7600FC7E47 /* ExceptionOr.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D196301D6CAB7600FC7E47 /* ExceptionOr.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 93D196331D6CAB8200FC7E47 /* Exception.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D196321D6CAB8200FC7E47 /* Exception.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 93D4379F1D57B15300AB85EA /* JSMainThreadExecState.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 93D437A01D57B19A00AB85EA /* CustomElementReactionQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B56C9A81C89312800C456DF /* CustomElementReactionQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 93D437A11D57B3F400AB85EA /* ElementDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = ADE11F4A18D8311B0078983B /* ElementDescendantIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -10437,6 +10439,8 @@
</span><span class="cx"> 93CA4CA209DF93FA00DF8677 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
</span><span class="cx"> 93CCF0260AF6C52900018E89 /* NavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationAction.h; sourceTree = "<group>"; };
</span><span class="cx"> 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationAction.cpp; sourceTree = "<group>"; };
</span><ins>+ 93D196301D6CAB7600FC7E47 /* ExceptionOr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionOr.h; sourceTree = "<group>"; };
+ 93D196321D6CAB8200FC7E47 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
</ins><span class="cx"> 93D9D53B0DA27E180077216C /* RangeBoundaryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeBoundaryPoint.h; sourceTree = "<group>"; };
</span><span class="cx"> 93E227DB0AF589AD00D48324 /* DocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePlugInStreamLoader.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -22996,11 +23000,13 @@
</span><span class="cx"> E12EDB7A0B308A78002704B6 /* EventTarget.h */,
</span><span class="cx"> 85AFA7420AAF298400E84305 /* EventTarget.idl */,
</span><span class="cx"> CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */,
</span><ins>+ 93D196321D6CAB8200FC7E47 /* Exception.h */,
</ins><span class="cx"> BC60D8F00D2A11E000B9918F /* ExceptionBase.cpp */,
</span><span class="cx"> BC60D8F10D2A11E000B9918F /* ExceptionBase.h */,
</span><span class="cx"> 935FBCF109BA143B00E230B1 /* ExceptionCode.h */,
</span><span class="cx"> A7CACDB013CE875B00BBBE3F /* ExceptionCodePlaceholder.cpp */,
</span><span class="cx"> A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */,
</span><ins>+ 93D196301D6CAB7600FC7E47 /* ExceptionOr.h */,
</ins><span class="cx"> E47E276716036EDC00EE2AFB /* ExtensionStyleSheets.cpp */,
</span><span class="cx"> E47E276416036ED200EE2AFB /* ExtensionStyleSheets.h */,
</span><span class="cx"> B6D9D23414EABD260090D75E /* FocusEvent.cpp */,
</span><span class="lines">@@ -25598,6 +25604,7 @@
</span><span class="cx"> 078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */,
</span><span class="cx"> 078E091617D14D1C00420AA1 /* MediaStreamEvent.h in Headers */,
</span><span class="cx"> 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */,
</span><ins>+ 93D196331D6CAB8200FC7E47 /* Exception.h in Headers */,
</ins><span class="cx"> 078E091717D14D1C00420AA1 /* MediaStreamRegistry.h in Headers */,
</span><span class="cx"> 078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */,
</span><span class="cx"> 078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */,
</span><span class="lines">@@ -26668,6 +26675,7 @@
</span><span class="cx"> B2227AD70D00BF220071B782 /* SVGTransform.h in Headers */,
</span><span class="cx"> B2227ADA0D00BF220071B782 /* SVGTransformable.h in Headers */,
</span><span class="cx"> B2227ADD0D00BF220071B782 /* SVGTransformDistance.h in Headers */,
</span><ins>+ 93D196311D6CAB7600FC7E47 /* ExceptionOr.h in Headers */,
</ins><span class="cx"> B2227ADF0D00BF220071B782 /* SVGTransformList.h in Headers */,
</span><span class="cx"> 08C7136E128956A3001B107E /* SVGTransformListPropertyTearOff.h in Headers */,
</span><span class="cx"> B2227AE20D00BF220071B782 /* SVGTRefElement.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include "JSDOMGlobalObject.h"
</span><span class="cx"> #include "JSDOMWrapper.h"
</span><del>-#include "DOMWrapperWorld.h"
</del><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include "ScriptWrappableInlines.h"
</span><span class="cx"> #include "WebCoreTypedArrayController.h"
</span><span class="lines">@@ -69,8 +69,10 @@
</span><span class="cx">
</span><span class="cx"> struct ExceptionCodeWithMessage;
</span><span class="cx">
</span><del>-typedef int ExceptionCode;
</del><ins>+template<typename> class ExceptionOr;
</ins><span class="cx">
</span><ins>+using ExceptionCode = int;
+
</ins><span class="cx"> struct ExceptionDetails {
</span><span class="cx"> String message;
</span><span class="cx"> int lineNumber { 0 };
</span><span class="lines">@@ -186,6 +188,9 @@
</span><span class="cx"> WEBCORE_EXPORT void setDOMException(JSC::ExecState*, ExceptionCode);
</span><span class="cx"> void setDOMException(JSC::ExecState*, const ExceptionCodeWithMessage&);
</span><span class="cx">
</span><ins>+template<typename T> inline JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ExceptionOr<T>&&);
+template<typename T> inline JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, ExceptionOr<T>&&);
+
</ins><span class="cx"> JSC::JSValue jsString(JSC::ExecState*, const URL&); // empty if the URL is null
</span><span class="cx">
</span><span class="cx"> JSC::JSValue jsStringOrNull(JSC::ExecState*, const String&); // null if the string is null
</span><span class="lines">@@ -808,4 +813,23 @@
</span><span class="cx"> return optionalNumber ? JSC::jsNumber(optionalNumber.value()) : JSC::jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, ExceptionOr<T>&& value)
+{
+ if (UNLIKELY(value.hasException())) {
+ setDOMException(state, value.exceptionCode());
+ return JSC::jsUndefined();
+ }
+ return toJS(state, globalObject, value.takeReturnValue());
+}
+
+template<typename T> inline JSC::JSValue toJSNewlyCreated(JSC::ExecState* state, JSDOMGlobalObject* globalObject, ExceptionOr<T>&& value)
+{
+ // FIXME: It's really annoying to have two of these functions. Should find a way to combine toJS and toJSNewlyCreated.
+ if (UNLIKELY(value.hasException())) {
+ setDOMException(state, value.exceptionCode());
+ return JSC::jsUndefined();
+ }
+ return toJSNewlyCreated(state, globalObject, value.takeReturnValue());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -4341,7 +4341,7 @@
</span><span class="cx"> push(@implContent, " args.append(" . NativeToJSValue($param, 1, $interface, $paramName, "m_data") . ");\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@implContent, "\n NakedPtr<Exception> returnedException;\n");
</del><ins>+ push(@implContent, "\n NakedPtr<JSC::Exception> returnedException;\n");
</ins><span class="cx">
</span><span class="cx"> my $propertyToLookup = "Identifier::fromString(state, \"${functionName}\")";
</span><span class="cx"> my $invokeMethod = "JSCallbackData::CallbackType::FunctionOrObject";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> ExecState* state = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackWithNoParam"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), arrayParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackWithArrayParam"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> args.append(srzParam ? srzParam->deserialize(state, m_data->globalObject(), 0) : jsNull());
</span><span class="cx"> args.append(jsStringWithCache(state, strArg));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackWithSerializedScriptValueParam"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), listParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackWithStringList"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsBoolean(boolParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackWithBoolean"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> args.append(jsNumber(longParam));
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), testNodeParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(state, "callbackRequiresThisToPass"), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="cx"> reportException(state, returnedException);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> ExecState* state = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), arrayParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> args.append(srzParam ? srzParam->deserialize(state, m_data->globalObject(), 0) : jsNull());
</span><span class="cx"> args.append(jsStringWithCache(state, strArg));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), listParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsBoolean(boolParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> args.append(jsNumber(longParam));
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), testNodeParam));
</span><span class="cx">
</span><del>- NakedPtr<Exception> returnedException;
</del><ins>+ NakedPtr<JSC::Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
</span><span class="cx"> if (returnedException)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/DOMImplementation.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -25,25 +25,25 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DOMImplementation.h"
</span><span class="cx">
</span><ins>+#include "CSSStyleSheet.h"
</ins><span class="cx"> #include "ContentType.h"
</span><del>-#include "CSSStyleSheet.h"
</del><span class="cx"> #include "DocumentType.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "FTPDirectoryDocument.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><del>-#include "FTPDirectoryDocument.h"
</del><span class="cx"> #include "HTMLDocument.h"
</span><span class="cx"> #include "HTMLHeadElement.h"
</span><span class="cx"> #include "HTMLTitleElement.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "ImageDocument.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MediaDocument.h"
</span><ins>+#include "MediaList.h"
</ins><span class="cx"> #include "MediaPlayer.h"
</span><del>-#include "MediaList.h"
-#include "MIMETypeRegistry.h"
</del><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PluginData.h"
</span><span class="cx"> #include "PluginDocument.h"
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><ins>+
</ins><span class="cx"> class DOMImplementationSupportsTypeClient : public MediaPlayerSupportsTypeClient {
</span><span class="cx"> public:
</span><span class="cx"> DOMImplementationSupportsTypeClient(bool needsHacks, const String& host)
</span><span class="lines">@@ -88,6 +89,7 @@
</span><span class="cx"> bool m_needsHacks;
</span><span class="cx"> String m_host;
</span><span class="cx"> };
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static bool isSupportedSVG10Feature(const String& feature, const String& version)
</span><span class="lines">@@ -207,103 +209,58 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DocumentType> DOMImplementation::createDocumentType(const String& qualifiedName,
- const String& publicId, const String& systemId, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<DocumentType>> DOMImplementation::createDocumentType(const String& qualifiedName, const String& publicId, const String& systemId)
</ins><span class="cx"> {
</span><del>- String prefix, localName;
- if (!Document::parseQualifiedName(qualifiedName, prefix, localName, ec))
- return 0;
</del><ins>+ ExceptionCode ec = 0;
+ String prefix;
+ String localName;
+ Document::parseQualifiedName(qualifiedName, prefix, localName, ec);
+ if (ec)
+ return Exception(ec);
</ins><span class="cx">
</span><span class="cx"> return DocumentType::create(m_document, qualifiedName, publicId, systemId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DOMImplementation* DOMImplementation::getInterface(const String& /*feature*/)
</del><ins>+static inline Ref<XMLDocument> createXMLDocument(const String& namespaceURI)
</ins><span class="cx"> {
</span><del>- return 0;
</del><ins>+ if (namespaceURI == SVGNames::svgNamespaceURI)
+ return SVGDocument::create(nullptr, URL());
+ if (namespaceURI == HTMLNames::xhtmlNamespaceURI)
+ return XMLDocument::createXHTML(nullptr, URL());
+ return XMLDocument::create(nullptr, URL());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<XMLDocument> DOMImplementation::createDocument(const String& namespaceURI,
- const String& qualifiedName, DocumentType* doctype, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<XMLDocument>> DOMImplementation::createDocument(const String& namespaceURI, const String& qualifiedName, DocumentType* documentType)
</ins><span class="cx"> {
</span><del>- RefPtr<XMLDocument> doc;
- if (namespaceURI == SVGNames::svgNamespaceURI)
- doc = SVGDocument::create(0, URL());
- else if (namespaceURI == HTMLNames::xhtmlNamespaceURI)
- doc = XMLDocument::createXHTML(0, URL());
- else
- doc = XMLDocument::create(0, URL());
</del><ins>+ auto document = createXMLDocument(namespaceURI);
</ins><span class="cx">
</span><del>- doc->setSecurityOriginPolicy(m_document.securityOriginPolicy());
</del><ins>+ document->setSecurityOriginPolicy(m_document.securityOriginPolicy());
</ins><span class="cx">
</span><del>- RefPtr<Node> documentElement;
</del><ins>+ RefPtr<Element> documentElement;
</ins><span class="cx"> if (!qualifiedName.isEmpty()) {
</span><del>- documentElement = doc->createElementNS(namespaceURI, qualifiedName, ec);
</del><ins>+ ExceptionCode ec = 0;
+ documentElement = document->createElementNS(namespaceURI, qualifiedName, ec);
</ins><span class="cx"> if (ec)
</span><del>- return nullptr;
</del><ins>+ return Exception(ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (doctype)
- doc->appendChild(*doctype);
</del><ins>+ if (documentType)
+ document->appendChild(*documentType);
</ins><span class="cx"> if (documentElement)
</span><del>- doc->appendChild(*documentElement);
</del><ins>+ document->appendChild(*documentElement);
</ins><span class="cx">
</span><del>- return doc;
</del><ins>+ return WTFMove(document);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSStyleSheet> DOMImplementation::createCSSStyleSheet(const String&, const String& media, ExceptionCode&)
</del><ins>+Ref<CSSStyleSheet> DOMImplementation::createCSSStyleSheet(const String&, const String& media)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Title should be set.
</span><span class="cx"> // FIXME: Media could have wrong syntax, in which case we should generate an exception.
</span><del>- Ref<CSSStyleSheet> sheet = CSSStyleSheet::create(StyleSheetContents::create());
</del><ins>+ auto sheet = CSSStyleSheet::create(StyleSheetContents::create());
</ins><span class="cx"> sheet->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(media));
</span><span class="cx"> return sheet;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isValidXMLMIMETypeChar(UChar c)
-{
- // Valid characters per RFCs 3023 and 2045:
- // 0-9a-zA-Z_-+~!$^{}|.%'`#&*
- return isASCIIAlphanumeric(c) || c == '!' || c == '#' || c == '$' || c == '%' || c == '&' || c == '\'' || c == '*' || c == '+'
- || c == '-' || c == '.' || c == '^' || c == '_' || c == '`' || c == '{' || c == '|' || c == '}' || c == '~';
-}
-
-bool DOMImplementation::isXMLMIMEType(const String& mimeType)
-{
- // FIXME: Can we move this logic to MIMETypeRegistry and have this just be a single function call?
-
- if (equalLettersIgnoringASCIICase(mimeType, "text/xml") || equalLettersIgnoringASCIICase(mimeType, "application/xml") || equalLettersIgnoringASCIICase(mimeType, "text/xsl"))
- return true;
-
- if (!mimeType.endsWith("+xml", false))
- return false;
-
- size_t slashPosition = mimeType.find('/');
- // Take into account the '+xml' ending of mimeType.
- if (slashPosition == notFound || !slashPosition || slashPosition == mimeType.length() - 5)
- return false;
-
- // Again, mimeType ends with '+xml', no need to check the validity of that substring.
- size_t mimeLength = mimeType.length();
- for (size_t i = 0; i < mimeLength - 4; ++i) {
- if (!isValidXMLMIMETypeChar(mimeType[i]) && i != slashPosition)
- return false;
- }
-
- return true;
-}
-
-bool DOMImplementation::isTextMIMEType(const String& mimeType)
-{
- // FIXME: Can we move this logic to MIMETypeRegistry and have this just be a single function call?
-
- return MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType)
- || equalLettersIgnoringASCIICase(mimeType, "application/json") // Render JSON as text/plain.
- || (mimeType.startsWith("text/", false)
- && !equalLettersIgnoringASCIICase(mimeType, "text/html")
- && !equalLettersIgnoringASCIICase(mimeType, "text/xml")
- && !equalLettersIgnoringASCIICase(mimeType, "text/xsl"));
-}
-
</del><span class="cx"> Ref<HTMLDocument> DOMImplementation::createHTMLDocument(const String& title)
</span><span class="cx"> {
</span><span class="cx"> auto document = HTMLDocument::create(nullptr, URL());
</span><span class="lines">@@ -321,6 +278,9 @@
</span><span class="cx">
</span><span class="cx"> Ref<Document> DOMImplementation::createDocument(const String& type, Frame* frame, const URL& url)
</span><span class="cx"> {
</span><ins>+ // FIXME: Confusing to have this here with public DOM APIs for creating documents. This is different enough that it should perhaps be moved.
+ // FIXME: This function is doing case insensitive comparisons on MIME types. Should do equalLettersIgnoringASCIICase instead.
+
</ins><span class="cx"> // Plugins cannot take HTML and XHTML from us, and we don't even need to initialize the plugin database for those.
</span><span class="cx"> if (type == "text/html")
</span><span class="cx"> return HTMLDocument::create(frame, url);
</span><span class="lines">@@ -338,7 +298,7 @@
</span><span class="cx"> return ImageDocument::create(*frame, url);
</span><span class="cx">
</span><span class="cx"> PluginData* pluginData = nullptr;
</span><del>- PluginData::AllowedPluginTypes allowedPluginTypes = PluginData::OnlyApplicationPlugins;
</del><ins>+ auto allowedPluginTypes = PluginData::OnlyApplicationPlugins;
</ins><span class="cx"> if (frame && frame->page()) {
</span><span class="cx"> if (frame->loader().subframeLoader().allowPlugins())
</span><span class="cx"> allowedPluginTypes = PluginData::AllPlugins;
</span><span class="lines">@@ -369,13 +329,13 @@
</span><span class="cx"> // and also serves as an optimization to prevent loading the plug-in database in the common case.
</span><span class="cx"> if (type != "text/plain" && ((pluginData && pluginData->supportsWebVisibleMimeType(type, allowedPluginTypes)) || (frame && frame->loader().client().shouldAlwaysUsePluginDocument(type))))
</span><span class="cx"> return PluginDocument::create(frame, url);
</span><del>- if (isTextMIMEType(type))
</del><ins>+ if (MIMETypeRegistry::isTextMIMEType(type))
</ins><span class="cx"> return TextDocument::create(frame, url);
</span><span class="cx">
</span><span class="cx"> if (type == "image/svg+xml")
</span><span class="cx"> return SVGDocument::create(frame, url);
</span><span class="cx">
</span><del>- if (isXMLMIMEType(type))
</del><ins>+ if (MIMETypeRegistry::isXMLMIMEType(type))
</ins><span class="cx"> return XMLDocument::create(frame, url);
</span><span class="cx">
</span><span class="cx"> return HTMLDocument::create(frame, url);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.h (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.h 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/DOMImplementation.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2008, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "XMLDocument.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -36,25 +37,14 @@
</span><span class="cx"> void deref() { m_document.deref(); }
</span><span class="cx"> Document& document() { return m_document; }
</span><span class="cx">
</span><del>- // DOM methods & attributes for DOMImplementation
</del><ins>+ WEBCORE_EXPORT ExceptionOr<Ref<DocumentType>> createDocumentType(const String& qualifiedName, const String& publicId, const String& systemId);
+ WEBCORE_EXPORT ExceptionOr<Ref<XMLDocument>> createDocument(const String& namespaceURI, const String& qualifiedName, DocumentType*);
+ WEBCORE_EXPORT Ref<HTMLDocument> createHTMLDocument(const String& title);
</ins><span class="cx"> WEBCORE_EXPORT static bool hasFeature(const String& feature, const String& version);
</span><del>- WEBCORE_EXPORT RefPtr<DocumentType> createDocumentType(const String& qualifiedName, const String& publicId, const String& systemId, ExceptionCode&);
- WEBCORE_EXPORT RefPtr<XMLDocument> createDocument(const String& namespaceURI, const String& qualifiedName, DocumentType*, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT static Ref<CSSStyleSheet> createCSSStyleSheet(const String& title, const String& media);
</ins><span class="cx">
</span><del>- DOMImplementation* getInterface(const String& feature);
-
- // From the DOMImplementationCSS interface
- WEBCORE_EXPORT static Ref<CSSStyleSheet> createCSSStyleSheet(const String& title, const String& media, ExceptionCode&);
-
- // From the HTMLDOMImplementation interface
- WEBCORE_EXPORT Ref<HTMLDocument> createHTMLDocument(const String& title);
-
- // Other methods (not part of DOM)
</del><span class="cx"> static Ref<Document> createDocument(const String& MIMEType, Frame*, const URL&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static bool isXMLMIMEType(const String& MIMEType);
- WEBCORE_EXPORT static bool isTextMIMEType(const String& MIMEType);
-
</del><span class="cx"> private:
</span><span class="cx"> Document& m_document;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.idl (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.idl 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/DOMImplementation.idl 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -23,15 +23,14 @@
</span><span class="cx"> GenerateIsReachable=ImplDocument,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface DOMImplementation {
</span><ins>+ [NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
+ [NewObject] XMLDocument createDocument(DOMString? namespaceURI, [TreatNullAs=EmptyString] DOMString qualifiedName, optional DocumentType? doctype = null);
+ [NewObject] HTMLDocument createHTMLDocument(optional DOMString title);
+
+ // FIXME: Latest DOM specification says this should ignore all arguments and always return true.
</ins><span class="cx"> // FIXME: Using "undefined" as default parameter value is wrong.
</span><span class="cx"> boolean hasFeature(optional DOMString feature = "undefined", [TreatNullAs=EmptyString] optional DOMString version = "undefined");
</span><span class="cx">
</span><del>- [RaisesException, NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
-
- [NewObject, RaisesException] XMLDocument createDocument(DOMString? namespaceURI, [TreatNullAs=EmptyString] DOMString qualifiedName, optional DocumentType? doctype = null);
-
</del><span class="cx"> // FIXME: Using "undefined" as default parameter value is wrong.
</span><del>- [RaisesException] CSSStyleSheet createCSSStyleSheet(optional DOMString title = "undefined", optional DOMString media = "undefined");
-
- [NewObject] HTMLDocument createHTMLDocument(optional DOMString title);
</del><ins>+ CSSStyleSheet createCSSStyleSheet(optional DOMString title = "undefined", optional DOMString media = "undefined");
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1373,11 +1373,6 @@
</span><span class="cx">
</span><span class="cx"> void Document::setXMLVersion(const String& version, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (!implementation().hasFeature("XML", String())) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
</del><span class="cx"> if (!XMLDocumentParser::supportsXMLVersion(version)) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return;
</span><span class="lines">@@ -1386,13 +1381,8 @@
</span><span class="cx"> m_xmlVersion = version;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::setXMLStandalone(bool standalone, ExceptionCode& ec)
</del><ins>+void Document::setXMLStandalone(bool standalone)
</ins><span class="cx"> {
</span><del>- if (!implementation().hasFeature("XML", String())) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
</del><span class="cx"> m_xmlStandalone = standalone ? Standalone : NotStandalone;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/Document.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx">
</span><span class="cx"> void setXMLEncoding(const String& encoding) { m_xmlEncoding = encoding; } // read-only property, only to be set from XMLDocumentParser
</span><span class="cx"> WEBCORE_EXPORT void setXMLVersion(const String&, ExceptionCode&);
</span><del>- WEBCORE_EXPORT void setXMLStandalone(bool, ExceptionCode&);
</del><ins>+ WEBCORE_EXPORT void setXMLStandalone(bool);
</ins><span class="cx"> void setHasXMLDeclaration(bool hasXMLDeclaration) { m_hasXMLDeclaration = hasXMLDeclaration ? 1 : 0; }
</span><span class="cx">
</span><span class="cx"> String documentURI() const { return m_documentURI; }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/dom/Document.idl 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString? xmlEncoding;
</span><span class="cx"> [SetterRaisesException] attribute DOMString? xmlVersion;
</span><del>- [SetterRaisesException] attribute boolean xmlStandalone;
</del><ins>+ attribute boolean xmlStandalone;
</ins><span class="cx">
</span><span class="cx"> [RaisesException] Node adoptNode(Node source);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomExceptionh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/dom/Exception.h (0 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Exception.h (rev 0)
+++ trunk/Source/WebCore/dom/Exception.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -0,0 +1,53 @@
</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
+
+namespace WebCore {
+
+using ExceptionCode = int;
+
+class Exception {
+public:
+ explicit Exception(ExceptionCode);
+
+ WEBCORE_EXPORT ExceptionCode code() const;
+
+private:
+ ExceptionCode m_code;
+};
+
+inline Exception::Exception(ExceptionCode code)
+ : m_code(code)
+{
+}
+
+inline ExceptionCode Exception::code() const
+{
+ return m_code;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoredomExceptionOrh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/dom/ExceptionOr.h (0 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ExceptionOr.h (rev 0)
+++ trunk/Source/WebCore/dom/ExceptionOr.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -0,0 +1,72 @@
</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 "Exception.h"
+#include <wtf/Variant.h>
+
+namespace WebCore {
+
+template<typename ReturnType> class ExceptionOr {
+public:
+ ExceptionOr(Exception&&);
+ ExceptionOr(ReturnType&&);
+
+ bool hasException() const;
+ ExceptionCode exceptionCode() const;
+ ReturnType&& takeReturnValue();
+
+private:
+ std::experimental::variant<Exception, ReturnType> m_value;
+};
+
+template<typename ReturnType> inline ExceptionOr<ReturnType>::ExceptionOr(Exception&& exception)
+ : m_value(WTFMove(exception))
+{
+}
+
+template<typename ReturnType> inline ExceptionOr<ReturnType>::ExceptionOr(ReturnType&& returnValue)
+ : m_value(WTFMove(returnValue))
+{
+}
+
+template<typename ReturnType> inline bool ExceptionOr<ReturnType>::hasException() const
+{
+ return std::experimental::holds_alternative<Exception>(m_value);
+}
+
+template<typename ReturnType> inline ExceptionCode ExceptionOr<ReturnType>::exceptionCode() const
+{
+ return std::experimental::get<Exception>(m_value).code();
+}
+
+template<typename ReturnType> inline ReturnType&& ExceptionOr<ReturnType>::takeReturnValue()
+{
+ return std::experimental::get<ReturnType>(WTFMove(m_value));
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTemplateElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTemplateElement.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -29,10 +29,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "HTMLTemplateElement.h"
</span><span class="cx">
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><span class="cx"> #include "TemplateContentDocumentFragment.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "CachedScript.h"
</span><span class="cx"> #include "Cookie.h"
</span><span class="cx"> #include "CookieJar.h"
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "DOMPatchSupport.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Document.h"
</span><span class="lines">@@ -59,6 +58,7 @@
</span><span class="cx"> #include "InspectorOverlay.h"
</span><span class="cx"> #include "InspectorTimelineAgent.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> RefPtr<TextResourceDecoder> decoder;
</span><span class="cx"> if (!textEncodingName.isEmpty())
</span><span class="cx"> decoder = TextResourceDecoder::create("text/plain", textEncodingName);
</span><del>- else if (DOMImplementation::isXMLMIMEType(mimeType)) {
</del><ins>+ else if (MIMETypeRegistry::isXMLMIMEType(mimeType)) {
</ins><span class="cx"> decoder = TextResourceDecoder::create("application/xml");
</span><span class="cx"> decoder->useLenientXMLDecoding();
</span><span class="cx"> } else if (equalLettersIgnoringASCIICase(mimeType, "text/html"))
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorNetworkResourcesDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -30,24 +30,18 @@
</span><span class="cx"> #include "NetworkResourcesData.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedResource.h"
</span><del>-#include "DOMImplementation.h"
</del><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx">
</span><del>-namespace {
-// 100MB
-static const size_t maximumResourcesContentSize = 100 * 1000 * 1000;
-
-// 10MB
-static const size_t maximumSingleResourceContentSize = 10 * 1000 * 1000;
-}
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// ResourceData
</del><ins>+static const size_t maximumResourcesContentSize = 100 * 1000 * 1000; // 100MB
+static const size_t maximumSingleResourceContentSize = 10 * 1000 * 1000; // 10MB
+
</ins><span class="cx"> NetworkResourcesData::ResourceData::ResourceData(const String& requestId, const String& loaderId)
</span><span class="cx"> : m_requestId(requestId)
</span><span class="cx"> , m_loaderId(loaderId)
</span><span class="lines">@@ -117,7 +111,6 @@
</span><span class="cx"> return contentSizeInBytes(m_content) - dataLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// NetworkResourcesData
</del><span class="cx"> NetworkResourcesData::NetworkResourcesData()
</span><span class="cx"> : m_contentSize(0)
</span><span class="cx"> , m_maximumResourcesContentSize(maximumResourcesContentSize)
</span><span class="lines">@@ -141,7 +134,7 @@
</span><span class="cx"> RefPtr<TextResourceDecoder> decoder;
</span><span class="cx"> if (!textEncodingName.isEmpty())
</span><span class="cx"> decoder = TextResourceDecoder::create("text/plain", textEncodingName);
</span><del>- else if (DOMImplementation::isXMLMIMEType(mimeType)) {
</del><ins>+ else if (MIMETypeRegistry::isXMLMIMEType(mimeType)) {
</ins><span class="cx"> decoder = TextResourceDecoder::create("application/xml");
</span><span class="cx"> decoder->useLenientXMLDecoding();
</span><span class="cx"> } else if (equalLettersIgnoringASCIICase(mimeType, "text/html"))
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "ContentFilter.h"
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="cx"> #include "DiagnosticLoggingClient.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextResourceDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextResourceDecoder.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextResourceDecoder.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/loader/TextResourceDecoder.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx">
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "HTMLMetaCharsetParser.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "TextCodec.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include "TextEncodingDetector.h"
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> return CSS;
</span><span class="cx"> if (equalLettersIgnoringASCIICase(mimeType, "text/html"))
</span><span class="cx"> return HTML;
</span><del>- if (DOMImplementation::isXMLMIMEType(mimeType))
</del><ins>+ if (MIMETypeRegistry::isXMLMIMEType(mimeType))
</ins><span class="cx"> return XML;
</span><span class="cx"> return PlainText;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -29,21 +29,22 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/HashSet.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/text/StringHash.h>
</del><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> #include "ImageSourceCG.h"
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#include <wtf/RetainPtr.h>
+#endif
+
+#if USE(CG) && !PLATFORM(IOS)
</ins><span class="cx"> #include <ApplicationServices/ApplicationServices.h>
</span><del>-#else
</del><ins>+#endif
+
+#if PLATFORM(IOS)
</ins><span class="cx"> #include <ImageIO/CGImageDestination.h>
</span><span class="cx"> #endif
</span><del>-#include <wtf/RetainPtr.h>
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><span class="cx"> #include "ArchiveFactory.h"
</span><span class="lines">@@ -542,6 +543,47 @@
</span><span class="cx"> return unsupportedTextMIMETypes->contains(mimeType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MIMETypeRegistry::isTextMIMEType(const String& mimeType)
+{
+ return isSupportedJavaScriptMIMEType(mimeType)
+ || equalLettersIgnoringASCIICase(mimeType, "application/json") // Render JSON as text/plain.
+ || (mimeType.startsWith("text/", false)
+ && !equalLettersIgnoringASCIICase(mimeType, "text/html")
+ && !equalLettersIgnoringASCIICase(mimeType, "text/xml")
+ && !equalLettersIgnoringASCIICase(mimeType, "text/xsl"));
+}
+
+
+static inline bool isValidXMLMIMETypeChar(UChar c)
+{
+ // Valid characters per RFCs 3023 and 2045: 0-9a-zA-Z_-+~!$^{}|.%'`#&*
+ return isASCIIAlphanumeric(c) || c == '!' || c == '#' || c == '$' || c == '%' || c == '&' || c == '\'' || c == '*' || c == '+'
+ || c == '-' || c == '.' || c == '^' || c == '_' || c == '`' || c == '{' || c == '|' || c == '}' || c == '~';
+}
+
+bool MIMETypeRegistry::isXMLMIMEType(const String& mimeType)
+{
+ if (equalLettersIgnoringASCIICase(mimeType, "text/xml") || equalLettersIgnoringASCIICase(mimeType, "application/xml") || equalLettersIgnoringASCIICase(mimeType, "text/xsl"))
+ return true;
+
+ if (!mimeType.endsWith("+xml", false))
+ return false;
+
+ size_t slashPosition = mimeType.find('/');
+ // Take into account the '+xml' ending of mimeType.
+ if (slashPosition == notFound || !slashPosition || slashPosition == mimeType.length() - 5)
+ return false;
+
+ // Again, mimeType ends with '+xml', no need to check the validity of that substring.
+ size_t mimeLength = mimeType.length();
+ for (size_t i = 0; i < mimeLength - 4; ++i) {
+ if (!isValidXMLMIMETypeChar(mimeType[i]) && i != slashPosition)
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> bool MIMETypeRegistry::isJavaAppletMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> // Since this set is very limited and is likely to remain so we won't bother with the overhead
</span><span class="lines">@@ -577,7 +619,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (mimeType.startsWith("text/", false))
</span><del>- return !MIMETypeRegistry::isUnsupportedTextMIMEType(mimeType);
</del><ins>+ return !isUnsupportedTextMIMEType(mimeType);
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.h (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.h 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
</span><span class="cx"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><del>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
</del><ins>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
</ins><span class="cx"> * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
</span><span class="cx"> * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
</span><span class="cx"> * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
</span><span class="lines">@@ -23,13 +23,11 @@
</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 MIMETypeRegistry_h
-#define MIMETypeRegistry_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><del>-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -60,16 +58,12 @@
</span><span class="cx"> static bool isSupportedJavaScriptMIMEType(const String& mimeType);
</span><span class="cx">
</span><span class="cx"> // Check to see if a non-image MIME type is suitable for being loaded as a
</span><del>- // document in a frame. Includes supported JavaScript MIME types.
</del><ins>+ // document in a frame. Includes supported JavaScript MIME types.
</ins><span class="cx"> WEBCORE_EXPORT static bool isSupportedNonImageMIMEType(const String& mimeType);
</span><span class="cx">
</span><span class="cx"> // Check to see if a MIME type is suitable for being loaded using <video> and <audio>.
</span><span class="cx"> WEBCORE_EXPORT static bool isSupportedMediaMIMEType(const String& mimeType);
</span><span class="cx">
</span><del>- // Check to see if the MIME type is not suitable for being loaded as a text
- // document in a frame. Only valid for MIME types begining with "text/".
- static bool isUnsupportedTextMIMEType(const String& mimeType);
-
</del><span class="cx"> // Check to see if a MIME type is a valid Java applet mime type.
</span><span class="cx"> WEBCORE_EXPORT static bool isJavaAppletMIMEType(const String& mimeType);
</span><span class="cx">
</span><span class="lines">@@ -86,6 +80,15 @@
</span><span class="cx"> // "text/" and isUnsupportedTextMIMEType() returns false.
</span><span class="cx"> WEBCORE_EXPORT static bool canShowMIMEType(const String& mimeType);
</span><span class="cx">
</span><ins>+ // Check to see if a MIME type is one where an XML document should be created
+ // rather than an HTML document.
+ WEBCORE_EXPORT static bool isXMLMIMEType(const String& mimeType);
+
+ // Used in page load algorithm to decide whether to display as a text
+ // document in a frame. Not a good idea to use elsewhere, because that code
+ // makes this test is after many other tests are done on the MIME type.
+ WEBCORE_EXPORT static bool isTextMIMEType(const String& mimeType);
+
</ins><span class="cx"> // FIXME: WebKit coding style says we should not have the word "get" in the names of these functions.
</span><span class="cx"> // FIXME: Would be nice to find a way to avoid exposing these sets, even worse exposing non-const references.
</span><span class="cx"> WEBCORE_EXPORT static HashSet<String, ASCIICaseInsensitiveHash>& getSupportedImageMIMETypes();
</span><span class="lines">@@ -100,10 +103,13 @@
</span><span class="cx"> // FIXME: WebKit coding style says we should not have the word "get" in the name of this function.
</span><span class="cx"> // FIXME: Unclear what the concept of a normalized MIME type is; currently it's a platform-specific notion.
</span><span class="cx"> static String getNormalizedMIMEType(const String&);
</span><ins>+
+private:
+ // Check to see if the MIME type is not suitable for being loaded as a text
+ // document in a frame. Only valid for MIME types begining with "text/".
+ static bool isUnsupportedTextMIMEType(const String& mimeType);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> const String& defaultMIMEType();
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // MIMETypeRegistry_h
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSParser.h"
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "Event.h"
</span><span class="lines">@@ -362,11 +361,6 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGElement::isSupported(StringImpl* feature, StringImpl* version) const
-{
- return DOMImplementation::hasFeature(feature, version);
-}
-
</del><span class="cx"> void SVGElement::removedFrom(ContainerNode& rootParent)
</span><span class="cx"> {
</span><span class="cx"> bool wasInDocument = rootParent.inDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/svg/SVGElement.h 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
</span><span class="cx"> * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
</span><del>- * Copyright (C) 2009, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Samsung Electronics. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -20,10 +20,8 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SVGElement_h
-#define SVGElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include "CSSPropertyNames.h"
</del><span class="cx"> #include "SVGAnimatedString.h"
</span><span class="cx"> #include "SVGLangSpace.h"
</span><span class="cx"> #include "SVGLocatable.h"
</span><span class="lines">@@ -31,7 +29,6 @@
</span><span class="cx"> #include "SVGParsingError.h"
</span><span class="cx"> #include "SVGPropertyInfo.h"
</span><span class="cx"> #include "StyledElement.h"
</span><del>-#include "Timer.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx">
</span><span class="lines">@@ -86,7 +83,7 @@
</span><span class="cx"> void svgLoadEventTimerFired();
</span><span class="cx"> virtual Timer* svgLoadEventTimer();
</span><span class="cx">
</span><del>- virtual AffineTransform* supplementalTransform() { return 0; }
</del><ins>+ virtual AffineTransform* supplementalTransform() { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> void invalidateSVGAttributes() { ensureUniqueElementData().setAnimatedSVGAttributesAreDirty(true); }
</span><span class="cx"> void invalidateSVGPresentationAttributeStyle()
</span><span class="lines">@@ -180,8 +177,6 @@
</span><span class="cx"> private:
</span><span class="cx"> const RenderStyle* computedStyle(PseudoId = NOPSEUDO) final;
</span><span class="cx">
</span><del>- virtual bool isSupported(StringImpl* feature, StringImpl* version) const;
-
</del><span class="cx"> virtual void clearTarget() { }
</span><span class="cx">
</span><span class="cx"> void buildPendingResourcesIfNeeded();
</span><span class="lines">@@ -264,5 +259,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #include "SVGElementTypeHelpers.h"
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "DOMFormData.h"
</span><del>-#include "DOMImplementation.h"
</del><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMWindow.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "ParsedContentType.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><del>-#include <wtf/Ref.h>
</del><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -935,7 +934,7 @@
</span><span class="cx">
</span><span class="cx"> bool XMLHttpRequest::responseIsXML() const
</span><span class="cx"> {
</span><del>- return DOMImplementation::isXMLMIMEType(responseMIMEType());
</del><ins>+ return MIMETypeRegistry::isXMLMIMEType(responseMIMEType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int XMLHttpRequest::status() const
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1064,7 +1064,7 @@
</span><span class="cx"> if (version)
</span><span class="cx"> document()->setXMLVersion(toString(version), ASSERT_NO_EXCEPTION);
</span><span class="cx"> if (standalone != StandaloneUnspecified)
</span><del>- document()->setXMLStandalone(standaloneInfo == StandaloneYes, ASSERT_NO_EXCEPTION);
</del><ins>+ document()->setXMLStandalone(standaloneInfo == StandaloneYes);
</ins><span class="cx"> if (encoding)
</span><span class="cx"> document()->setXMLEncoding(toString(encoding));
</span><span class="cx"> document()->setHasXMLDeclaration(true);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-09-03 Darin Adler <darin@apple.com>
+
+ Streamline DOMImplementation, and move it to our new DOM exception system
+ https://bugs.webkit.org/show_bug.cgi?id=161295
+
+ Reviewed by Ryosuke Niwa.
+
+ * DOM/DOMDOMImplementation.mm:
+ (unwrap): Added. Use this instead of the IMPL macro.
+ (-[DOMImplementation dealloc]): Updated to use unwrap.
+ (-[DOMImplementation hasFeature:version:]): Ditto.
+ (-[DOMImplementation createDocumentType:publicId:systemId:]): Updated to work with
+ ExceptionOr.
+ (-[DOMImplementation createDocument:qualifiedName:doctype:]): Ditto.
+ (-[DOMImplementation createCSSStyleSheet:media:]): Removed exception logic since
+ this function can no longer raise an exception.
+ (-[DOMImplementation createHTMLDocument:]): Updated to use unwrap.
+ (-[DOMImplementation hasFeature::]): Changed to call the non-deprecated version
+ rather than duplicating its implementation. Also moved into the category as defined
+ in the header.
+ (-[DOMImplementation createDocumentType:::]): Ditto.
+ (-[DOMImplementation createDocument:::]): Ditto.
+ (-[DOMImplementation createCSSStyleSheet::]): Ditto.
+
+ * DOM/DOMDocument.mm: Removed unneeded include of DOMImplementation.h.
+ (-[DOMDocument setXmlStandalone:]): Updated since setXMLStandalone no longer can
+ raise an exception.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _canProvideDocumentSource]): Updated to use isTextMIMEType in its new
+ location in MIMETypeRegistry instead of in DOMImplementation.
+
</ins><span class="cx"> 2016-09-03 Brian Weinstein <bweinstein@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement a stub version of FrameLoaderClient::shouldUseContentExtensionsForURL.
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMDOMImplementationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMDOMImplementation.mm (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMDOMImplementation.mm 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/mac/DOM/DOMDOMImplementation.mm 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -30,32 +30,29 @@
</span><span class="cx"> #import "DOMDocumentTypeInternal.h"
</span><span class="cx"> #import "DOMHTMLDocumentInternal.h"
</span><span class="cx"> #import "DOMInternal.h"
</span><del>-#import "DOMNodeInternal.h"
</del><span class="cx"> #import "ExceptionHandlers.h"
</span><span class="cx"> #import <WebCore/CSSStyleSheet.h>
</span><span class="cx"> #import <WebCore/DOMImplementation.h>
</span><del>-#import <WebCore/Document.h>
</del><span class="cx"> #import <WebCore/DocumentType.h>
</span><span class="cx"> #import <WebCore/HTMLDocument.h>
</span><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><del>-#import <WebCore/URL.h>
</del><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><del>-#import <WebCore/XMLDocument.h>
-#import <wtf/GetPtr.h>
</del><span class="cx">
</span><del>-#define IMPL reinterpret_cast<WebCore::DOMImplementation*>(_internal)
-
</del><span class="cx"> @implementation DOMImplementation
</span><span class="cx">
</span><ins>+static inline WebCore::DOMImplementation& unwrap(DOMImplementation& wrapper)
+{
+ return *reinterpret_cast<WebCore::DOMImplementation*>(wrapper._internal);
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> if (WebCoreObjCScheduleDeallocateOnMainThread([DOMImplementation class], self))
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> if (_internal)
</span><del>- IMPL->deref();
</del><ins>+ unwrap(*self).deref();
</ins><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,73 +59,61 @@
</span><span class="cx"> - (BOOL)hasFeature:(NSString *)feature version:(NSString *)version
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return IMPL->hasFeature(feature, version);
</del><ins>+ return unwrap(*self).hasFeature(feature, version);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)hasFeature:(NSString *)feature :(NSString *)version
</del><ins>+- (DOMDocumentType *)createDocumentType:(NSString *)qualifiedName publicId:(NSString *)publicId systemId:(NSString *)systemId
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return IMPL->hasFeature(feature, version);
</del><ins>+ auto result = unwrap(*self).createDocumentType(qualifiedName, publicId, systemId);
+ if (result.hasException())
+ raiseDOMException(result.exceptionCode());
+ return kit(result.takeReturnValue().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMDocumentType *)createDocumentType:(NSString *)qualifiedName publicId:(NSString *)publicId systemId:(NSString *)systemId
</del><ins>+- (DOMDocument *)createDocument:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName doctype:(DOMDocumentType *)doctype
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMDocumentType *result = kit(WTF::getPtr(IMPL->createDocumentType(qualifiedName, publicId, systemId, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ auto result = unwrap(*self).createDocument(namespaceURI, qualifiedName, core(doctype));
+ if (result.hasException())
+ raiseDOMException(result.exceptionCode());
+ return kit(result.takeReturnValue().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMDocumentType *)createDocumentType:(NSString *)qualifiedName :(NSString *)publicId :(NSString *)systemId
</del><ins>+- (DOMCSSStyleSheet *)createCSSStyleSheet:(NSString *)title media:(NSString *)media
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMDocumentType *result = kit(WTF::getPtr(IMPL->createDocumentType(qualifiedName, publicId, systemId, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(unwrap(*self).createCSSStyleSheet(title, media).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMDocument *)createDocument:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName doctype:(DOMDocumentType *)doctype
</del><ins>+- (DOMHTMLDocument *)createHTMLDocument:(NSString *)title
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- DOMDocument *result = kit(WTF::getPtr(IMPL->createDocument(namespaceURI, qualifiedName, core(doctype), ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return kit(unwrap(*self).createHTMLDocument(title).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMDocument *)createDocument:(NSString *)namespaceURI :(NSString *)qualifiedName :(DOMDocumentType *)doctype
</del><ins>+@end
+
+@implementation DOMImplementation (DOMImplementationDeprecated)
+
+- (BOOL)hasFeature:(NSString *)feature :(NSString *)version
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMDocument *result = kit(WTF::getPtr(IMPL->createDocument(namespaceURI, qualifiedName, core(doctype), ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return [self hasFeature:feature version:version];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMCSSStyleSheet *)createCSSStyleSheet:(NSString *)title media:(NSString *)media
</del><ins>+- (DOMDocumentType *)createDocumentType:(NSString *)qualifiedName :(NSString *)publicId :(NSString *)systemId
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMCSSStyleSheet *result = kit(WTF::getPtr(IMPL->createCSSStyleSheet(title, media, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return [self createDocumentType:qualifiedName publicId:publicId systemId:systemId];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMCSSStyleSheet *)createCSSStyleSheet:(NSString *)title :(NSString *)media
</del><ins>+- (DOMDocument *)createDocument:(NSString *)namespaceURI :(NSString *)qualifiedName :(DOMDocumentType *)doctype
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- WebCore::ExceptionCode ec = 0;
- DOMCSSStyleSheet *result = kit(WTF::getPtr(IMPL->createCSSStyleSheet(title, media, ec)));
- raiseOnDOMError(ec);
- return result;
</del><ins>+ return [self createDocument:namespaceURI qualifiedName:qualifiedName doctype:doctype];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMHTMLDocument *)createHTMLDocument:(NSString *)title
</del><ins>+- (DOMCSSStyleSheet *)createCSSStyleSheet:(NSString *)title :(NSString *)media
</ins><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
- return kit(WTF::getPtr(IMPL->createHTMLDocument(title)));
</del><ins>+ return [self createCSSStyleSheet:title media:media];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMDocumentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMDocument.mm (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMDocument.mm 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/mac/DOM/DOMDocument.mm 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #import "DOMHTMLElementInternal.h"
</span><span class="cx"> #import "DOMHTMLHeadElementInternal.h"
</span><span class="cx"> #import "DOMHTMLScriptElementInternal.h"
</span><del>-#import <WebCore/DOMImplementation.h>
</del><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "DOMNodeIteratorInternal.h"
</span><span class="lines">@@ -147,9 +146,7 @@
</span><span class="cx"> - (void)setXmlStandalone:(BOOL)newXmlStandalone
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- WebCore::ExceptionCode ec = 0;
- IMPL->setXMLStandalone(newXmlStandalone, ec);
- raiseOnDOMError(ec);
</del><ins>+ IMPL->setXMLStandalone(newXmlStandalone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)documentURI
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> #import <WebCore/CachedResourceLoader.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><span class="cx"> #import <WebCore/ColorMac.h>
</span><del>-#import <WebCore/DOMImplementation.h>
</del><span class="cx"> #import <WebCore/DatabaseManager.h>
</span><span class="cx"> #import <WebCore/DocumentFragment.h>
</span><span class="cx"> #import <WebCore/DocumentLoader.h>
</span><span class="lines">@@ -80,6 +79,7 @@
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="cx"> #import <WebCore/JSNode.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><ins>+#import <WebCore/MIMETypeRegistry.h>
</ins><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PlatformEventFactoryMac.h>
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> #import <WebCore/markup.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <bindings/ScriptValue.h>
</span><ins>+#import <runtime/JSCJSValue.h>
</ins><span class="cx"> #import <runtime/JSLock.h>
</span><span class="cx"> #import <runtime/JSObject.h>
</span><del>-#import <runtime/JSCJSValue.h>
</del><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> #import "WebResource.h"
</span><span class="cx"> #import "WebUIKitDelegate.h"
</span><span class="cx"> #import <WebCore/Document.h>
</span><del>-#import <WebCore/Editor.h>
</del><span class="cx"> #import <WebCore/EditorClient.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><span class="cx"> #import <WebCore/Font.h>
</span><span class="lines">@@ -988,7 +987,7 @@
</span><span class="cx"> String mimeType = frame->document()->loader()->writer().mimeType();
</span><span class="cx"> PluginData* pluginData = frame->page() ? &frame->page()->pluginData() : 0;
</span><span class="cx">
</span><del>- if (WebCore::DOMImplementation::isTextMIMEType(mimeType)
</del><ins>+ if (WebCore::MIMETypeRegistry::isTextMIMEType(mimeType)
</ins><span class="cx"> || Image::supportsType(mimeType)
</span><span class="cx"> || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins())
</span><span class="cx"> || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins)))
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/win/ChangeLog 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-03 Darin Adler <darin@apple.com>
+
+ Streamline DOMImplementation, and move it to our new DOM exception system
+ https://bugs.webkit.org/show_bug.cgi?id=161295
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebFrame.cpp:
+ (WebFrame::canProvideDocumentSource): Updated to use isXMLMIMEType in its new
+ location in MIMETypeRegistry instead of in DOMImplementation.
+
</ins><span class="cx"> 2016-09-02 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix attempt after r205381.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/DocumentMarkerController.h>
</span><del>-#include <WebCore/DOMImplementation.h>
</del><span class="cx"> #include <WebCore/DOMWindow.h>
</span><span class="cx"> #include <WebCore/Editor.h>
</span><span class="cx"> #include <WebCore/Event.h>
</span><span class="lines">@@ -81,6 +80,7 @@
</span><span class="cx"> #include <WebCore/HTMLPlugInElement.h>
</span><span class="cx"> #include <WebCore/JSDOMWindow.h>
</span><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><ins>+#include <WebCore/MIMETypeRegistry.h>
</ins><span class="cx"> #include <WebCore/MainFrame.h>
</span><span class="cx"> #include <WebCore/MouseRelatedEvent.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="lines">@@ -1385,7 +1385,7 @@
</span><span class="cx"> BString mimeTypeBStr;
</span><span class="cx"> if (SUCCEEDED(urlResponse->MIMEType(&mimeTypeBStr))) {
</span><span class="cx"> String mimeType(mimeTypeBStr, SysStringLen(mimeTypeBStr));
</span><del>- *result = mimeType == "text/html" || WebCore::DOMImplementation::isXMLMIMEType(mimeType);
</del><ins>+ *result = mimeType == "text/html" || WebCore::MIMETypeRegistry::isXMLMIMEType(mimeType);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return hr;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-03 Darin Adler <darin@apple.com>
+
+ Streamline DOMImplementation, and move it to our new DOM exception system
+ https://bugs.webkit.org/show_bug.cgi?id=161295
+
+ Reviewed by Ryosuke Niwa.
+
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::isDisplayingMarkupDocument): Use isXMLMIMEType in its
+ new location in MIMETypeRegistry rather than in DOMImplementation.
+ (WebKit::WebFrameProxy::isDisplayingPDFDocument): Removed unneeded redundant
+ check for empty string, already done by MIMETypeRegistry.
+
</ins><span class="cx"> 2016-09-03 Brian Weinstein <bweinstein@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement WebFrameLoaderClient::shouldUseContentExtensionsForURL and consult the InjectedBundlePageLoaderClient.
</span><span class="lines">@@ -20,6 +33,16 @@
</span><span class="cx"> or not we should use content extensions for this URL.
</span><span class="cx"> * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
</span><span class="cx">
</span><ins>+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp:
+ (webkit_dom_dom_implementation_create_document_type): Updated to work with ExceptionOr.
+ (webkit_dom_dom_implementation_create_document): Updated to work with ExceptionOr.
+ (webkit_dom_dom_implementation_create_css_style_sheet): Updated since this function
+ can no longer raise an exception.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp:
+ (webkit_dom_document_set_xml_standalone): Updated since this function can no longer
+ raise an exception.
+
</ins><span class="cx"> 2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move WebKit2 WebInspector files to #pragma once
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><del>-#include <WebCore/DOMImplementation.h>
</del><span class="cx"> #include <WebCore/Image.h>
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="lines">@@ -117,15 +116,13 @@
</span><span class="cx">
</span><span class="cx"> bool WebFrameProxy::isDisplayingMarkupDocument() const
</span><span class="cx"> {
</span><del>- // FIXME: This check should be moved to somewhere in WebCore.
- return m_MIMEType == "text/html" || m_MIMEType == "image/svg+xml" || m_MIMEType == "application/x-webarchive" || DOMImplementation::isXMLMIMEType(m_MIMEType);
</del><ins>+ // FIXME: This should be a call to a single MIMETypeRegistry function; adding a new one if needed.
+ // FIXME: This is doing case sensitive comparisons on MIME types, should be using ASCII case insensitive instead.
+ return m_MIMEType == "text/html" || m_MIMEType == "image/svg+xml" || m_MIMEType == "application/x-webarchive" || MIMETypeRegistry::isXMLMIMEType(m_MIMEType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebFrameProxy::isDisplayingPDFDocument() const
</span><span class="cx"> {
</span><del>- if (m_MIMEType.isEmpty())
- return false;
-
</del><span class="cx"> return MIMETypeRegistry::isPDFOrPostScriptMIMEType(m_MIMEType);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDOMImplementationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMImplementation.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> /*
</span><span class="cx"> * This file is part of the WebKit open source project.
</span><del>- * This file has been generated by generate-bindings.pl. DO NOT MODIFY!
</del><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -21,12 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitDOMDOMImplementation.h"
</span><span class="cx">
</span><del>-#include <WebCore/CSSImportRule.h>
</del><ins>+#include "ConvertToUTF8String.h"
</ins><span class="cx"> #include "DOMObjectCache.h"
</span><del>-#include <WebCore/Document.h>
-#include <WebCore/ExceptionCode.h>
-#include <WebCore/ExceptionCodeDescription.h>
-#include <WebCore/JSMainThreadExecState.h>
</del><span class="cx"> #include "WebKitDOMCSSStyleSheetPrivate.h"
</span><span class="cx"> #include "WebKitDOMDOMImplementationPrivate.h"
</span><span class="cx"> #include "WebKitDOMDocumentPrivate.h"
</span><span class="lines">@@ -33,7 +28,11 @@
</span><span class="cx"> #include "WebKitDOMDocumentTypePrivate.h"
</span><span class="cx"> #include "WebKitDOMHTMLDocumentPrivate.h"
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><del>-#include "ConvertToUTF8String.h"
</del><ins>+#include <WebCore/CSSImportRule.h>
+#include <WebCore/Document.h>
+#include <WebCore/ExceptionCode.h>
+#include <WebCore/ExceptionCodeDescription.h>
+#include <WebCore/JSMainThreadExecState.h>
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -131,13 +130,12 @@
</span><span class="cx"> WTF::String convertedQualifiedName = WTF::String::fromUTF8(qualifiedName);
</span><span class="cx"> WTF::String convertedPublicId = WTF::String::fromUTF8(publicId);
</span><span class="cx"> WTF::String convertedSystemId = WTF::String::fromUTF8(systemId);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::DocumentType> gobjectResult = WTF::getPtr(item->createDocumentType(convertedQualifiedName, convertedPublicId, convertedSystemId, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->createDocumentType(convertedQualifiedName, convertedPublicId, convertedSystemId);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.exceptionCode());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="cx"> }
</span><del>- return WebKit::kit(gobjectResult.get());
</del><ins>+ return WebKit::kit(result.takeReturnValue().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitDOMDocument* webkit_dom_dom_implementation_create_document(WebKitDOMDOMImplementation* self, const gchar* namespaceURI, const gchar* qualifiedName, WebKitDOMDocumentType* doctype, GError** error)
</span><span class="lines">@@ -151,13 +149,12 @@
</span><span class="cx"> WTF::String convertedNamespaceURI = WTF::String::fromUTF8(namespaceURI);
</span><span class="cx"> WTF::String convertedQualifiedName = WTF::String::fromUTF8(qualifiedName);
</span><span class="cx"> WebCore::DocumentType* convertedDoctype = WebKit::core(doctype);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::Document> gobjectResult = WTF::getPtr(item->createDocument(convertedNamespaceURI, convertedQualifiedName, convertedDoctype, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
</del><ins>+ auto result = item->createDocument(convertedNamespaceURI, convertedQualifiedName, convertedDoctype);
+ if (result.hasException()) {
+ WebCore::ExceptionCodeDescription ecdesc(result.exceptionCode());
</ins><span class="cx"> g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
</span><span class="cx"> }
</span><del>- return WebKit::kit(gobjectResult.get());
</del><ins>+ return WebKit::kit(result.takeReturnValue().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitDOMCSSStyleSheet* webkit_dom_dom_implementation_create_css_style_sheet(WebKitDOMDOMImplementation* self, const gchar* title, const gchar* media, GError** error)
</span><span class="lines">@@ -170,12 +167,7 @@
</span><span class="cx"> WebCore::DOMImplementation* item = WebKit::core(self);
</span><span class="cx"> WTF::String convertedTitle = WTF::String::fromUTF8(title);
</span><span class="cx"> WTF::String convertedMedia = WTF::String::fromUTF8(media);
</span><del>- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::CSSStyleSheet> gobjectResult = WTF::getPtr(item->createCSSStyleSheet(convertedTitle, convertedMedia, ec));
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
- g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
- }
</del><ins>+ RefPtr<WebCore::CSSStyleSheet> gobjectResult = WTF::getPtr(item->createCSSStyleSheet(convertedTitle, convertedMedia));
</ins><span class="cx"> return WebKit::kit(gobjectResult.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp (205410 => 205411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp 2016-09-03 23:25:47 UTC (rev 205410)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp 2016-09-03 23:34:00 UTC (rev 205411)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> /*
</span><span class="cx"> * This file is part of the WebKit open source project.
</span><del>- * This file has been generated by generate-bindings.pl. DO NOT MODIFY!
</del><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -21,13 +20,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitDOMDocument.h"
</span><span class="cx">
</span><del>-#include <WebCore/CSSImportRule.h>
</del><ins>+#include "ConvertToUTF8String.h"
</ins><span class="cx"> #include "DOMObjectCache.h"
</span><del>-#include <WebCore/Document.h>
-#include <WebCore/ExceptionCode.h>
-#include <WebCore/ExceptionCodeDescription.h>
</del><span class="cx"> #include "GObjectEventListener.h"
</span><del>-#include <WebCore/JSMainThreadExecState.h>
</del><span class="cx"> #include "WebKitDOMAttrPrivate.h"
</span><span class="cx"> #include "WebKitDOMCDATASectionPrivate.h"
</span><span class="cx"> #include "WebKitDOMCSSStyleDeclarationPrivate.h"
</span><span class="lines">@@ -37,6 +32,7 @@
</span><span class="cx"> #include "WebKitDOMDocumentFragmentPrivate.h"
</span><span class="cx"> #include "WebKitDOMDocumentPrivate.h"
</span><span class="cx"> #include "WebKitDOMDocumentTypePrivate.h"
</span><ins>+#include "WebKitDOMDocumentUnstable.h"
</ins><span class="cx"> #include "WebKitDOMElementPrivate.h"
</span><span class="cx"> #include "WebKitDOMEventPrivate.h"
</span><span class="cx"> #include "WebKitDOMEventTarget.h"
</span><span class="lines">@@ -57,8 +53,11 @@
</span><span class="cx"> #include "WebKitDOMXPathExpressionPrivate.h"
</span><span class="cx"> #include "WebKitDOMXPathNSResolverPrivate.h"
</span><span class="cx"> #include "WebKitDOMXPathResultPrivate.h"
</span><del>-#include "ConvertToUTF8String.h"
-#include "WebKitDOMDocumentUnstable.h"
</del><ins>+#include <WebCore/CSSImportRule.h>
+#include <WebCore/Document.h>
+#include <WebCore/ExceptionCode.h>
+#include <WebCore/ExceptionCodeDescription.h>
+#include <WebCore/JSMainThreadExecState.h>
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -1497,13 +1496,7 @@
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_DOCUMENT(self));
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><del>- WebCore::Document* item = WebKit::core(self);
- WebCore::ExceptionCode ec = 0;
- item->setXMLStandalone(value, ec);
- if (ec) {
- WebCore::ExceptionCodeDescription ecdesc(ec);
- g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
- }
</del><ins>+ WebKit::core(self)->setXMLStandalone(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gchar* webkit_dom_document_get_document_uri(WebKitDOMDocument* self)
</span></span></pre>
</div>
</div>
</body>
</html>