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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7507db47fba4913f27fac373c64b93b5b02a8b54
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 01:52:01 2010 +0000

    2010-09-19  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [Chromium] userscripts/user-script-top-frame-only.html has incorrect expectations
            https://bugs.webkit.org/show_bug.cgi?id=46064
    
            r62958 added incorrect expectations for this test. Chromium DRT actually
            gets this test right if we let it use the base expectations file. Mark
            the test as failing with test_shell only.
    
            * platform/chromium-mac/userscripts/user-script-top-frame-only-expected.txt: Removed.
            * platform/chromium-win/userscripts/user-script-top-frame-only-expected.txt: Removed.
            * platform/chromium/drt_expectations.txt:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4819de..57fd82d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-19  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [Chromium] userscripts/user-script-top-frame-only.html has incorrect expectations
+        https://bugs.webkit.org/show_bug.cgi?id=46064
+
+        r62958 added incorrect expectations for this test. Chromium DRT actually
+        gets this test right if we let it use the base expectations file. Mark
+        the test as failing with test_shell only.
+
+        * platform/chromium-mac/userscripts/user-script-top-frame-only-expected.txt: Removed.
+        * platform/chromium-win/userscripts/user-script-top-frame-only-expected.txt: Removed.
+        * platform/chromium/drt_expectations.txt:
+        * platform/chromium/test_expectations.txt:
+
 2010-09-19  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/platform/chromium-mac/userscripts/user-script-top-frame-only-expected.txt b/LayoutTests/platform/chromium-mac/userscripts/user-script-top-frame-only-expected.txt
deleted file mode 100644
index 385fb71..0000000
--- a/LayoutTests/platform/chromium-mac/userscripts/user-script-top-frame-only-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Two thingers should appear on this page. Otherwise the test has failed. 
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-
-
---------
-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->'
---------
diff --git a/LayoutTests/platform/chromium-win/userscripts/user-script-top-frame-only-expected.txt b/LayoutTests/platform/chromium-win/userscripts/user-script-top-frame-only-expected.txt
deleted file mode 100644
index 293d391..0000000
--- a/LayoutTests/platform/chromium-win/userscripts/user-script-top-frame-only-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Two thingers should appear on this page. Otherwise the test has failed. 
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-
-
---------
-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->'
---------
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 56dcdc2..144f380 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -119,7 +119,6 @@ BUG_DRT LINUX : svg/batik/text/verticalText.svg = IMAGE+TEXT
 BUG_DRT WIN MAC LINUX : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+TEXT
 BUG_DRT WIN MAC LINUX : storage/domstorage/quota.html = TEXT
 BUG_DRT WIN MAC LINUX : storage/indexeddb/objectstore-basics.html = TEXT
-BUG_DRT WIN MAC LINUX : userscripts/user-script-top-frame-only.html = TEXT
 BUG_DRT MAC LINUX : http/tests/misc/slow-loading-image-in-pattern.html = IMAGE PASS
 BUG_DRT MAC LINUX : http/tests/plugins/post-url-file.html = TIMEOUT
 BUG_DRT LINUX : fast/events/select-onchange-crash.html = CRASH
@@ -153,3 +152,4 @@ BUG_DRT WIN : fast/notifications/notifications-replace.html = TEXT
 
 // Pass with DRT though FAIL on test_shell
 BUG_DRT : platform/chromium/accessibility = PASS
+BUG_DRT : userscripts/user-script-top-frame-only.html = PASS
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 705265f..a714b8f 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3157,3 +3157,4 @@ BUGWEBGL WIN LINUX : fast/canvas/webgl/point-size.html = TEXT
 BUGWEBGL MAC : fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html = TEXT PASS
 BUGWEBGL MAC : fast/canvas/webgl/texture-npot.html = TEXT
 BUGWEBGL WIN LINUX : fast/canvas/webgl/uniform-location.html = TEXT
+BUG56220 : userscripts/user-script-top-frame-only.html = TEXT
\ No newline at end of file

-- 
WebKit Debian packaging