Changeset 224984 in webkit

Timestamp:

Nov 17, 2017 1:38:11 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Clean up URL.h
​https://bugs.webkit.org/show_bug.cgi?id=179710

Reviewed by Brady Eidson.

No change in behavior.

• Modules/fetch/FetchRequest.cpp:

(WebCore::FetchRequest::urlString const):

• Modules/fetch/FetchResponse.cpp:

(WebCore::FetchResponse::url const):

• platform/URL.cpp:

(WebCore::URL::serialize const): Deleted.

• platform/URL.h:
• platform/mac/URLMac.mm:

(WebCore::URL::createCFURL const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/fetch/FetchRequest.cpp (modified) (1 diff)
• Modules/fetch/FetchResponse.cpp (modified) (1 diff)
• platform/URL.cpp (modified) (1 diff)
• platform/URL.h (modified) (3 diffs)
• platform/mac/URLMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-17  Alex Christensen  <achristensen@webkit.org>
+
+        Clean up URL.h
+        https://bugs.webkit.org/show_bug.cgi?id=179710
+
+        Reviewed by Brady Eidson.
+
+        No change in behavior.
+
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::urlString const):
+        * Modules/fetch/FetchResponse.cpp:
+        (WebCore::FetchResponse::url const):
+        * platform/URL.cpp:
+        (WebCore::URL::serialize const): Deleted.
+        * platform/URL.h:
+        * platform/mac/URLMac.mm:
+        (WebCore::URL::createCFURL const):
+
 2017-11-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp

@@ -264 +264 @@
 {
     if (m_requestURL.isNull())
-        m_requestURL = m_request.url().serialize();
+        m_requestURL = m_request.url();
     return m_requestURL;
 }

trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp

@@ -187 +187 @@
 const String& FetchResponse::url() const
 {
-    if (m_responseURL.isNull())
-        m_responseURL = m_response.url().serialize(true);
+    if (m_responseURL.isNull()) {
+        URL url = m_response.url();
+        url.removeFragmentIdentifier();
+        m_responseURL = url.string();
+    }
     return m_responseURL;
 }

trunk/Source/WebCore/platform/URL.cpp

@@ -685 +685 @@
         return string;
     return decodeEscapeSequences<URLEscapeSequence>(string, encoding);
-}
-
-String URL::serialize(bool omitFragment) const
-{
-    if (omitFragment)
-        return m_string.left(m_queryEnd);
-    return m_string;
 }
 

trunk/Source/WebCore/platform/URL.h

@@ -208 +208 @@
     template <class Decoder> static std::optional<URL> decode(Decoder&);
 
-    String serialize(bool omitFragment = false) const;
-
 private:
     friend class URLParser;
@@ -216 +214 @@
     void init(const URL&, const String&, const TextEncoding&);
     void copyToBuffer(Vector<char, 512>& buffer) const;
-
-    // Parses the given URL. The originalString parameter allows for an
-    // optimization: When the source is the same as the fixed-up string,
-    // it will use the passed-in string instead of allocating a new one.
-    void parse(const String&);
-    void parse(const char* url, const String* originalString = 0);
 
     bool hasPath() const;
@@ -465 +457 @@
 namespace WTF {
 
-    // URLHash is the default hash for String
-    template<typename T> struct DefaultHash;
-    template<> struct DefaultHash<WebCore::URL> {
-        typedef WebCore::URLHash Hash;
-    };
+// URLHash is the default hash for String
+template<typename T> struct DefaultHash;
+template<> struct DefaultHash<WebCore::URL> {
+    typedef WebCore::URLHash Hash;
+};
 
 } // namespace WTF

trunk/Source/WebCore/platform/mac/URLMac.mm

@@ -58 +58 @@
 {
     if (isNull())
-        return 0;
+        return nullptr;
 
     if (isEmpty()) {
@@ -75 +75 @@
 }
 
-
-
 }