Changeset 102080 in webkit

Timestamp:

Dec 5, 2011, 5:51:27 PM (15 years ago)

Author:

benjamin@webkit.org

Message:

Get rid of KURL::KURL(ParsedURLStringTag, const char*);
​https://bugs.webkit.org/show_bug.cgi?id=73792

Reviewed by Andreas Kling.

In all cases where the constructor is used, the constructor
taking a String is as effective because the string is valid and converted
to String for m_string.

This patch remove the constructor KURL::KURL(ParsedURLStringTag, const char*)
and change the call sites that were using that constructor to build
empty URLs.

• dom/Document.cpp:

(WebCore::Document::initSecurityContext):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::init):

• loader/archive/cf/LegacyWebArchive.cpp:

(WebCore::LegacyWebArchive::create):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::createWindow):

• platform/KURL.cpp:
• platform/KURL.h:
• platform/KURLGoogle.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/archive/cf/LegacyWebArchive.cpp (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)
• platform/KURL.cpp (modified) (1 diff)
• platform/KURL.h (modified) (1 diff)
• platform/KURLGoogle.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-05  Benjamin Poulain  <benjamin@webkit.org>
+
+        Get rid of KURL::KURL(ParsedURLStringTag, const char*);
+        https://bugs.webkit.org/show_bug.cgi?id=73792
+
+        Reviewed by Andreas Kling.
+
+        In all cases where the constructor is used, the constructor
+        taking a String is as effective because the string is valid and converted
+        to String for m_string.
+
+        This patch remove the constructor KURL::KURL(ParsedURLStringTag, const char*)
+        and change the call sites that were using that constructor to build
+        empty URLs.
+
+        * dom/Document.cpp:
+        (WebCore::Document::initSecurityContext):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::init):
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::create):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::createWindow):
+        * platform/KURL.cpp:
+        * platform/KURL.h:
+        * platform/KURLGoogle.cpp:
+
 2011-12-05  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4473 +4473 @@
         // No source for a security context.
         // This can occur via document.implementation.createDocument().
-        m_cookieURL = KURL(ParsedURLString, "");
+        m_cookieURL = KURL(ParsedURLString, emptyString());
         setSecurityOrigin(SecurityOrigin::createUnique());
         setContentSecurityPolicy(ContentSecurityPolicy::create(this));

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -221 +221 @@
     // It would be better if this could be done with even fewer steps.
     m_stateMachine.advanceTo(FrameLoaderStateMachine::CreatingInitialEmptyDocument);
-    setPolicyDocumentLoader(m_client->createDocumentLoader(ResourceRequest(KURL(ParsedURLString, "")), SubstituteData()).get());
+    setPolicyDocumentLoader(m_client->createDocumentLoader(ResourceRequest(KURL(ParsedURLString, emptyString())), SubstituteData()).get());
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     setState(FrameStateProvisional);

trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

@@ -508 +508 @@
     // <rdar://problem/5454935>
     if (responseURL.isNull())
-        responseURL = KURL(ParsedURLString, "");
+        responseURL = KURL(ParsedURLString, emptyString());
         
     PassRefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree()->uniqueName());

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1814 +1814 @@
     String referrer = firstFrame->loader()->outgoingReferrer();
 
-    KURL completedURL = urlString.isEmpty() ? KURL(ParsedURLString, "") : firstFrame->document()->completeURL(urlString);
+    KURL completedURL = urlString.isEmpty() ? KURL(ParsedURLString, emptyString()) : firstFrame->document()->completeURL(urlString);
     ResourceRequest request(completedURL, referrer);
     FrameLoader::addHTTPOriginIfNeeded(request, firstFrame->loader()->outgoingOrigin());

trunk/Source/WebCore/platform/KURL.cpp

@@ -321 +321 @@
 }
 
-KURL::KURL(ParsedURLStringTag, const char* url)
-{
-    parse(url);
-    ASSERT(url == m_string);
-}
-
 KURL::KURL(ParsedURLStringTag, const String& url)
 {

trunk/Source/WebCore/platform/KURL.h

@@ -74 +74 @@
     // KURL object, or indiscernible from such.
     // It is usually best to avoid repeatedly parsing a string, unless memory saving outweigh the possible slow-downs.
-    KURL(ParsedURLStringTag, const char*);
     KURL(ParsedURLStringTag, const String&);
     KURL(ParsedURLStringTag, const URLString&);

trunk/Source/WebCore/platform/KURLGoogle.cpp

@@ -342 +342 @@
 // KURL ------------------------------------------------------------------------
 
-// Creates with null-terminated string input representing an absolute URL.
-// WebCore generally calls this only with hardcoded strings, so the input is
-// ASCII. We treat it as UTF-8 just in case.
-KURL::KURL(ParsedURLStringTag, const char *url)
-{
-    // FIXME The Mac code checks for beginning with a slash and converts it to
-    // file: URL. We will want to add this as well once we can compile on a
-    // system like that.
-    m_url.init(KURL(), url, strlen(url), 0);
-
-    // The one-argument constructors should never generate a null string.
-    // This is a funny quirk of KURL.cpp (probably a bug) which we preserve.
-    if (m_url.utf8String().isNull())
-        m_url.setAscii(CString("", 0));
-}
-
 // Initializes with a string representing an absolute URL. No encoding
 // information is specified. This generally happens when a KURL is converted