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

tonikitoo at webkit.org tonikitoo at webkit.org
Wed Dec 22 18:46:12 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 2238abfcf178f002177864ed49c098e31195f187
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 16:15:41 2010 +0000

    2010-12-16  Antonio Gomes  <agomes at rim.com>
    
            Reviewed by Martin Robinson.
    
            Settings::editingBehaviorType() incorrectly returns mac for the gtk build when running tests
            https://bugs.webkit.org/show_bug.cgi?id=51163
    
            WebKitTools:
            Since GTK+'s default editing behavior was changed to UNIX in r70975 (see webkitwebsettings.cpp),
            GTK+'s DRT should also reset to UNIX after each test execution.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
    
            LayoutTests:
            Removed platform specific expected result files for gtk and windows
            for editing/selection/extend-selection-home-end.html, since they all match
            the cross platform result file.
    
            Note: chromium-win and mac still have their own expected file each.
    
            * platform/gtk/editing/selection/extend-selection-home-end-expected.txt: Removed.
            * platform/win/editing/selection/extend-selection-home-end-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 36d9722..08d79e7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-16  Antonio Gomes  <agomes at rim.com>
+
+        Reviewed by Martin Robinson.
+
+        Settings::editingBehaviorType() incorrectly returns mac for the gtk build when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=51163
+
+        Removed platform specific expected result files for gtk and windows
+        for editing/selection/extend-selection-home-end.html, since they all match
+        the cross platform result file.
+
+        Note: chromium-win and mac still have their own expected file each.
+
+        * platform/gtk/editing/selection/extend-selection-home-end-expected.txt: Removed.
+        * platform/win/editing/selection/extend-selection-home-end-expected.txt: Removed.
+
 2010-12-17  Yury Semikhatsky  <yurys at chromium.org>
 
         Unreviewed. Remove custom expectations for fast/js/regexp-ranges-and-escaped-hyphens.html
