Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

3 files changed, 6 insertions, 22 deletions

diff --git a/Source/WebCore/xml/DOMParser.cpp b/Source/WebCore/xml/DOMParser.cpp
index e6aa3b0..c0d146c 100644
--- a/Source/WebCore/xml/DOMParser.cpp
+++ b/Source/WebCore/xml/DOMParser.cpp
@@ -24,20 +24,15 @@
 #include "PlatformString.h"
 
 namespace WebCore {
-    
+
 PassRefPtr<Document> DOMParser::parseFromString(const String& str, const String& contentType)
 {
     if (!DOMImplementation::isXMLMIMEType(contentType))
         return 0;
 
     RefPtr<Document> doc = DOMImplementation::createDocument(contentType, 0, KURL(), false);
-
-    doc->open();
-    doc->write(str);
-    doc->finishParsing();
-    doc->close();
-        
+    doc->setContent(str);
     return doc.release();
 }
 
-}
+} // namespace WebCore
diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index fc7eb9e..ee9e20f 100644
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -35,7 +35,6 @@
 #include "EventNames.h"
 #include "File.h"
 #include "HTTPParsers.h"
-#include "InspectorController.h"
 #include "InspectorInstrumentation.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
@@ -245,12 +244,8 @@ Document* XMLHttpRequest::responseXML(ExceptionCode& ec)
             m_responseXML = 0;
         } else {
             m_responseXML = Document::create(0, m_url);
-            m_responseXML->open();
             // FIXME: Set Last-Modified.
-            m_responseXML->write(m_responseBuilder.toStringPreserveCapacity());
-            m_responseXML->finishParsing();
-            m_responseXML->close();
-
+            m_responseXML->setContent(m_responseBuilder.toStringPreserveCapacity());
             if (!m_responseXML->wellFormed())
                 m_responseXML = 0;
         }
@@ -1002,10 +997,7 @@ void XMLHttpRequest::didFinishLoading(unsigned long identifier)
     // FIXME: Set m_responseBlob to something here in the ResponseTypeBlob case.
 #endif
 
-#if ENABLE(INSPECTOR)
-    if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
-        inspector->resourceRetrievedByXMLHttpRequest(identifier, m_responseBuilder.toStringPreserveCapacity(), m_url, m_lastSendURL, m_lastSendLineNumber);
-#endif
+    InspectorInstrumentation::resourceRetrievedByXMLHttpRequest(scriptExecutionContext(), identifier, m_responseBuilder.toStringPreserveCapacity(), m_url, m_lastSendURL, m_lastSendLineNumber);
 
     bool hadLoader = m_loader;
     m_loader = 0;
diff --git a/Source/WebCore/xml/XSLTProcessor.cpp b/Source/WebCore/xml/XSLTProcessor.cpp
index 9b6a067..fe5f420 100644
--- a/Source/WebCore/xml/XSLTProcessor.cpp
+++ b/Source/WebCore/xml/XSLTProcessor.cpp
@@ -88,14 +88,11 @@ PassRefPtr<Document> XSLTProcessor::createDocumentFromSource(const String& sourc
         frame->setDocument(result);
     }
 
-    result->open();
-
     RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(sourceMIMEType);
     decoder->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : TextEncoding(sourceEncoding), TextResourceDecoder::EncodingFromXMLHeader);
     result->setDecoder(decoder.release());
 
-    result->write(documentSource);
-    result->close();
+    result->setContent(documentSource);
 
     return result.release();
 }