Changeset 108929 in webkit

Timestamp:

Feb 25, 2012 11:05:20 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

Get rid of KURL::deprecatedString()
​https://bugs.webkit.org/show_bug.cgi?id=79594

Reviewed by Andreas Kling.

The method KURL::deprecatedString() is unused, remove it from WebCore.

The last reference to the method was removed in r96779.

• platform/KURL.cpp:

(WebCore):

• platform/KURL.h:

(KURL):

• platform/KURLGoogle.cpp:

(WebCore):

• platform/KURLWTFURL.cpp:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/KURL.cpp (modified) (1 diff)
• platform/KURL.h (modified) (1 diff)
• platform/KURLGoogle.cpp (modified) (1 diff)
• platform/KURLWTFURL.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-25  Benjamin Poulain  <benjamin@webkit.org>
+
+        Get rid of KURL::deprecatedString()
+        https://bugs.webkit.org/show_bug.cgi?id=79594
+
+        Reviewed by Andreas Kling.
+
+        The method KURL::deprecatedString() is unused, remove it from WebCore.
+
+        The last reference to the method was removed in r96779.
+
+        * platform/KURL.cpp:
+        (WebCore):
+        * platform/KURL.h:
+        (KURL):
+        * platform/KURLGoogle.cpp:
+        (WebCore):
+        * platform/KURLWTFURL.cpp:
+        (WebCore):
+
 2012-02-25  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/platform/KURL.cpp

@@ -848 +848 @@
 }
 
-String KURL::deprecatedString() const
-{
-    if (!m_isValid)
-        return m_string;
-
-    StringBuilder result;
-
-    result.append(protocol());
-    result.append(':');
-
-    StringBuilder authority;
-
-    if (m_hostEnd != m_passwordEnd) {
-        if (m_userEnd != m_userStart) {
-            authority.append(user());
-            authority.append('@');
-        }
-        authority.append(host());
-        if (hasPort()) {
-            authority.append(':');
-            authority.append(String::number(port()));
-        }
-    }
-
-    if (!authority.isEmpty()) {
-        result.append('/');
-        result.append('/');
-        result.append(authority.characters(), authority.length());
-    } else if (protocolIs("file")) {
-        result.append('/');
-        result.append('/');
-    }
-
-    result.append(path());
-
-    if (m_pathEnd != m_queryEnd) {
-        result.append('?');
-        result.append(query());
-    }
-
-    if (m_fragmentEnd != m_queryEnd) {
-        result.append('#');
-        result.append(fragmentIdentifier());
-    }
-
-    return result.toString();
-}
-
 String decodeURLEscapeSequences(const String& string)
 {

trunk/Source/WebCore/platform/KURL.h

@@ -148 +148 @@
     String baseAsString() const;
 
-    // This function is only used by location.href. It's likely we shouldn't
-    // use it for that purpose, but more study is necessary before we remove it.
-    String deprecatedString() const;
     String fileSystemPath() const;
 

trunk/Source/WebCore/platform/KURLGoogle.cpp

@@ -772 +772 @@
 }
 
-// On Mac, this just seems to return the same URL, but with "/foo/bar" for
-// file: URLs instead of file:///foo/bar. We don't bother with any of this,
-// at least for now.
-String KURL::deprecatedString() const
-{
-    if (!m_url.m_isValid)
-        return String();
-    return m_url.string();
-}
-
 String decodeURLEscapeSequences(const String& str)
 {

trunk/Source/WebCore/platform/KURLWTFURL.cpp

@@ -154 +154 @@
 }
 
-String KURL::deprecatedString() const
-{
-    // FIXME: Add WTFURL Implementation.
-    return String();
-}
-
 String KURL::fileSystemPath() const
 {