Changeset 116623 in webkit

Timestamp:

May 10, 2012 2:59:40 AM (12 years ago)

Author:

kinuko@chromium.org

Message:

Change the return type of Entry.toURL() back to String from KURL
​https://bugs.webkit.org/show_bug.cgi?id=85858

Reviewed by Ryosuke Niwa.

I once changed it from String to KURL in r116273 but it turned out that
it involves implicit conversion and may incur extra overhead.
This partly reverts r116273 while keeping some internal functions
returning KURL as it's what we initially create as and is more
convenient to operate on.

No new tests; no functional or visible changes.

• Modules/filesystem/EntryBase.cpp:

(WebCore::EntryBase::toURL):

• Modules/filesystem/EntryBase.h:

(EntryBase):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/filesystem/EntryBase.cpp (modified) (1 diff)
• Modules/filesystem/EntryBase.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Change the return type of Entry.toURL() back to String from KURL
+        https://bugs.webkit.org/show_bug.cgi?id=85858
+
+        Reviewed by Ryosuke Niwa.
+
+        I once changed it from String to KURL in r116273 but it turned out that
+        it involves implicit conversion and may incur extra overhead.
+        This partly reverts r116273 while keeping some internal functions
+        returning KURL as it's what we initially create as and is more
+        convenient to operate on.
+
+        No new tests; no functional or visible changes.
+
+        * Modules/filesystem/EntryBase.cpp:
+        (WebCore::EntryBase::toURL):
+        * Modules/filesystem/EntryBase.h:
+        (EntryBase):
+
 2012-05-10  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/Modules/filesystem/EntryBase.cpp

@@ -55 +55 @@
 }
 
-KURL EntryBase::toURL() const
+String EntryBase::toURL() const
 {
     // Some filesystem type may not support toURL.
     if (!m_fileSystem->supportsToURL())
-        return KURL();
+        return String();
 
-    return m_fileSystem->createFileSystemURL(this);
+    return m_fileSystem->createFileSystemURL(this).string();
 }
 

trunk/Source/WebCore/Modules/filesystem/EntryBase.h

@@ -34 +34 @@
 #if ENABLE(FILE_SYSTEM)
 
-#include "KURL.h"
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -56 +55 @@
     const String& name() const { return m_name; }
 
-    KURL toURL() const;
+    String toURL() const;
 
 protected: