[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 01:02:01 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 584afe1668e758dc2f527640a91ba0a7c7dbe3b4
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 12:45:57 2010 +0000

    Touch event layout tests should be in their own subdirectory, so that they can be easily skipped
    https://bugs.webkit.org/show_bug.cgi?id=33526
    
    Reviewed by Simon Hausmann.
    
    Tests moved from fast/events to fast/events/touch by r53125,
    relative resource paths should be adjuted to the new location.
    
    * fast/events/touch/basic-touch-events.html: relative paths fixed.
    * fast/events/touch/touch-coords-in-zoom-and-scroll.html: relative paths fixed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d3ee73d..95d0ff4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-12  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Touch event layout tests should be in their own subdirectory, so that they can be easily skipped
+        https://bugs.webkit.org/show_bug.cgi?id=33526
+
+        Tests moved from fast/events to fast/events/touch by r53125,
+        relative resource paths should be adjuted to the new location.
+
+        * fast/events/touch/basic-touch-events.html: relative paths fixed.
+        * fast/events/touch/touch-coords-in-zoom-and-scroll.html: relative paths fixed.
+
 2010-01-12  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/events/touch/basic-touch-events.html b/LayoutTests/fast/events/touch/basic-touch-events.html
index 39a73d9..fba628d 100644
--- a/LayoutTests/fast/events/touch/basic-touch-events.html
+++ b/LayoutTests/fast/events/touch/basic-touch-events.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
 </head>
 <body>
 <p id="description"></p>
 <div id="console"></div>
-<script src="script-tests/basic-touch-events.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../script-tests/basic-touch-events.js"></script>
+<script src="../../js/resources/js-test-post.js"></script>
 </body>
 </html>
diff --git a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
index 761b0b9..cbdc624 100644
--- a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
+++ b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
@@ -1,5 +1,5 @@
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
 <style>
     #pusher {
         width: 1000px;
@@ -11,7 +11,7 @@
 <div id="testArea">
     <div id="pusher">This box is here to create scrollbars.</div>
 </div>
-<script src="../js/resources/js-test-post-function.js"></script>
+<script src="../../js/resources/js-test-post-function.js"></script>
 <script>
     var event;
 

-- 
WebKit Debian packaging

