summaryrefslogtreecommitdiff
path: root/Source/WebCore/fileapi/BlobURL.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-20 13:01:08 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-20 13:01:08 +0200
commit49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch)
tree5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/fileapi/BlobURL.cpp
parentb211c645d8ab690f713515dfdc84d80b11c27d2c (diff)
downloadqtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/fileapi/BlobURL.cpp')
-rw-r--r--Source/WebCore/fileapi/BlobURL.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebCore/fileapi/BlobURL.cpp b/Source/WebCore/fileapi/BlobURL.cpp
index 5d79141a5..f7478534c 100644
--- a/Source/WebCore/fileapi/BlobURL.cpp
+++ b/Source/WebCore/fileapi/BlobURL.cpp
@@ -52,6 +52,15 @@ KURL BlobURL::createInternalURL()
return createBlobURL("blobinternal://");
}
+String BlobURL::getOrigin(const KURL& url)
+{
+ ASSERT(url.protocolIs(kBlobProtocol));
+
+ unsigned startIndex = url.pathStart();
+ unsigned endIndex = url.pathAfterLastSlash();
+ return url.string().substring(startIndex, endIndex - startIndex - 1);
+}
+
String BlobURL::getIdentifier(const KURL& url)
{
ASSERT(url.protocolIs(kBlobProtocol));
@@ -63,8 +72,6 @@ String BlobURL::getIdentifier(const KURL& url)
KURL BlobURL::createBlobURL(const String& originString)
{
ASSERT(!originString.isEmpty());
- if (originString == "null")
- return KURL();
String urlString = kBlobProtocol;
urlString += ":";
urlString += encodeWithURLEscapeSequences(originString);