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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d83b478b86268382c84e2262ac3fbed0de42048d
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 10:17:05 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 Adam Barth.
    
    * fast/events/touch/basic-touch-events-expected.txt: Renamed from LayoutTests/fast/events/basic-touch-events-expected.txt.
    * fast/events/touch/basic-touch-events.html: Renamed from LayoutTests/fast/events/basic-touch-events.html.
    * fast/events/touch/touch-coords-in-zoom-and-scroll-expected.txt: Renamed from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll-expected.txt.
    * fast/events/touch/touch-coords-in-zoom-and-scroll.html: Renamed from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll.html.
    * platform/gtk/Skipped:
    * platform/mac/Skipped:
    * platform/qt/Skipped:
    * platform/win/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ff20130..7ef7f92 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Adam Barth.
+
+        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
+
+        * fast/events/touch/basic-touch-events-expected.txt: Renamed from LayoutTests/fast/events/basic-touch-events-expected.txt.
+        * fast/events/touch/basic-touch-events.html: Renamed from LayoutTests/fast/events/basic-touch-events.html.
+        * fast/events/touch/touch-coords-in-zoom-and-scroll-expected.txt: Renamed from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll-expected.txt.
+        * fast/events/touch/touch-coords-in-zoom-and-scroll.html: Renamed from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll.html.
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2010-01-11  Kent Tamura  <tkent at chromium.org>
 
         Unreviewd. Remove a duplicated line in an expectation file.
diff --git a/LayoutTests/fast/events/basic-touch-events-expected.txt b/LayoutTests/fast/events/touch/basic-touch-events-expected.txt
similarity index 100%
rename from LayoutTests/fast/events/basic-touch-events-expected.txt
rename to LayoutTests/fast/events/touch/basic-touch-events-expected.txt
diff --git a/LayoutTests/fast/events/basic-touch-events.html b/LayoutTests/fast/events/touch/basic-touch-events.html
similarity index 100%
rename from LayoutTests/fast/events/basic-touch-events.html
rename to LayoutTests/fast/events/touch/basic-touch-events.html
diff --git a/LayoutTests/fast/events/touch-coords-in-zoom-and-scroll-expected.txt b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll-expected.txt
similarity index 100%
rename from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll-expected.txt
rename to LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll-expected.txt
diff --git a/LayoutTests/fast/events/touch-coords-in-zoom-and-scroll.html b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
similarity index 100%
rename from LayoutTests/fast/events/touch-coords-in-zoom-and-scroll.html
rename to LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index e6ae3bb..cdb3471 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5705,8 +5705,7 @@ http/tests/security/mixedContent/empty-url-plugin-in-frame.html
 fast/cookies/local-file-can-set-cookies.html
 
 # These tests require touch support
-fast/events/basic-touch-events.html
-fast/events/touch-coords-in-zoom-and-scroll.html
+fast/events/touch
 
 # Javascript execution/mainloop problem
 # See https://bugs.webkit.org/show_bug.cgi?id=32441
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 5565101..39214c2 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -94,5 +94,4 @@ plugins/reloadplugins-and-pages.html
 media/media-can-play-ogg.html
 
 # These tests require touch support
-fast/events/basic-touch-events.html
-fast/events/touch-coords-in-zoom-and-scroll.html
+fast/events/touch
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 582c6f4..4aeeb23 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5091,4 +5091,4 @@ fast/forms/slider-zoomed.html
 fast/forms/slider-mouse-events.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=33465
-fast/events/touch-coords-in-zoom-and-scroll.html
+fast/events/touch/touch-coords-in-zoom-and-scroll.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 0f2863f..b6ffd20 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -718,8 +718,7 @@ inspector/timeline-network-resource.html
 media/media-can-play-ogg.html
 
 # These tests require touch support
-fast/events/basic-touch-events.html
-fast/events/touch-coords-in-zoom-and-scroll.html
+fast/events/touch
 
 # XSS auditor tests intermittently time out <http://webkit.org/b/32528>
 http/tests/security/xss-DENIED-getSVGDocument-iframe.html

-- 
WebKit Debian packaging