diff --git a/LayoutTests/platform/gtk/editing/selection/extend-selection-home-end-expected.txt b/LayoutTests/platform/gtk/editing/selection/extend-selection-home-end-expected.txt
deleted file mode 100644
index 688584c..0000000
--- a/LayoutTests/platform/gtk/editing/selection/extend-selection-home-end-expected.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-Extending by lineBoundary
-Test 1, LTR:
-  Extending forward: "\nabc ABC xyz DEF def\n"[(1,1), (1,20)]
-  Extending backward:  "\nabc ABC xyz DEF def\n"[(1,20)]
-Test 1, RTL:
-  Extending forward: "\nabc ABC xyz DEF def\n"[(1,1), (1,20)]
-  Extending backward:  "\nabc ABC xyz DEF def\n"[(1,20)]
-Test 2, LTR:
-  Extending forward: "\nABC xyz DEF def GHI\n"[(1,1), (1,20)]
-  Extending backward:  "\nABC xyz DEF def GHI\n"[(1,20)]
-Test 2, RTL:
-  Extending forward: "\nABC xyz DEF def GHI\n"[(1,1), (1,20)]
-  Extending backward:  "\nABC xyz DEF def GHI\n"[(1,20)]
-Test 3, LTR:
-  Extending forward: "\nABC DEF ABC\n"[(1,1), (1,12)]
-  Extending backward:  "\nABC DEF ABC\n"[(1,12)]
-Test 3, RTL:
-  Extending forward: "\nABC DEF ABC\n"[(1,1), (1,12)]
-  Extending backward:  "\nABC DEF ABC\n"[(1,12)]
-Test 4, LTR:
-  Extending forward: "\nabc efd dabeb\n"[(1,1), (1,14)]
-  Extending backward:  "\nabc efd dabeb\n"[(1,14)]
-Test 4, RTL:
-  Extending forward: "\nabc efd dabeb\n"[(1,1), (1,14)]
-  Extending backward:  "\nabc efd dabeb\n"[(1,14)]
-Test 5, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 5, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 6, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 6, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 7, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 7, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 8, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 8, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 9, LTR:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5)]
-Test 9, RTL:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5)]
-Test 10, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 10, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 11, LTR:
-  Extending forward: "Lorem "[(0,0)], "ipsum dolor"[(0,11)]
-  Extending backward:  "ipsum dolor"[(0,11)]
-Test 11, RTL:
-  Extending forward: "Lorem "[(0,0)], "ipsum dolor"[(0,11)]
-  Extending backward:  "ipsum dolor"[(0,11)]
-Test 12, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 12, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)]
-Test 13, LTR:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5)]
-Test 13, RTL:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5)]
-Test 14, LTR:
-  Extending forward: "\n Just\n "[(2,2)], "\n BFDX\n"[(2,6)]
-  Extending backward:  "\n BFDX\n"[(2,6)]
-Test 14, RTL:
-  Extending forward: "\n Just\n "[(2,2)], "\n BFDX\n"[(2,6)]
-  Extending backward:  "\n BFDX\n"[(2,6)]
-Test 15, LTR:
-  Extending forward: "\n Just\n "[(2,2)], "\n ever\n"[(2,6)]
-  Extending backward:  "\n ever\n"[(2,6)]
-Test 15, RTL:
-  Extending forward: "\n Just\n "[(2,2)], "\n ever\n"[(2,6)]
-  Extending backward:  "\n ever\n"[(2,6)]
-Test 16, LTR:
-  Extending forward: "car means ABC."[(0,0), (0,14)]
-  Extending backward:  "car means ABC."[(0,14)]
-Test 16, RTL:
-  Extending forward: "car means ABC."[(0,0), (0,14)]
-  Extending backward:  "car means ABC."[(0,14)]
-Test 17, LTR:
-  Extending forward: "᪜car DEF ABC.᪝"[(0,0), (0,14)]
-  Extending backward:  "᪜car DEF ABC.᪝"[(0,14)]
-Test 17, RTL:
-  Extending forward: "᪜car DEF ABC.᪝"[(0,0), (0,14)]
-  Extending backward:  "᪜car DEF ABC.᪝"[(0,14)]
-Test 18, LTR:
-  Extending forward: "he said "᪜car DEF ABC᪝.""[(0,0), (0,24)]
-  Extending backward:  "he said "᪜car DEF ABC᪝.""[(0,24)]
-Test 18, RTL:
-  Extending forward: "he said "᪜car DEF ABC᪝.""[(0,0), (0,24)]
-  Extending backward:  "he said "᪜car DEF ABC᪝.""[(0,24)]
-Test 19, LTR:
-  Extending forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,0), (0,40)]
-  Extending backward:  "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,40)]
-Test 19, RTL:
-  Extending forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,0), (0,40)]
-  Extending backward:  "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,40)]
-Test 20, LTR:
-  Extending forward: "ABC abc DEF"[(0,0), (0,11)]
-  Extending backward:  "ABC abc DEF"[(0,11)]
-Test 20, RTL:
-  Extending forward: "ABC abc DEF"[(0,0), (0,11)]
-  Extending backward:  "ABC abc DEF"[(0,11)]
-Test 21, LTR:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 21, RTL:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 22, LTR:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 22, RTL:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-
diff --git a/LayoutTests/platform/win/editing/selection/extend-selection-home-end-expected.txt b/LayoutTests/platform/win/editing/selection/extend-selection-home-end-expected.txt
deleted file mode 100644
index ae52f6a..0000000
--- a/LayoutTests/platform/win/editing/selection/extend-selection-home-end-expected.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-Extending by lineBoundary
-Test 1, LTR:
-  Extending forward: "\nabc ABC xyz DEF def\n"[(1,1), (1,20)]
-  Extending backward:  "\nabc ABC xyz DEF def\n"[(1,20), (1,1)]
-Test 1, RTL:
-  Extending forward: "\nabc ABC xyz DEF def\n"[(1,1), (1,20)]
-  Extending backward:  "\nabc ABC xyz DEF def\n"[(1,20), (1,1)]
-Test 2, LTR:
-  Extending forward: "\nABC xyz DEF def GHI\n"[(1,1), (1,20)]
-  Extending backward:  "\nABC xyz DEF def GHI\n"[(1,20), (1,1)]
-Test 2, RTL:
-  Extending forward: "\nABC xyz DEF def GHI\n"[(1,1), (1,20)]
-  Extending backward:  "\nABC xyz DEF def GHI\n"[(1,20), (1,1)]
-Test 3, LTR:
-  Extending forward: "\nABC DEF ABC\n"[(1,1), (1,12)]
-  Extending backward:  "\nABC DEF ABC\n"[(1,12), (1,1)]
-Test 3, RTL:
-  Extending forward: "\nABC DEF ABC\n"[(1,1), (1,12)]
-  Extending backward:  "\nABC DEF ABC\n"[(1,12), (1,1)]
-Test 4, LTR:
-  Extending forward: "\nabc efd dabeb\n"[(1,1), (1,14)]
-  Extending backward:  "\nabc efd dabeb\n"[(1,14), (1,1)]
-Test 4, RTL:
-  Extending forward: "\nabc efd dabeb\n"[(1,1), (1,14)]
-  Extending backward:  "\nabc efd dabeb\n"[(1,14), (1,1)]
-Test 5, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 5, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 6, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 6, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 7, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 7, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 8, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 8, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 9, LTR:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5), (0,0)]
-Test 9, RTL:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5), (0,0)]
-Test 10, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 10, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 11, LTR:
-  Extending forward: "Lorem "[(0,0)], "ipsum dolor"[(0,11)]
-  Extending backward:  "ipsum dolor"[(0,11)], "Lorem "[(0,0)]
-Test 11, RTL:
-  Extending forward: "Lorem "[(0,0)], "ipsum dolor"[(0,11)]
-  Extending backward:  "ipsum dolor"[(0,11)], "Lorem "[(0,0)]
-Test 12, LTR:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 12, RTL:
-  Extending forward: "Lorem "[(0,0)], " amet"[(0,5)]
-  Extending backward:  " amet"[(0,5)], "Lorem "[(0,0)]
-Test 13, LTR:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5), (0,0)]
-Test 13, RTL:
-  Extending forward: "Lorem "[(0,0), (0,5)]
-  Extending backward:  "Lorem "[(0,5), (0,0)]
-Test 14, LTR:
-  Extending forward: "\n Just\n "[(2,2)], "\n BFDX\n"[(2,6)]
-  Extending backward:  "\n BFDX\n"[(2,6)], "\n Just\n "[(2,2)]
-Test 14, RTL:
-  Extending forward: "\n Just\n "[(2,2)], "\n BFDX\n"[(2,6)]
-  Extending backward:  "\n BFDX\n"[(2,6)], "\n Just\n "[(2,2)]
-Test 15, LTR:
-  Extending forward: "\n Just\n "[(2,2)], "\n ever\n"[(2,6)]
-  Extending backward:  "\n ever\n"[(2,6)], "\n Just\n "[(2,2)]
-Test 15, RTL:
-  Extending forward: "\n Just\n "[(2,2)], "\n ever\n"[(2,6)]
-  Extending backward:  "\n ever\n"[(2,6)], "\n Just\n "[(2,2)]
-Test 16, LTR:
-  Extending forward: "car means ABC."[(0,0), (0,14)]
-  Extending backward:  "car means ABC."[(0,14), (0,0)]
-Test 16, RTL:
-  Extending forward: "car means ABC."[(0,0), (0,14)]
-  Extending backward:  "car means ABC."[(0,14), (0,0)]
-Test 17, LTR:
-  Extending forward: "᪜car DEF ABC.᪝"[(0,0), (0,14)]
-  Extending backward:  "᪜car DEF ABC.᪝"[(0,14), (0,0)]
-Test 17, RTL:
-  Extending forward: "᪜car DEF ABC.᪝"[(0,0), (0,14)]
-  Extending backward:  "᪜car DEF ABC.᪝"[(0,14), (0,0)]
-Test 18, LTR:
-  Extending forward: "he said "᪜car DEF ABC᪝.""[(0,0), (0,24)]
-  Extending backward:  "he said "᪜car DEF ABC᪝.""[(0,24), (0,0)]
-Test 18, RTL:
-  Extending forward: "he said "᪜car DEF ABC᪝.""[(0,0), (0,24)]
-  Extending backward:  "he said "᪜car DEF ABC᪝.""[(0,24), (0,0)]
-Test 19, LTR:
-  Extending forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,0), (0,40)]
-  Extending backward:  "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,40), (0,0)]
-Test 19, RTL:
-  Extending forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,0), (0,40)]
-  Extending backward:  "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[(0,40), (0,0)]
-Test 20, LTR:
-  Extending forward: "ABC abc DEF"[(0,0), (0,11)]
-  Extending backward:  "ABC abc DEF"[(0,11), (0,0)]
-Test 20, RTL:
-  Extending forward: "ABC abc DEF"[(0,0), (0,11)]
-  Extending backward:  "ABC abc DEF"[(0,11), (0,0)]
-Test 21, LTR:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 21, RTL:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 22, LTR:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-Test 22, RTL:
-  Extending forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,0), (0,8)]
-  Extending backward:  "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[(0,8)]
-
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4db83d7..f41c9c3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-16  Antonio Gomes  <agomes at rim.com>
+
+        Reviewed by Martin Robinson.
+
+        Settings::editingBehaviorType() incorrectly returns mac for the gtk build when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=51163
+
+        Since GTK+'s default editing behavior was changed to UNIX in r70975 (see webkitwebsettings.cpp),
+        GTK+'s DRT should also reset to UNIX after each test execution.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2010-12-17  David Levin  <levin at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 6bf0cb8..32a41c3 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -415,7 +415,7 @@ static void resetDefaultsToConsistentValues()
                  "enable-java-applet", FALSE,
                  "enable-plugins", TRUE,
                  "enable-hyperlink-auditing", FALSE,
-                 "editing-behavior", WEBKIT_EDITING_BEHAVIOR_MAC,
+                 "editing-behavior", WEBKIT_EDITING_BEHAVIOR_UNIX,
                  "enable-fullscreen", TRUE,
                  NULL);
     webkit_web_view_set_settings(webView, settings);

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list