Changeset 147766 in webkit

Timestamp:

Apr 5, 2013 11:18:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Remove WTF_USE_GOOGLEURL-guarded code
​https://bugs.webkit.org/show_bug.cgi?id=114028

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2013-04-05
Reviewed by Ryosuke Niwa.

Source/WebCore:

The only remaining usage of the USE(GOOGLEURL) guards is in LinkHashChromium.cpp that will
get removed when purging the Source/WebCore/platform/chromium directory.

• config.h: Remove the define that was Chromium-specific.
• platform/KURL.cpp:

(WebCore):
(WebCore::KURL::reportMemoryUsage):
(WebCore::KURL::isSafeToSendToAnotherThread):

• platform/KURL.h:

(KURL):

• platform/KURLGoogle.cpp: Removed.
• platform/KURLGooglePrivate.h: Removed.

Source/WebKit/blackberry:

• WebCoreSupport/AboutDataUseFeatures.in: Remove GOOGLEURL from the list.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/config.h (modified) (1 diff)
• WebCore/platform/KURL.cpp (modified) (3 diffs)
• WebCore/platform/KURL.h (modified) (9 diffs)
• WebCore/platform/KURLGoogle.cpp (deleted)
• WebCore/platform/KURLGooglePrivate.h (deleted)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Remove WTF_USE_GOOGLEURL-guarded code
+        https://bugs.webkit.org/show_bug.cgi?id=114028
+
+        Reviewed by Ryosuke Niwa.
+
+        The only remaining usage of the USE(GOOGLEURL) guards is in LinkHashChromium.cpp that will
+        get removed when purging the Source/WebCore/platform/chromium directory.
+
+        * config.h: Remove the define that was Chromium-specific.
+        * platform/KURL.cpp:
+        (WebCore):
+        (WebCore::KURL::reportMemoryUsage):
+        (WebCore::KURL::isSafeToSendToAnotherThread):
+        * platform/KURL.h:
+        (KURL):
+        * platform/KURLGoogle.cpp: Removed.
+        * platform/KURLGooglePrivate.h: Removed.
+
 2013-04-05  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/config.h

@@ -128 +128 @@
 #define WTF_CHANGES 1
 
-#define WTF_USE_GOOGLEURL 1
-
 #endif /* PLATFORM(CHROMIUM) */
 

trunk/Source/WebCore/platform/KURL.cpp

@@ -65 +65 @@
     return (character | 0x20) == lowercaseLetter;
 }
-
-#if !USE(GOOGLEURL)
 
 static const char wsScheme[] = {'w', 's'};
@@ -1717 +1715 @@
 #endif
 
-#endif // !USE(GOOGLEURL)
-
 String KURL::strippedForUseAsReferrer() const
 {
@@ -1904 +1900 @@
 {
     MemoryClassInfo info(memoryObjectInfo, this);
-#if USE(GOOGLEURL)
-    info.addMember(m_url, "url");
-#else // !USE(GOOGLEURL)
     info.addMember(m_string, "string");
-#endif
 }
 
 bool KURL::isSafeToSendToAnotherThread() const
 {
-#if USE(GOOGLEURL)
-    return m_url.isSafeToSendToAnotherThread();
-#else // !USE(GOOGLEURL)
     return m_string.isSafeToSendToAnotherThread();
-#endif
 }
 

trunk/Source/WebCore/platform/KURL.h

@@ -45 +45 @@
 #endif
 
-#if USE(GOOGLEURL)
-#include "KURLGooglePrivate.h"
-#endif
-
 namespace WebCore {
 
@@ -65 +61 @@
     // It is usually best to avoid repeatedly parsing a string, unless memory saving outweigh the possible slow-downs.
     KURL(ParsedURLStringTag, const String&);
-#if USE(GOOGLEURL)
-    explicit KURL(WTF::HashTableDeletedValueType) : m_url(WTF::HashTableDeletedValue) { }
-#else
     explicit KURL(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { }
-#endif
     bool isHashTableDeletedValue() const { return string().isHashTableDeletedValue(); }
 
@@ -82 +74 @@
     KURL(const KURL& base, const String& relative, const TextEncoding&);
 
-#if USE(GOOGLEURL)
-    // For conversions from other structures that have already parsed and
-    // canonicalized the URL. The input must be exactly what KURL would have
-    // done with the same input.
-    KURL(const CString& canonicalSpec, const url_parse::Parsed&, bool isValid);
-#endif
-
     String strippedForUseAsReferrer() const;
 
@@ -116 +101 @@
     bool isHierarchical() const;
 
-#if USE(GOOGLEURL)
-    const String& string() const { return m_url.string(); }
-#else
     const String& string() const { return m_string; }
-#endif
 
     String elidedString() const;
@@ -203 +184 @@
 #endif
 
-#if USE(GOOGLEURL)
-    // Getters for the parsed structure and its corresponding 8-bit string.
-    const url_parse::Parsed& parsed() const { return m_url.m_parsed; }
-    const CString& utf8String() const { return m_url.utf8String(); }
-#endif
-
-
-#if USE(GOOGLEURL)
-    const KURL* innerURL() const { return m_url.innerURL(); }
-#else
     const KURL* innerURL() const { return 0; }
-#endif
 
 #ifndef NDEBUG
@@ -226 +196 @@
     void invalidate();
     static bool protocolIs(const String&, const char*);
-#if USE(GOOGLEURL)
-    friend class KURLGooglePrivate;
-    KURLGooglePrivate m_url;
-#else  // !USE(GOOGLEURL)
     void init(const KURL&, const String&, const TextEncoding&);
     void copyToBuffer(Vector<char, 512>& buffer) const;
@@ -253 +219 @@
     int m_queryEnd;
     int m_fragmentEnd;
-#endif
 };
 
@@ -324 +289 @@
 }
 
-#if !USE(GOOGLEURL)
-
 // Inline versions of some non-GoogleURL functions so we can get inlining
 // without having to have a lot of ugly ifdefs in the class definition.
@@ -383 +346 @@
     return m_pathAfterLastSlash;
 }
-
-#endif // !USE(GOOGLEURL)
 
 } // namespace WebCore

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Remove WTF_USE_GOOGLEURL-guarded code
+        https://bugs.webkit.org/show_bug.cgi?id=114028
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebCoreSupport/AboutDataUseFeatures.in: Remove GOOGLEURL from the list.
+
 2013-04-04  Jacky Jiang  <zhajiang@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in

@@ -37 +37 @@
 GLIB_UNICODE
 GLX
-GOOGLEURL
 GRAMMAR_CHECKING
 GRAPHICS_SURFACE