[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

Sun Feb 20 23:54:36 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit 8a39eacf2322d322541d1fe24e8b3e9ba90ef0df
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 20:03:07 2011 +0000

    Update the test landed in r76701 to not depend on loading a "script" from http://example.com, make it
    use a local script (which still reproduces the crash).
    
    Reviewed by Ryosuke Niwa.
    
    * fast/loader/resources/empty-script.js: Added.
    * fast/loader/willSendRequest-null-for-preload-expected.txt: Removed the line for the console error.
    * fast/loader/willSendRequest-null-for-preload.html: Have the script in the head be a local script.
    * platform/win/fast/loader: Removed.
    * platform/win/fast/loader/willSendRequest-null-for-preload-expected.txt: Removed. No need for platform-specific results.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0ed7861..a06a459 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-26  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        Update the test landed in r76701 to not depend on loading a "script" from http://example.com, make it
+        use a local script (which still reproduces the crash).
+
+        * fast/loader/resources/empty-script.js: Added.
+        * fast/loader/willSendRequest-null-for-preload-expected.txt: Removed the line for the console error.
+        * fast/loader/willSendRequest-null-for-preload.html: Have the script in the head be a local script.
+        * platform/win/fast/loader: Removed.
+        * platform/win/fast/loader/willSendRequest-null-for-preload-expected.txt: Removed. No need for platform-specific results.
+
 2011-01-26  Ryosuke Niwa  <rniwa at webkit.org>
 
         Another unreviewed Chromium rebaselines for r76688.
diff --git a/LayoutTests/animations/resources/dynamic-stylesheet-insertion-inserted.css b/LayoutTests/fast/loader/resources/empty-script.js
similarity index 100%
copy from LayoutTests/animations/resources/dynamic-stylesheet-insertion-inserted.css
copy to LayoutTests/fast/loader/resources/empty-script.js
diff --git a/LayoutTests/fast/loader/willSendRequest-null-for-preload-expected.txt b/LayoutTests/fast/loader/willSendRequest-null-for-preload-expected.txt
index 3c0c58e..53d7fa2 100644
--- a/LayoutTests/fast/loader/willSendRequest-null-for-preload-expected.txt
+++ b/LayoutTests/fast/loader/willSendRequest-null-for-preload-expected.txt
@@ -1,2 +1 @@
-Blocked access to external URL http://www.example.com/
 Test for Bug 53123: Crashes loading pages when cancelling subresource loads through WebKit. If the test doesn't crash, then it has passed. It must be run in DRT.
diff --git a/LayoutTests/fast/loader/willSendRequest-null-for-preload.html b/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
index b1c9218..c260e1e 100644
--- a/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
+++ b/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Bug 53123: Crashes loading pages when cancelling subresource loads through WebKit</title>
-    <script type="text/javascript" src="http://www.example.com"></script>
+    <script type="text/javascript" src="resources/empty-script.js"></script>
     <script>
         if (window.layoutTestController) {
             layoutTestController.dumpAsText();
diff --git a/LayoutTests/platform/win/fast/loader/willSendRequest-null-for-preload-expected.txt b/LayoutTests/platform/win/fast/loader/willSendRequest-null-for-preload-expected.txt
deleted file mode 100644
index 716514d..0000000
--- a/LayoutTests/platform/win/fast/loader/willSendRequest-null-for-preload-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 1: SyntaxError: Parse error
-Test for Bug 53123: Crashes loading pages when cancelling subresource loads through WebKit. If the test doesn't crash, then it has passed. It must be run in DRT.

-- 
WebKit Debian packaging

