Title: [116623] trunk/Source/WebCore
- Revision
- 116623
- Author
- [email protected]
- Date
- 2012-05-10 02:59:40 -0700 (Thu, 10 May 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116622 => 116623)
--- trunk/Source/WebCore/ChangeLog 2012-05-10 09:23:43 UTC (rev 116622)
+++ trunk/Source/WebCore/ChangeLog 2012-05-10 09:59:40 UTC (rev 116623)
@@ -1,3 +1,23 @@
+2012-05-10 Kinuko Yasuda <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: Autocomplete for CSS property values in the Styles pane behaving incorrectly
Modified: trunk/Source/WebCore/Modules/filesystem/EntryBase.cpp (116622 => 116623)
--- trunk/Source/WebCore/Modules/filesystem/EntryBase.cpp 2012-05-10 09:23:43 UTC (rev 116622)
+++ trunk/Source/WebCore/Modules/filesystem/EntryBase.cpp 2012-05-10 09:59:40 UTC (rev 116623)
@@ -54,13 +54,13 @@
{
}
-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();
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/filesystem/EntryBase.h (116622 => 116623)
--- trunk/Source/WebCore/Modules/filesystem/EntryBase.h 2012-05-10 09:23:43 UTC (rev 116622)
+++ trunk/Source/WebCore/Modules/filesystem/EntryBase.h 2012-05-10 09:59:40 UTC (rev 116623)
@@ -33,9 +33,8 @@
#if ENABLE(FILE_SYSTEM)
-#include "KURL.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -55,7 +54,7 @@
const String& fullPath() const { return m_fullPath; }
const String& name() const { return m_name; }
- KURL toURL() const;
+ String toURL() const;
protected:
EntryBase(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
