[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:37:07 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit a24eed189e361462e04d27c4cd36be19709460c1
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 22:30:46 2009 +0000

    2009-09-30  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Use a script-tests directory rather than a resources directory for DOM Storage
            https://bugs.webkit.org/show_bug.cgi?id=29938
    
            Use a script-tests directory rather than a resources directory for DOM Storage.
            This matches up with what's been done elsewhere in the tree.
    
            * storage/domstorage/localstorage/clear.html:
            * storage/domstorage/resources: Removed.
            * storage/domstorage/resources/clear.js: Removed.
            * storage/domstorage/script-tests: Copied from LayoutTests/storage/domstorage/resources.
            * storage/domstorage/sessionstorage/clear.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 383a013..a971766 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2009-09-30  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Use a script-tests directory rather than a resources directory for DOM Storage
+        https://bugs.webkit.org/show_bug.cgi?id=29938
+
+        Use a script-tests directory rather than a resources directory for DOM Storage.
+        This matches up with what's been done elsewhere in the tree.
+
+        * storage/domstorage/localstorage/clear.html:
+        * storage/domstorage/resources: Removed.
+        * storage/domstorage/resources/clear.js: Removed.
+        * storage/domstorage/script-tests: Copied from LayoutTests/storage/domstorage/resources.
+        * storage/domstorage/sessionstorage/clear.html:
+
 2009-09-30  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/storage/domstorage/localstorage/clear.html b/LayoutTests/storage/domstorage/localstorage/clear.html
index 138fce8..553ea35 100644
--- a/LayoutTests/storage/domstorage/localstorage/clear.html
+++ b/LayoutTests/storage/domstorage/localstorage/clear.html
@@ -6,7 +6,7 @@
 <body>
 <p id="description"></p>
 <div id="console"></div>
-<script src="../resources/clear.js"></script>
+<script src="../script-tests/clear.js"></script>
 <script>
 runTest("window.localStorage");
 </script>
diff --git a/LayoutTests/storage/domstorage/resources/clear.js b/LayoutTests/storage/domstorage/script-tests/clear.js
similarity index 100%
rename from LayoutTests/storage/domstorage/resources/clear.js
rename to LayoutTests/storage/domstorage/script-tests/clear.js
diff --git a/LayoutTests/storage/domstorage/sessionstorage/clear.html b/LayoutTests/storage/domstorage/sessionstorage/clear.html
index 5496cb3..77d863b 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/clear.html
+++ b/LayoutTests/storage/domstorage/sessionstorage/clear.html
@@ -6,7 +6,7 @@
 <body>
 <p id="description"></p>
 <div id="console"></div>
-<script src="../resources/clear.js"></script>
+<script src="../script-tests/clear.js"></script>
 <script>
 runTest("window.sessionStorage");
 </script>

-- 
WebKit Debian packaging

