Changeset 291730 in webkit

Timestamp:

Mar 22, 2022, 5:58:41 PM (5 years ago)

Author:

Chris Dumez

Message:

Add URL::stringWithoutFragmentIdentifier() overload which returns a String instead of a StringView
​https://bugs.webkit.org/show_bug.cgi?id=238221

Reviewed by Geoffrey Garen.

Source/WebCore:

• page/History.cpp:

(WebCore::History::stateObjectAdded):

• platform/network/BlobRegistryImpl.cpp:

(WebCore::BlobRegistryImpl::getBlobDataFromURL const):
(WebCore::BlobRegistryImpl::registerBlobURLHandle):
(WebCore::BlobRegistryImpl::unregisterBlobURLHandle):
(WebCore::blobURLWithoutFragment): Deleted.

Source/WTF:

• wtf/URL.cpp:

(WTF::URL::viewWithoutQueryOrFragmentIdentifier const):
(WTF::URL::viewWithoutFragmentIdentifier const):
(WTF::URL::stringWithoutFragmentIdentifier const):
(WTF::equalIgnoringFragmentIdentifier):
(WTF::URL::stringWithoutQueryOrFragmentIdentifier const): Deleted.

• wtf/URL.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/URL.cpp (modified) (3 diffs)
• WTF/wtf/URL.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/History.cpp (modified) (1 diff)
• WebCore/platform/network/BlobRegistryImpl.cpp (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2022-03-22  Chris Dumez  <cdumez@apple.com>
+
+        Add URL::stringWithoutFragmentIdentifier() overload which returns a String instead of a StringView
+        https://bugs.webkit.org/show_bug.cgi?id=238221
+
+        Reviewed by Geoffrey Garen.
+
+        * wtf/URL.cpp:
+        (WTF::URL::viewWithoutQueryOrFragmentIdentifier const):
+        (WTF::URL::viewWithoutFragmentIdentifier const):
+        (WTF::URL::stringWithoutFragmentIdentifier const):
+        (WTF::equalIgnoringFragmentIdentifier):
+        (WTF::URL::stringWithoutQueryOrFragmentIdentifier const): Deleted.
+        * wtf/URL.h:
+
 2022-03-22  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WTF/wtf/URL.cpp

@@ -709 +709 @@
 }
 
-StringView URL::stringWithoutQueryOrFragmentIdentifier() const
+StringView URL::viewWithoutQueryOrFragmentIdentifier() const
 {
     if (!m_isValid)
@@ -717 +717 @@
 }
 
-StringView URL::stringWithoutFragmentIdentifier() const
+StringView URL::viewWithoutFragmentIdentifier() const
 {
     if (!m_isValid)
@@ -725 +725 @@
 }
 
+String URL::stringWithoutFragmentIdentifier() const
+{
+    if (!m_isValid)
+        return m_string;
+
+    return m_string.left(m_queryEnd);
+}
+
 bool equalIgnoringFragmentIdentifier(const URL& a, const URL& b)
 {
-    return a.stringWithoutFragmentIdentifier() == b.stringWithoutFragmentIdentifier();
+    return a.viewWithoutFragmentIdentifier() == b.viewWithoutFragmentIdentifier();
 }
 

trunk/Source/WTF/wtf/URL.h

@@ -118 +118 @@
     WTF_EXPORT_PRIVATE StringView queryWithLeadingQuestionMark() const;
     WTF_EXPORT_PRIVATE StringView fragmentIdentifierWithLeadingNumberSign() const;
-    WTF_EXPORT_PRIVATE StringView stringWithoutQueryOrFragmentIdentifier() const;
-    WTF_EXPORT_PRIVATE StringView stringWithoutFragmentIdentifier() const;
+    WTF_EXPORT_PRIVATE StringView viewWithoutQueryOrFragmentIdentifier() const;
+    WTF_EXPORT_PRIVATE StringView viewWithoutFragmentIdentifier() const;
+    WTF_EXPORT_PRIVATE String stringWithoutFragmentIdentifier() const;
 
     WTF_EXPORT_PRIVATE String protocolHostAndPort() const;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-22  Chris Dumez  <cdumez@apple.com>
+
+        Add URL::stringWithoutFragmentIdentifier() overload which returns a String instead of a StringView
+        https://bugs.webkit.org/show_bug.cgi?id=238221
+
+        Reviewed by Geoffrey Garen.
+
+        * page/History.cpp:
+        (WebCore::History::stateObjectAdded):
+        * platform/network/BlobRegistryImpl.cpp:
+        (WebCore::BlobRegistryImpl::getBlobDataFromURL const):
+        (WebCore::BlobRegistryImpl::registerBlobURLHandle):
+        (WebCore::BlobRegistryImpl::unregisterBlobURLHandle):
+        (WebCore::blobURLWithoutFragment): Deleted.
+
 2022-03-22  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/page/History.cpp

@@ -209 +209 @@
     // See https://bugs.webkit.org/show_bug.cgi?id=183028 for the compatibility concerns.
     bool allowSandboxException = (documentSecurityOrigin.isLocal() || documentSecurityOrigin.isUnique())
-        && documentURL.stringWithoutQueryOrFragmentIdentifier() == fullURL.stringWithoutQueryOrFragmentIdentifier();
+        && documentURL.viewWithoutQueryOrFragmentIdentifier() == fullURL.viewWithoutQueryOrFragmentIdentifier();
 
     if (!allowSandboxException && !documentSecurityOrigin.canRequest(fullURL) && (fullURL.path() != documentURL.path() || fullURL.query() != documentURL.query()))

trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp

@@ -51 +51 @@
 namespace WebCore {
 
-static String blobURLWithoutFragment(const URL& url)
-{
-    return url.hasFragmentIdentifier() ? url.stringWithoutFragmentIdentifier().toString() : url.string();
-}
-
 BlobRegistryImpl::~BlobRegistryImpl() = default;
 
@@ -236 +231 @@
     ASSERT(isMainThread());
     if (url.hasFragmentIdentifier())
-        return m_blobs.get(url.stringWithoutFragmentIdentifier().toStringWithoutCopying());
+        return m_blobs.get(url.viewWithoutFragmentIdentifier().toStringWithoutCopying());
     return m_blobs.get(url.string());
 }
@@ -381 +376 @@
 void BlobRegistryImpl::registerBlobURLHandle(const URL& url)
 {
-    auto urlKey = blobURLWithoutFragment(url);
+    auto urlKey = url.stringWithoutFragmentIdentifier();
     if (m_blobs.contains(urlKey))
         m_blobReferences.add(urlKey);
@@ -388 +383 @@
 void BlobRegistryImpl::unregisterBlobURLHandle(const URL& url)
 {
-    auto urlKey = blobURLWithoutFragment(url);
+    auto urlKey = url.stringWithoutFragmentIdentifier();
     if (m_blobReferences.remove(urlKey))
         m_blobs.remove(urlKey);