[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

jianli at chromium.org jianli at chromium.org
Wed Dec 22 13:44:28 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f49a9b15d4ba4c39600bd752e7164f0f0ec9b1d8
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 18:03:19 2010 +0000

    DOMWindow::revokeBlobURL erroneously uses ParsedURLString.
    https://bugs.webkit.org/show_bug.cgi?id=46434
    
    Reviewed by Alexey Proskuryakov.
    
    WebCore:
    
    Test: fast/files/revoke-blob-url.html
    
    * page/DOMWindow.cpp:
    (WebCore::DOMWindow::revokeBlobURL):
    
    LayoutTests:
    
    Add a test. Also update Skipped files for those not-supported platforms.
    
    * fast/files/revoke-blob-url-expected.txt: Added.
    * fast/files/revoke-blob-url.html: Added.
    * platform/gtk/Skipped:
    * platform/mac-wk2/Skipped:
    * platform/qt/Skipped:
    * platform/win/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9e66d8f..ee8c7f6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-24  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        DOMWindow::revokeBlobURL erroneously uses ParsedURLString.
+        https://bugs.webkit.org/show_bug.cgi?id=46434
+
+        Add a test. Also update Skipped files for those not-supported platforms.
+
+        * fast/files/revoke-blob-url-expected.txt: Added.
+        * fast/files/revoke-blob-url.html: Added.
+        * platform/gtk/Skipped:
+        * platform/mac-wk2/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2010-09-24  Zhenyao Mo  <zmo at google.com>
 
         Unreviewed.
diff --git a/LayoutTests/fast/files/revoke-blob-url-expected.txt b/LayoutTests/fast/files/revoke-blob-url-expected.txt
new file mode 100644
index 0000000..5c26191
--- /dev/null
+++ b/LayoutTests/fast/files/revoke-blob-url-expected.txt
@@ -0,0 +1,10 @@
+Test calling revokeBlobURL with no argument.
+PASS
+Test calling revokeBlobURL with empty URL.
+PASS
+Test calling revokeBlobURL with invalid URL.
+PASS
+Test calling revokeBlobURL with non-existent URL.
+PASS
+DONE
+
diff --git a/LayoutTests/fast/files/revoke-blob-url.html b/LayoutTests/fast/files/revoke-blob-url.html
new file mode 100644
index 0000000..16acb5c
--- /dev/null
+++ b/LayoutTests/fast/files/revoke-blob-url.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+function log(message)
+{
+    document.getElementById('console').appendChild(document.createTextNode(message + "\n"));
+}
+
+function test()
+{
+    log("Test calling revokeBlobURL with no argument.");
+    var url = revokeBlobURL();
+    log(url == undefined ? "PASS" : "FAIL");
+
+    log("Test calling revokeBlobURL with empty URL.");
+    revokeBlobURL("");
+    log("PASS");
+
+    log("Test calling revokeBlobURL with invalid URL.");
+    revokeBlobURL("[foo bar]");
+    log("PASS");
+
+    log("Test calling revokeBlobURL with non-existent URL.");
+    revokeBlobURL("blob:non-existent");
+    log("PASS");
+
+    log("DONE");
+}
+
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+</script>
+</head>
+<body onload="test()">
+<pre id='console'></pre>
+</body>
+</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 68c6bb6..9a891d7 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3043,12 +3043,8 @@ http/tests/local/blob/send-sliced-data-blob.html
 http/tests/local/formdata/send-form-data.html
 http/tests/local/formdata/send-form-data-with-sliced-file.html
 http/tests/local/formdata/upload-events.html
-fast/files/read-blob-async.html
-fast/files/read-file-async.html
-fast/files/apply-blob-url-to-img.html
-fast/files/apply-blob-url-to-xhr.html
-fast/files/create-blob-url-crash.html
-fast/files/workers
+# File API is not supported yet
+fast/files
 http/tests/media/video-play-stall-seek.html
 http/tests/media/video-play-stall.html
 http/tests/media/video-seekable-stall.html
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index 693ba05..9bada15 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -356,12 +356,7 @@ fast/events/window-events-bubble.html
 fast/events/window-events-bubble2.html
 fast/events/window-events-capture.html
 fast/events/zoom-dblclick.html
-fast/files/read-blob-async.html
-fast/files/read-file-async.html
-fast/files/apply-blob-url-to-img.html
-fast/files/apply-blob-url-to-xhr.html
-fast/files/create-blob-url-crash.html
-fast/files/workers
+fast/files
 fast/forms/25153.html
 fast/forms/access-key.html
 fast/forms/button-enter-click.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 1fbd2ac..027e3c1 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -769,12 +769,9 @@ http/tests/security/isolatedWorld/world-reuse.html
 
 # Missing eventSender.beginDragWithFiles()
 fast/dom/Window/window-postmessage-clone-frames.html
-fast/files/read-blob-async.html
-fast/files/read-file-async.html
-fast/files/apply-blob-url-to-img.html
-fast/files/apply-blob-url-to-xhr.html
-fast/files/create-blob-url-crash.html
-fast/files/workers
+
+# File API is not supported yet
+fast/files
 
 # Missing layoutTestController.setAlwaysAcceptCookies()
 http/tests/plugins/third-party-cookie-accept-policy.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 7f5c987..738a406 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -195,12 +195,9 @@ fast/forms/input-file-re-render.html
 http/tests/security/clipboard/clipboard-file-access.html
 fast/events/drag-file-crash.html
 fast/dom/Window/window-postmessage-clone.html
-fast/files/read-blob-async.html
-fast/files/read-file-async.html
-fast/files/apply-blob-url-to-img.html
-fast/files/apply-blob-url-to-xhr.html
-fast/files/create-blob-url-crash.html
-fast/files/workers
+
+# File API is not supported yet
+fast/files
 
 # Need to add functionality to DumpRenderTree to test IDN <rdar://problem/5301954>
 fast/encoding/idn-security.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f08cfa..267cced 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-24  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        DOMWindow::revokeBlobURL erroneously uses ParsedURLString.
+        https://bugs.webkit.org/show_bug.cgi?id=46434
+
+        Test: fast/files/revoke-blob-url.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::revokeBlobURL):
+
 2010-09-24  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 6a203cc..3a7bb93 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1599,7 +1599,7 @@ String DOMWindow::createBlobURL(Blob* blob)
 
 void DOMWindow::revokeBlobURL(const String& blobURLString)
 {
-    scriptExecutionContext()->revokePublicBlobURL(KURL(ParsedURLString, blobURLString));
+    scriptExecutionContext()->revokePublicBlobURL(KURL(KURL(), blobURLString));
 }
 #endif
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list