Changeset 56412 in webkit

Timestamp:

Mar 23, 2010 1:48:19 PM (14 years ago)

Author:

Darin Adler

Message:

2010-03-23 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

Reduce and straighten internal use of DOMImplementation
​https://bugs.webkit.org/show_bug.cgi?id=36501

• WebCore.xcodeproj/project.pbxproj: Xcode decided to re-sort this file.

• dom/Clipboard.cpp: Removed unneeded include of DOMImplementation.h.

• dom/DOMImplementation.cpp: Removed unneeded createDocument and createHTMLDocument functions. These should be done directly instead of involving the DOMImplementation class.
• dom/DOMImplementation.h: Ditto.

• dom/DocumentType.cpp: Removed unneeded include of DOMImplementation.h.

• html/HTMLViewSourceDocument.cpp: (WebCore::HTMLViewSourceDocument::createTokenizer): Don't allocate a DOMImplementation object just to use a class member function.

• loader/CachedFont.cpp: Removed unneeded include of DOMImplementation.h.

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseXML): Use Document::create to create a new document instead of involving DOMImplementation.
• xml/XSLTProcessor.cpp: (WebCore::XSLTProcessor::createDocumentFromSource): Ditto. And in the case where we do need to call DOMImplementation to interpret the MIME type, don't allocate a DOMImplementation object just to use a class member function.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• dom/Clipboard.cpp (modified) (1 diff)
• dom/DOMImplementation.cpp (modified) (1 diff)
• dom/DOMImplementation.h (modified) (1 diff)
• dom/DocumentType.cpp (modified) (1 diff)
• html/HTMLViewSourceDocument.cpp (modified) (1 diff)
• loader/CachedFont.cpp (modified) (1 diff)
• xml/XMLHttpRequest.cpp (modified) (1 diff)
• xml/XSLTProcessor.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-23  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Reduce and straighten internal use of DOMImplementation
+        https://bugs.webkit.org/show_bug.cgi?id=36501
+
+        * WebCore.xcodeproj/project.pbxproj: Xcode decided to
+        re-sort this file.
+
+        * dom/Clipboard.cpp: Removed unneeded include of DOMImplementation.h.
+
+        * dom/DOMImplementation.cpp: Removed unneeded createDocument and
+        createHTMLDocument functions. These should be done directly instead
+        of involving the DOMImplementation class.
+        * dom/DOMImplementation.h: Ditto.
+
+        * dom/DocumentType.cpp: Removed unneeded include of DOMImplementation.h.
+
+        * html/HTMLViewSourceDocument.cpp:
+        (WebCore::HTMLViewSourceDocument::createTokenizer): Don't allocate a
+        DOMImplementation object just to use a class member function.
+
+        * loader/CachedFont.cpp: Removed unneeded include of DOMImplementation.h.
+
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::responseXML): Use Document::create to create a
+        new document instead of involving DOMImplementation.
+        * xml/XSLTProcessor.cpp:
+        (WebCore::XSLTProcessor::createDocumentFromSource): Ditto. And in the case
+        where we do need to call DOMImplementation to interpret the MIME type,
+        don't allocate a DOMImplementation object just to use a class member
+        function.
+
 2010-03-23  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2488 +2488 @@
                 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */; };
                 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304E11184B4100AD0126 /* ScriptProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */; };
+                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */ = {isa = PBXBuildFile; fileRef = A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */; };
                 A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
                 A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
@@ -4396 +4398 @@
                 BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */; };
                 BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772C450C4EB2C60083285F /* XMLHttpRequest.h */; };
-                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */; };
-                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */ = {isa = PBXBuildFile; fileRef = A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */; };
                 BC772C4E0C4EB3040083285F /* MIMETypeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */; };
                 BC772C4F0C4EB3040083285F /* MIMETypeRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };

trunk/WebCore/dom/Clipboard.cpp

@@ -28 +28 @@
 
 #include "CachedImage.h"
-#include "DOMImplementation.h"
 #include "Frame.h"
 #include "FrameLoader.h"

trunk/WebCore/dom/DOMImplementation.cpp

@@ -274 +274 @@
 }
 
-PassRefPtr<Document> DOMImplementation::createDocument(Frame* frame)
-{
-    return Document::create(frame);
-}
-
-PassRefPtr<HTMLDocument> DOMImplementation::createHTMLDocument(Frame* frame)
-{
-    return HTMLDocument::create(frame);
-}
-
 bool DOMImplementation::isXMLMIMEType(const String& mimeType)
 {

trunk/WebCore/dom/DOMImplementation.h

@@ -58 +58 @@
     // Other methods (not part of DOM)
     static PassRefPtr<Document> createDocument(const String& MIMEType, Frame*, bool inViewSourceMode);
-    static PassRefPtr<Document> createDocument(Frame*);
-    static PassRefPtr<HTMLDocument> createHTMLDocument(Frame*);
 
     static bool isXMLMIMEType(const String& MIMEType);

trunk/WebCore/dom/DocumentType.cpp

@@ -24 +24 @@
 #include "DocumentType.h"
 
-#include "DOMImplementation.h"
 #include "Document.h"
 #include "NamedNodeMap.h"

trunk/WebCore/html/HTMLViewSourceDocument.cpp

@@ -55 +55 @@
 {
     // Use HTMLTokenizer if applicable, otherwise use TextTokenizer.
-    if (m_type == "text/html" || m_type == "application/xhtml+xml" || m_type == "image/svg+xml" || implementation()->isXMLMIMEType(m_type)
+    if (m_type == "text/html" || m_type == "application/xhtml+xml" || m_type == "image/svg+xml" || DOMImplementation::isXMLMIMEType(m_type)
 #if ENABLE(XHTMLMP)
         || m_type == "application/vnd.wap.xhtml+xml"

trunk/WebCore/loader/CachedFont.cpp

@@ -35 +35 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
-#include "DOMImplementation.h"
 #include "FontPlatformData.h"
 #include "SharedBuffer.h"

trunk/WebCore/xml/XMLHttpRequest.cpp

@@ -217 +217 @@
             m_responseXML = 0;
         } else {
-            m_responseXML = document()->implementation()->createDocument(0);
+            m_responseXML = Document::create(0);
             m_responseXML->open();
             m_responseXML->setURL(m_url);

trunk/WebCore/xml/XSLTProcessor.cpp

@@ -70 +70 @@
     RefPtr<Document> result;
     if (sourceMIMEType == "text/plain") {
-        result = ownerDocument->implementation()->createDocument(frame);
+        result = Document::create(frame);
         transformTextStringToXHTMLDocumentString(documentSource);
     } else
-        result = ownerDocument->implementation()->createDocument(sourceMIMEType, frame, false);
+        result = DOMImplementation::createDocument(sourceMIMEType, frame, false);
 
     // Before parsing, we need to save & detach the old document and get the new document