Changeset 195520 in webkit
- Timestamp:
- Jan 24, 2016 5:11:35 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 45 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r195518 r195520 1 2016-01-24 Chris Dumez <cdumez@apple.com> 2 3 An XMLDocument interface should be exposed on the global Window object 4 https://bugs.webkit.org/show_bug.cgi?id=153378 5 <rdar://problem/24315465> 6 7 Reviewed by Darin Adler. 8 9 Rebaseline some layout tests now that XMLDocument is exposed. 10 11 * fast/dom/DOMImplementation/createDocument-namespace-err-expected.txt: 12 * fast/dom/DOMImplementation/script-tests/createDocument-namespace-err.js: 13 * fast/dom/Document/clone-node-expected.txt: 14 * fast/dom/Document/clone-node.html: 15 * fast/dom/Document/xml-document-focus-expected.txt: 16 * fast/dom/Document/xml-document-focus.xml: 17 * fast/dom/dom-parse-serialize-display-expected.txt: 18 * fast/dom/dom-parse-serialize-expected.txt: 19 * fast/dom/wrapper-classes-expected.txt: 20 * fast/dom/wrapper-classes.html: 21 * fast/dom/xmlserializer-serialize-to-string-exception-expected.txt: 22 * fast/xmlhttprequest/xmlhttprequest-bad-mimetype-expected.txt: 23 * http/tests/xmlhttprequest/supported-xml-content-types-expected.txt: 24 * platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt: 25 1 26 2016-01-24 Simon Fraser <simon.fraser@apple.com> 2 27 -
trunk/LayoutTests/fast/dom/DOMImplementation/createDocument-namespace-err-expected.txt
r42362 r195520 4 4 5 5 6 PASS document.implementation.createDocument().toString() is "[object Document]"7 PASS document.implementation.createDocument("http://www.example.com").toString() is "[object Document]"6 PASS document.implementation.createDocument().toString() is "[object XMLDocument]" 7 PASS document.implementation.createDocument("http://www.example.com").toString() is "[object XMLDocument]" 8 8 PASS createDocument(, , null) 9 9 PASS createDocument(null, , null) -
trunk/LayoutTests/fast/dom/DOMImplementation/script-tests/createDocument-namespace-err.js
r98407 r195520 139 139 140 140 // Moz throws a "Not enough arguments" exception in these, we don't: 141 shouldBeEqualToString("document.implementation.createDocument().toString()", "[object Document]");142 shouldBeEqualToString("document.implementation.createDocument(\"http://www.example.com\").toString()", "[object Document]");141 shouldBeEqualToString("document.implementation.createDocument().toString()", "[object XMLDocument]"); 142 shouldBeEqualToString("document.implementation.createDocument(\"http://www.example.com\").toString()", "[object XMLDocument]"); 143 143 144 144 runNSTests(allNSTests, document.implementation, "createDocument"); -
trunk/LayoutTests/fast/dom/Document/clone-node-expected.txt
r177366 r195520 4 4 5 5 6 PASS doc.cloneNode(false).__proto__ is Document.prototype7 PASS className(doc.cloneNode(false)) is " Document"6 PASS doc.cloneNode(false).__proto__ is XMLDocument.prototype 7 PASS className(doc.cloneNode(false)) is "XMLDocument" 8 8 PASS doc.cloneNode(true).documentElement.localName is "root" 9 9 PASS doc.cloneNode(true).contentType is "application/xml" -
trunk/LayoutTests/fast/dom/Document/clone-node.html
r177366 r195520 12 12 var doc = document.implementation.createDocument('', 'root', null); 13 13 14 shouldBe('doc.cloneNode(false).__proto__', ' Document.prototype');15 shouldBeEqualToString('className(doc.cloneNode(false))', ' Document');14 shouldBe('doc.cloneNode(false).__proto__', 'XMLDocument.prototype'); 15 shouldBeEqualToString('className(doc.cloneNode(false))', 'XMLDocument'); 16 16 shouldBeEqualToString('doc.cloneNode(true).documentElement.localName', 'root'); 17 17 shouldBeEqualToString('doc.cloneNode(true).contentType', 'application/xml'); -
trunk/LayoutTests/fast/dom/Document/xml-document-focus-expected.txt
r166668 r195520 5 5 6 6 PASS document.__proto__ is not HTMLDocument.prototype 7 PASS document.__proto__ is Document.prototype7 PASS document.__proto__ is XMLDocument.prototype 8 8 PASS document.hasFocus() is true 9 9 PASS document.activeElement is document.body -
trunk/LayoutTests/fast/dom/Document/xml-document-focus.xml
r166668 r195520 12 12 13 13 shouldNotBe("document.__proto__", "HTMLDocument.prototype"); 14 shouldBe("document.__proto__", " Document.prototype");14 shouldBe("document.__proto__", "XMLDocument.prototype"); 15 15 shouldBeTrue("document.hasFocus()"); 16 16 shouldBe("document.activeElement", "document.body"); -
trunk/LayoutTests/fast/dom/dom-parse-serialize-display-expected.txt
r114059 r195520 16 16 document object 17 17 18 [object Document]18 [object XMLDocument] 19 19 20 20 document object serialized -
trunk/LayoutTests/fast/dom/dom-parse-serialize-expected.txt
r114059 r195520 15 15 document object 16 16 17 [object Document]17 [object XMLDocument] 18 18 19 19 document object serialized -
trunk/LayoutTests/fast/dom/wrapper-classes-expected.txt
r191423 r195520 39 39 XML 40 40 41 PASS jsWrapperClass(xmlDocument) is ' Document'42 PASS jsWrapperClass(xmlDocument.__proto__) is ' DocumentPrototype'43 PASS jsWrapperClass(xmlDocument.constructor) is ' DocumentConstructor'41 PASS jsWrapperClass(xmlDocument) is 'XMLDocument' 42 PASS jsWrapperClass(xmlDocument.__proto__) is 'XMLDocumentPrototype' 43 PASS jsWrapperClass(xmlDocument.constructor) is 'XMLDocumentConstructor' 44 44 PASS jsWrapperClass(xmlDocument.createCDATASection()) is 'CDATASection' 45 45 PASS jsWrapperClass(xmlDocument.createCDATASection().__proto__) is 'CDATASectionPrototype' -
trunk/LayoutTests/fast/dom/wrapper-classes.html
r191423 r195520 88 88 debug(''); 89 89 90 test("xmlDocument", " Document");90 test("xmlDocument", "XMLDocument"); 91 91 test("xmlDocument.createCDATASection()", "CDATASection"); 92 92 test("xmlDocument.createElementNS('x', 'x', 'x')", "Element"); -
trunk/LayoutTests/fast/dom/xmlserializer-serialize-to-string-exception-expected.txt
r184420 r195520 41 41 PASS 42 42 43 13. Verifying XMLSerializer.serializeToString() should NOT-THROW exception with node value = [object Document]43 13. Verifying XMLSerializer.serializeToString() should NOT-THROW exception with node value = [object XMLDocument] 44 44 PASS 45 45 -
trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-bad-mimetype-expected.txt
r42164 r195520 4 4 readyState: 4 (number) 5 5 responseText: <?xml version="1.0" encoding="UTF-8"?>... (string) 6 responseXML: [object Document] (object)6 responseXML: [object XMLDocument] (object) 7 7 status: 0 (number) 8 8 statusText: (string) -
trunk/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
r191423 r195520 83 83 ALERT: PASS: window.TypeError should be 'function TypeError() { [native code]}' and is. 84 84 ALERT: PASS: window.URIError should be 'function URIError() { [native code]}' and is. 85 ALERT: PASS: window.XMLDocument should be '[object DocumentConstructor]' and is.85 ALERT: PASS: window.XMLDocument should be '[object XMLDocumentConstructor]' and is. 86 86 ALERT: PASS: window.XMLSerializer should be '[object XMLSerializerConstructor]' and is. 87 87 ALERT: PASS: window.XPathEvaluator should be '[object XPathEvaluatorConstructor]' and is. -
trunk/LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types-expected.txt
r21687 r195520 1 PASS -- testing: text/xml -- responseXML: [object Document]1 PASS -- testing: text/xml -- responseXML: [object XMLDocument] 2 2 3 PASS -- testing: image/svg+xml -- responseXML: [object Document]3 PASS -- testing: image/svg+xml -- responseXML: [object XMLDocument] 4 4 5 PASS -- testing: application/soap+xml -- responseXML: [object Document]5 PASS -- testing: application/soap+xml -- responseXML: [object XMLDocument] 6 6 7 PASS -- testing: foo/bar+xml -- responseXML: [object Document]7 PASS -- testing: foo/bar+xml -- responseXML: [object XMLDocument] 8 8 9 PASS -- testing: 123/BAR+xml -- responseXML: [object Document]9 PASS -- testing: 123/BAR+xml -- responseXML: [object XMLDocument] 10 10 11 PASS -- testing: foo_bar/baz+xml -- responseXML: [object Document]11 PASS -- testing: foo_bar/baz+xml -- responseXML: [object XMLDocument] 12 12 13 PASS -- testing: foo-bar/baz+xml -- responseXML: [object Document]13 PASS -- testing: foo-bar/baz+xml -- responseXML: [object XMLDocument] 14 14 15 PASS -- testing: foo+bar/baz+xml -- responseXML: [object Document]15 PASS -- testing: foo+bar/baz+xml -- responseXML: [object XMLDocument] 16 16 17 PASS -- testing: foo~bar/baz+xml -- responseXML: [object Document]17 PASS -- testing: foo~bar/baz+xml -- responseXML: [object XMLDocument] 18 18 19 PASS -- testing: foo!bar/baz+xml -- responseXML: [object Document]19 PASS -- testing: foo!bar/baz+xml -- responseXML: [object XMLDocument] 20 20 21 PASS -- testing: foo$bar/baz+xml -- responseXML: [object Document]21 PASS -- testing: foo$bar/baz+xml -- responseXML: [object XMLDocument] 22 22 23 PASS -- testing: foo^bar/baz+xml -- responseXML: [object Document]23 PASS -- testing: foo^bar/baz+xml -- responseXML: [object XMLDocument] 24 24 25 PASS -- testing: foo{bar/baz+xml -- responseXML: [object Document]25 PASS -- testing: foo{bar/baz+xml -- responseXML: [object XMLDocument] 26 26 27 PASS -- testing: foo}bar/baz+xml -- responseXML: [object Document]27 PASS -- testing: foo}bar/baz+xml -- responseXML: [object XMLDocument] 28 28 29 PASS -- testing: foo|bar/baz+xml -- responseXML: [object Document]29 PASS -- testing: foo|bar/baz+xml -- responseXML: [object XMLDocument] 30 30 31 PASS -- testing: foo%bar/baz+xml -- responseXML: [object Document]31 PASS -- testing: foo%bar/baz+xml -- responseXML: [object XMLDocument] 32 32 33 PASS -- testing: foo'bar/baz+xml -- responseXML: [object Document]33 PASS -- testing: foo'bar/baz+xml -- responseXML: [object XMLDocument] 34 34 35 PASS -- testing: foo`bar/baz+xml -- responseXML: [object Document]35 PASS -- testing: foo`bar/baz+xml -- responseXML: [object XMLDocument] 36 36 37 PASS -- testing: foo#bar/baz+xml -- responseXML: [object Document]37 PASS -- testing: foo#bar/baz+xml -- responseXML: [object XMLDocument] 38 38 39 PASS -- testing: foo&bar/baz+xml -- responseXML: [object Document]39 PASS -- testing: foo&bar/baz+xml -- responseXML: [object XMLDocument] 40 40 41 PASS -- testing: foo*bar/baz+xml -- responseXML: [object Document]41 PASS -- testing: foo*bar/baz+xml -- responseXML: [object XMLDocument] 42 42 43 43 PASS -- testing: text/html -- responseXML: null … … 47 47 PASS -- testing: invalid -- responseXML: null 48 48 49 FAIL (got document -- response type: foo bar/baz+xml) -- testing: foo bar/baz+xml -- responseXML: [object Document]49 FAIL (got document -- response type: foo bar/baz+xml) -- testing: foo bar/baz+xml -- responseXML: [object XMLDocument] 50 50 51 51 PASS -- testing: foo[bar/baz+xml -- responseXML: null -
trunk/LayoutTests/http/tests/xmlhttprequest/svg-created-by-xhr-allowed-in-dashboard-expected.txt
r108832 r195520 1 1 Test to make sure we can use XHR to create usable SVG in dashboard compatibility mode. This cannot be tested manually. 2 2 3 Received doc of type: [object Document]3 Received doc of type: [object XMLDocument] 4 4 PASS: Managed to insert SVG element into tree 5 5 Imported node of type: [object SVGCircleElement] -
trunk/LayoutTests/imported/w3c/ChangeLog
r195501 r195520 1 2016-01-24 Chris Dumez <cdumez@apple.com> 2 3 An XMLDocument interface should be exposed on the global Window object 4 https://bugs.webkit.org/show_bug.cgi?id=153378 5 <rdar://problem/24315465> 6 7 Reviewed by Darin Adler. 8 9 Rebaseline several W3C DOM and HTML tests now that more checks are 10 passing. 11 12 * web-platform-tests/dom/interfaces-expected.txt: 13 * web-platform-tests/dom/nodes/Document-constructor-expected.txt: 14 * web-platform-tests/html/dom/interfaces-expected.txt: 15 1 16 2016-01-20 Ryosuke Niwa <rniwa@webkit.org> 2 17 -
trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt
r195497 r195520 45 45 CONSOLE MESSAGE: line 1151: Deprecated attempt to access property 'lastElementChild' on a non-Document object. 46 46 CONSOLE MESSAGE: line 1151: Deprecated attempt to access property 'childElementCount' on a non-Document object. 47 CONSOLE MESSAGE: line 793: Deprecated attempt to access property 'nodeType' on a non-Node object.48 CONSOLE MESSAGE: line 2475: Deprecated attempt to access property 'nodeType' on a non-Node object.49 CONSOLE MESSAGE: line 793: Deprecated attempt to access property 'nodeType' on a non-Node object.50 CONSOLE MESSAGE: line 2475: Deprecated attempt to access property 'nodeType' on a non-Node object.51 47 CONSOLE MESSAGE: line 1151: Deprecated attempt to access property 'children' on a non-DocumentFragment object. 52 48 CONSOLE MESSAGE: line 1151: Deprecated attempt to access property 'firstElementChild' on a non-DocumentFragment object. … … 474 470 PASS Document interface: operation querySelector(DOMString) 475 471 PASS Document interface: operation querySelectorAll(DOMString) 476 FAIL XMLDocument interface: existence and properties of interface object assert_equals: class string of XMLDocument expected "[object Function]" but got "[object DocumentConstructor]"472 FAIL XMLDocument interface: existence and properties of interface object assert_equals: class string of XMLDocument expected "[object Function]" but got "[object XMLDocumentConstructor]" 477 473 PASS XMLDocument interface object length 478 FAIL XMLDocument interface object name assert_equals: wrong value for XMLDocument.name expected "XMLDocument" but got "Document" 479 FAIL XMLDocument interface: existence and properties of interface prototype object assert_equals: prototype of XMLDocument.prototype is not Document.prototype expected Node object of unknown type but got Node object of unknown type 474 PASS XMLDocument interface object name 475 PASS XMLDocument interface: existence and properties of interface prototype object 480 476 FAIL XMLDocument interface: existence and properties of interface prototype object's "constructor" property assert_true: XMLDocument.prototype.constructor is not writable expected true got false 481 477 PASS XMLDocument must be primary interface of xmlDoc 482 FAIL Stringification of xmlDoc assert_equals: class string of xmlDoc expected "[object XMLDocument]" but got "[object Document]" 478 PASS Stringification of xmlDoc 483 479 PASS Document interface: xmlDoc must inherit property "implementation" with the proper type (0) 484 480 PASS Document interface: xmlDoc must inherit property "URL" with the proper type (1) -
trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Document-constructor-expected.txt
r195497 r195520 1 1 2 FAIL new Document(): interfaces assert_false: Should not be an XMLDocument expected false got true 2 PASS new Document(): interfaces 3 3 PASS new Document(): children 4 4 PASS new Document(): metadata -
trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt
r195497 r195520 1255 1255 FAIL XMLDocument interface: operation load(DOMString) assert_own_property: interface prototype object missing non-static operation expected property "load" missing 1256 1256 PASS XMLDocument must be primary interface of document.implementation.createDocument(null, "", null) 1257 FAIL Stringification of document.implementation.createDocument(null, "", null) assert_equals: class string of document.implementation.createDocument(null, "", null) expected "[object XMLDocument]" but got "[object Document]" 1257 PASS Stringification of document.implementation.createDocument(null, "", null) 1258 1258 FAIL XMLDocument interface: document.implementation.createDocument(null, "", null) must inherit property "load" with the proper type (0) assert_inherits: property "load" not found in prototype chain 1259 1259 FAIL XMLDocument interface: calling load(DOMString) on document.implementation.createDocument(null, "", null) with too few arguments must throw TypeError assert_inherits: property "load" not found in prototype chain -
trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt
r191423 r195520 295 295 PASS win['WheelEvent'] == '[object WheelEventConstructor]' is true 296 296 PASS win['WheelEvent'] == '[object WheelEventConstructor]' is true 297 PASS win['XMLDocument'] == '[object DocumentConstructor]' is true298 PASS win['XMLDocument'] == '[object DocumentConstructor]' is true297 PASS win['XMLDocument'] == '[object XMLDocumentConstructor]' is true 298 PASS win['XMLDocument'] == '[object XMLDocumentConstructor]' is true 299 299 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true 300 300 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true -
trunk/LayoutTests/svg/custom/manually-parsed-embedded-svg-allowed-in-dashboard-expected.txt
r108832 r195520 1 1 This test makes sure we can add manually parsed SVG to the document when in dashboard compatibility mode. It can not be tested manually. 2 2 3 Parsing of the document isn't prevented and produces a [object Document]3 Parsing of the document isn't prevented and produces a [object XMLDocument] 4 4 The circle element is of type [object SVGCircleElement] 5 5 PASS: Managed to insert SVG element into tree -
trunk/Source/WebCore/CMakeLists.txt
r195443 r195520 419 419 dom/WebKitTransitionEvent.idl 420 420 dom/WheelEvent.idl 421 dom/XMLDocument.idl 421 422 422 423 fileapi/Blob.idl -
trunk/Source/WebCore/ChangeLog
r195517 r195520 1 2016-01-24 Chris Dumez <cdumez@apple.com> 2 3 An XMLDocument interface should be exposed on the global Window object 4 https://bugs.webkit.org/show_bug.cgi?id=153378 5 <rdar://problem/24315465> 6 7 Reviewed by Darin Adler. 8 9 Expose an XMLDocument interface on the global Window object, as per: 10 - https://dom.spec.whatwg.org/#xmldocument 11 12 DOMImplementation.createDocument() now returns an XMLDocument instead 13 of a Document, as per: 14 - https://dom.spec.whatwg.org/#dom-domimplementation-createdocument 15 16 Previously, WebKit would alias XMLDocument to Document which caused 17 some W3C tests to fail. 18 19 Chrome and Firefox already match the specification here. 20 21 No new tests, already covered by existing tests. 22 23 * CMakeLists.txt: 24 * DerivedSources.cpp: 25 * DerivedSources.make: 26 * WebCore.vcxproj/WebCore.vcxproj: 27 * WebCore.vcxproj/WebCore.vcxproj.filters: 28 * WebCore.xcodeproj/project.pbxproj: 29 * bindings/js/JSBindingsAllInOne.cpp: 30 * bindings/js/JSDocumentCustom.cpp: 31 (WebCore::createNewDocumentWrapper): 32 * dom/DOMImplementation.cpp: 33 (WebCore::DOMImplementation::createDocument): 34 * dom/DOMImplementation.h: 35 * dom/DOMImplementation.idl: 36 * dom/Document.cpp: 37 (WebCore::Document::cloneDocumentWithoutChildren): 38 * dom/Document.h: 39 (WebCore::Document::isXMLDocument): 40 (WebCore::Document::create): Deleted. 41 (WebCore::Document::createNonRenderedPlaceholder): Deleted. 42 * dom/XMLDocument.h: Added. 43 (WebCore::XMLDocument::create): 44 (WebCore::XMLDocument::createXHTML): 45 (WebCore::XMLDocument::XMLDocument): 46 (isType): 47 * dom/XMLDocument.idl: Added. 48 * inspector/DOMPatchSupport.cpp: 49 (WebCore::DOMPatchSupport::patchDocument): 50 * inspector/InspectorDOMAgent.cpp: 51 (WebCore::InspectorDOMAgent::setOuterHTML): 52 * page/DOMWindow.idl: 53 * page/PageSerializer.cpp: 54 (WebCore::SerializerMarkupAccumulator::SerializerMarkupAccumulator): 55 * svg/SVGDocument.cpp: 56 (WebCore::SVGDocument::SVGDocument): 57 * svg/SVGDocument.h: 58 * svg/SVGDocument.idl: 59 * xml/XMLHttpRequest.cpp: 60 (WebCore::XMLHttpRequest::responseXML): 61 * xml/XSLTProcessor.cpp: 62 (WebCore::XSLTProcessor::createDocumentFromSource): 63 1 64 2016-01-24 Brady Eidson <beidson@apple.com> 2 65 -
trunk/Source/WebCore/DerivedSources.cpp
r191423 r195520 529 529 #include "JSWorkerLocation.cpp" 530 530 #include "JSWorkerNavigator.cpp" 531 #include "JSXMLDocument.cpp" 531 532 #include "JSXMLHttpRequest.cpp" 532 533 #include "JSXMLHttpRequestException.cpp" -
trunk/Source/WebCore/DerivedSources.make
r194117 r195520 326 326 $(WebCore)/dom/WebKitTransitionEvent.idl \ 327 327 $(WebCore)/dom/WheelEvent.idl \ 328 $(WebCore)/dom/XMLDocument.idl \ 328 329 $(WebCore)/fileapi/Blob.idl \ 329 330 $(WebCore)/fileapi/File.idl \ -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r194960 r195520 6515 6515 </ClCompile> 6516 6516 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWorkerNavigator.cpp"> 6517 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 6518 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 6519 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 6520 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 6521 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 6522 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> 6523 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 6524 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 6525 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 6526 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 6527 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 6528 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 6529 </ClCompile> 6530 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.cpp"> 6517 6531 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 6518 6532 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> … … 20239 20253 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWorkerLocation.h" /> 20240 20254 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWorkerNavigator.h" /> 20255 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.h" /> 20241 20256 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h" /> 20242 20257 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r194447 r195520 6232 6232 <Filter>DerivedSources</Filter> 6233 6233 </ClCompile> 6234 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.cpp"> 6235 <Filter>DerivedSources</Filter> 6236 </ClCompile> 6234 6237 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.cpp"> 6235 6238 <Filter>DerivedSources</Filter> … … 13640 13643 </ClInclude> 13641 13644 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWritableStream.h"> 13645 <Filter>DerivedSources</Filter> 13646 </ClInclude> 13647 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.h"> 13642 13648 <Filter>DerivedSources</Filter> 13643 13649 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r195496 r195520 2840 2840 830519961BB0F11000F3772E /* HTMLTimeElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 830519931BB0F0E700F3772E /* HTMLTimeElement.h */; }; 2841 2841 8306EFF11B8BCEA50031D032 /* NativeNodeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8306EFF01B8BCE7C0031D032 /* NativeNodeFilter.cpp */; }; 2842 830784B21C52EE2C00104D1D /* XMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 830784B11C52EE1900104D1D /* XMLDocument.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2842 2843 832B843419D8E55100B26055 /* SVGAnimateElementBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 832B843319D8E55100B26055 /* SVGAnimateElementBase.h */; }; 2843 2844 832B843619D8E57400B26055 /* SVGAnimateElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832B843519D8E57400B26055 /* SVGAnimateElementBase.cpp */; }; … … 2846 2847 834DD4F41BE08989002C9C3E /* PageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 834DD4F31BE08989002C9C3E /* PageMac.mm */; }; 2847 2848 83520C7E1A71BFCC006BD2AA /* CSSFontFamily.h in Headers */ = {isa = PBXBuildFile; fileRef = 83520C7D1A71BFCC006BD2AA /* CSSFontFamily.h */; }; 2849 8358CB6F1C53277200E0C2D8 /* JSXMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83F570AE1C53268E007FD6CB /* JSXMLDocument.cpp */; }; 2850 8358CB701C53277500E0C2D8 /* JSXMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F570AD1C53268E007FD6CB /* JSXMLDocument.h */; }; 2848 2851 835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 835D363619FF6193004C93AB /* StyleBuilderCustom.h */; }; 2849 2852 836BAD211BD1CA670037356A /* HTMLTableHeaderCellElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 836BAD1F1BD1CA670037356A /* HTMLTableHeaderCellElement.h */; }; … … 10386 10389 830519941BB0F0E700F3772E /* HTMLTimeElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTimeElement.idl; sourceTree = "<group>"; }; 10387 10390 8306EFF01B8BCE7C0031D032 /* NativeNodeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeNodeFilter.cpp; sourceTree = "<group>"; }; 10391 830784B01C52EE1900104D1D /* XMLDocument.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XMLDocument.idl; sourceTree = "<group>"; }; 10392 830784B11C52EE1900104D1D /* XMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLDocument.h; sourceTree = "<group>"; }; 10388 10393 832B843319D8E55100B26055 /* SVGAnimateElementBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimateElementBase.h; sourceTree = "<group>"; }; 10389 10394 832B843519D8E57400B26055 /* SVGAnimateElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimateElementBase.cpp; sourceTree = "<group>"; }; … … 10435 10440 83E959E11B8BC22B004D9385 /* NativeNodeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeNodeFilter.h; sourceTree = "<group>"; }; 10436 10441 83F1206A1B8C103600D75F63 /* JSNodeFilterCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCustom.cpp; sourceTree = "<group>"; }; 10442 83F570AD1C53268E007FD6CB /* JSXMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXMLDocument.h; sourceTree = "<group>"; }; 10443 83F570AE1C53268E007FD6CB /* JSXMLDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLDocument.cpp; sourceTree = "<group>"; }; 10437 10444 83FE5F1F1BD1C55E0038BEEC /* HTMLTableHeaderCellElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableHeaderCellElement.idl; sourceTree = "<group>"; }; 10438 10445 83FE5F201BD1C55E0038BEEC /* HTMLTableDataCellElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTableDataCellElement.idl; sourceTree = "<group>"; }; … … 20608 20615 D7613AC214753E5600DB8606 /* JSWebKitNamedFlow.cpp */, 20609 20616 D7613AC314753E5600DB8606 /* JSWebKitNamedFlow.h */, 20617 83F570AE1C53268E007FD6CB /* JSXMLDocument.cpp */, 20618 83F570AD1C53268E007FD6CB /* JSXMLDocument.h */, 20610 20619 ); 20611 20620 name = Core; … … 24211 24220 85031B3B0A44EFC700F992E0 /* WheelEvent.h */, 24212 24221 93EEC1F709C2877700C515D1 /* WheelEvent.idl */, 24222 830784B11C52EE1900104D1D /* XMLDocument.h */, 24223 830784B01C52EE1900104D1D /* XMLDocument.idl */, 24213 24224 ); 24214 24225 path = dom; … … 25599 25610 7728694F14F8882500F484DC /* EXTTextureFilterAnisotropic.h in Headers */, 25600 25611 A75E8B890E1DE2D6007F2481 /* FEBlend.h in Headers */, 25612 830784B21C52EE2C00104D1D /* XMLDocument.h in Headers */, 25601 25613 A75E8B8B0E1DE2D6007F2481 /* FEColorMatrix.h in Headers */, 25602 25614 A75E8B8D0E1DE2D6007F2481 /* FEComponentTransfer.h in Headers */, … … 26530 26542 B2FA3DCB0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothAbs.h in Headers */, 26531 26543 B2FA3DCD0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothRel.h in Headers */, 26544 8358CB701C53277500E0C2D8 /* JSXMLDocument.h in Headers */, 26532 26545 B2FA3DCF0AB75A6F000E5AC4 /* JSSVGPathSegLinetoAbs.h in Headers */, 26533 26546 B2FA3DD10AB75A6F000E5AC4 /* JSSVGPathSegLinetoHorizontalAbs.h in Headers */, … … 30764 30777 93309E04099E64920056E581 /* RemoveNodeCommand.cpp in Sources */, 30765 30778 93309E06099E64920056E581 /* RemoveNodePreservingChildrenCommand.cpp in Sources */, 30779 8358CB6F1C53277200E0C2D8 /* JSXMLDocument.cpp in Sources */, 30766 30780 7CD494CC1A86EB1D000A87EC /* RenderAttachment.cpp in Sources */, 30767 30781 BCEA485F097D93020094C9E4 /* RenderBlock.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r193426 r195520 138 138 #include "JSWorkerGlobalScopeBase.cpp" 139 139 #include "JSWorkerGlobalScopeCustom.cpp" 140 #include "JSXMLDocument.cpp" 140 141 #include "JSXMLHttpRequestCustom.cpp" 141 142 #include "JSXPathResultCustom.cpp" -
trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp
r195087 r195520 37 37 #include "ScriptController.h" 38 38 #include "TouchList.h" 39 #include "XMLDocument.h" 39 40 #include <wtf/GetPtr.h> 40 41 … … 59 60 else if (document.isSVGDocument()) 60 61 wrapper = CREATE_DOM_WRAPPER(&globalObject, SVGDocument, &document); 62 else if (document.isXMLDocument()) 63 wrapper = CREATE_DOM_WRAPPER(&globalObject, XMLDocument, &document); 61 64 else 62 65 wrapper = CREATE_DOM_WRAPPER(&globalObject, Document, &document); -
trunk/Source/WebCore/dom/DOMImplementation.cpp
r195491 r195520 56 56 #include "Text.h" 57 57 #include "TextDocument.h" 58 #include "XMLDocument.h" 58 59 #include "XMLNames.h" 59 60 #include <wtf/NeverDestroyed.h> … … 221 222 } 222 223 223 RefPtr< Document> DOMImplementation::createDocument(const String& namespaceURI,224 RefPtr<XMLDocument> DOMImplementation::createDocument(const String& namespaceURI, 224 225 const String& qualifiedName, DocumentType* doctype, ExceptionCode& ec) 225 226 { 226 RefPtr< Document> doc;227 RefPtr<XMLDocument> doc; 227 228 if (namespaceURI == SVGNames::svgNamespaceURI) 228 229 doc = SVGDocument::create(0, URL()); 229 230 else if (namespaceURI == HTMLNames::xhtmlNamespaceURI) 230 doc = Document::createXHTML(0, URL());231 doc = XMLDocument::createXHTML(0, URL()); 231 232 else 232 doc = Document::create(0, URL());233 doc = XMLDocument::create(0, URL()); 233 234 234 235 doc->setSecurityOriginPolicy(m_document.securityOriginPolicy()); … … 321 322 return HTMLDocument::create(frame, url); 322 323 if (type == "application/xhtml+xml") 323 return Document::createXHTML(frame, url);324 return XMLDocument::createXHTML(frame, url); 324 325 325 326 #if ENABLE(FTPDIR) … … 372 373 373 374 if (isXMLMIMEType(type)) 374 return Document::create(frame, url);375 return XMLDocument::create(frame, url); 375 376 376 377 return HTMLDocument::create(frame, url); -
trunk/Source/WebCore/dom/DOMImplementation.h
r188193 r195520 27 27 #include "Document.h" 28 28 #include "MediaPlayer.h" 29 #include "XMLDocument.h" 29 30 #include <memory> 30 31 #include <wtf/Forward.h> … … 54 55 static bool hasFeature(const String& feature, const String& version); 55 56 RefPtr<DocumentType> createDocumentType(const String& qualifiedName, const String& publicId, const String& systemId, ExceptionCode&); 56 RefPtr< Document> createDocument(const String& namespaceURI, const String& qualifiedName, DocumentType*, ExceptionCode&);57 RefPtr<XMLDocument> createDocument(const String& namespaceURI, const String& qualifiedName, DocumentType*, ExceptionCode&); 57 58 58 59 DOMImplementation* getInterface(const String& feature); -
trunk/Source/WebCore/dom/DOMImplementation.idl
r195322 r195520 34 34 [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString publicId, 35 35 [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString systemId); 36 [ObjCLegacyUnnamedParameters, RaisesException, NewObject] Document createDocument([TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString namespaceURI, 37 [TreatNullAs=NullString, Default=Undefined] optional DOMString qualifiedName, 38 [TreatNullAs=NullString, Default=Undefined] optional DocumentType doctype); 36 37 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT 38 [ObjCLegacyUnnamedParameters, RaisesException] Document createDocument(optional DOMString namespaceURI, optional DOMString qualifiedName, 39 optional DocumentType doctype); 40 #else 41 [RaisesException, NewObject] XMLDocument createDocument([TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString namespaceURI, 42 [TreatNullAs=NullString, Default=Undefined] optional DOMString qualifiedName, 43 [TreatNullAs=NullString, Default=Undefined] optional DocumentType doctype); 44 #endif 39 45 40 46 // DOMImplementationCSS interface from DOM Level 2 CSS -
trunk/Source/WebCore/dom/Document.cpp
r195496 r195520 168 168 #include "VisitedLinkState.h" 169 169 #include "WheelEvent.h" 170 #include "XMLDocument.h" 170 171 #include "XMLDocumentParser.h" 171 172 #include "XMLNSNames.h" … … 3511 3512 Ref<Document> Document::cloneDocumentWithoutChildren() const 3512 3513 { 3513 return isXHTMLDocument() ? createXHTML(nullptr, url()) : create(nullptr, url()); 3514 if (isXMLDocument()) { 3515 if (isXHTMLDocument()) 3516 return XMLDocument::createXHTML(nullptr, url()); 3517 return XMLDocument::create(nullptr, url()); 3518 } 3519 return create(nullptr, url()); 3514 3520 } 3515 3521 -
trunk/Source/WebCore/dom/Document.h
r195497 r195520 267 267 MediaDocumentClass = 1 << 4, 268 268 SVGDocumentClass = 1 << 5, 269 TextDocumentClass = 1 << 6 269 TextDocumentClass = 1 << 6, 270 XMLDocumentClass = 1 << 7, 270 271 }; 271 272 … … 302 303 return adoptRef(*new Document(frame, url)); 303 304 } 304 static Ref<Document> createXHTML(Frame* frame, const URL& url) 305 { 306 return adoptRef(*new Document(frame, url, XHTMLDocumentClass)); 307 } 305 308 306 static Ref<Document> createNonRenderedPlaceholder(Frame* frame, const URL& url) 309 307 { … … 488 486 bool isHTMLDocument() const { return m_documentClasses & HTMLDocumentClass; } 489 487 bool isXHTMLDocument() const { return m_documentClasses & XHTMLDocumentClass; } 488 bool isXMLDocument() const { return m_documentClasses & XMLDocumentClass; } 490 489 bool isImageDocument() const { return m_documentClasses & ImageDocumentClass; } 491 490 bool isSVGDocument() const { return m_documentClasses & SVGDocumentClass; } -
trunk/Source/WebCore/inspector/DOMPatchSupport.cpp
r194496 r195520 43 43 #include "InspectorHistory.h" 44 44 #include "Node.h" 45 #include "XMLDocument.h" 45 46 #include "XMLDocumentParser.h" 46 47 … … 89 90 newDocument = HTMLDocument::create(nullptr, URL()); 90 91 else if (m_document->isXHTMLDocument()) 91 newDocument = HTMLDocument::createXHTML(nullptr, URL());92 newDocument = XMLDocument::createXHTML(nullptr, URL()); 92 93 else if (m_document->isSVGDocument()) 93 newDocument = Document::create(nullptr, URL());94 newDocument = XMLDocument::create(nullptr, URL()); 94 95 95 96 ASSERT(newDocument); -
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
r194496 r195520 768 768 769 769 Document& document = node->document(); 770 if (!document.isHTMLDocument() && !document.isX HTMLDocument() && !document.isSVGDocument()) {770 if (!document.isHTMLDocument() && !document.isXMLDocument()) { 771 771 errorString = ASCIILiteral("Not an HTML/XML document"); 772 772 return; -
trunk/Source/WebCore/page/DOMWindow.idl
r189873 r195520 199 199 [CustomGetter, CustomConstructor] attribute HTMLImageElementNamedConstructor Image; // Usable with new operator 200 200 201 // Mozilla has a separate XMLDocument object for XML documents.202 // We just use Document for this.203 attribute DocumentConstructor XMLDocument;204 205 201 [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchConstructor Touch; // Usable with the new operator 206 202 [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchListConstructor TouchList; // Usable with the new operator -
trunk/Source/WebCore/page/PageSerializer.cpp
r185167 r195520 117 117 { 118 118 // MarkupAccumulator does not serialize the <?xml ... line, so we add it explicitely to ensure the right encoding is specified. 119 if (m_document.isX HTMLDocument() || m_document.xmlStandalone() || m_document.isSVGDocument())119 if (m_document.isXMLDocument() || m_document.xmlStandalone()) 120 120 appendString("<?xml version=\"" + m_document.xmlVersion() + "\" encoding=\"" + m_document.charset() + "\"?>"); 121 121 } -
trunk/Source/WebCore/svg/SVGDocument.cpp
r179982 r195520 29 29 30 30 SVGDocument::SVGDocument(Frame* frame, const URL& url) 31 : Document(frame, url, SVGDocumentClass)31 : XMLDocument(frame, url, SVGDocumentClass) 32 32 { 33 33 } -
trunk/Source/WebCore/svg/SVGDocument.h
r179982 r195520 23 23 #define SVGDocument_h 24 24 25 #include " Document.h"25 #include "XMLDocument.h" 26 26 27 27 namespace WebCore { … … 29 29 class SVGSVGElement; 30 30 31 class SVGDocument final : public Document {31 class SVGDocument final : public XMLDocument { 32 32 public: 33 33 static Ref<SVGDocument> create(Frame*, const URL&); -
trunk/Source/WebCore/svg/SVGDocument.idl
r163440 r195520 20 20 */ 21 21 22 interface SVGDocument : Document { 22 // FIXME: This interface no longer exists in SVG2. 23 interface SVGDocument : XMLDocument { 23 24 readonly attribute SVGSVGElement rootElement; 24 25 -
trunk/Source/WebCore/xml/XMLHttpRequest.cpp
r195452 r195520 217 217 m_responseDocument = HTMLDocument::create(0, m_url); 218 218 else 219 m_responseDocument = Document::create(0, m_url);219 m_responseDocument = XMLDocument::create(0, m_url); 220 220 // FIXME: Set Last-Modified. 221 221 m_responseDocument->setContent(m_responseBuilder.toStringPreserveCapacity()); -
trunk/Source/WebCore/xml/XSLTProcessor.cpp
r189776 r195520 41 41 #include "Text.h" 42 42 #include "TextResourceDecoder.h" 43 #include "XMLDocument.h" 43 44 #include "markup.h" 44 45 … … 78 79 RefPtr<Document> result; 79 80 if (sourceMIMEType == "text/plain") { 80 result = Document::createXHTML(frame, sourceIsDocument ? ownerDocument->url() : URL());81 result = XMLDocument::createXHTML(frame, sourceIsDocument ? ownerDocument->url() : URL()); 81 82 transformTextStringToXHTMLDocumentString(documentSource); 82 83 } else
Note: See TracChangeset
for help on using the changeset viewer.