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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 15:01:37 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b3c96c9b6e071dccd678dcedd164e59ca034f449
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 15:56:38 2010 +0000

    2010-10-27  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
    
            Reviewed by Andreas Kling.
    
            Remove references to ancient QGVLauncher and QtLauncher
            https://bugs.webkit.org/show_bug.cgi?id=48430
    
            * manual-tests/plugins/windowed.html: change to QtTestBrowser
            * manual-tests/plugins/windowless.html: ditto
    2010-10-27  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
    
            Reviewed by Andreas Kling.
    
            Remove references to ancient QGVLauncher and QtLauncher
            https://bugs.webkit.org/show_bug.cgi?id=48430
    
            QtTestBrowser substitutes both and has checks enabled.
    
            * Scripts/webkitpy/style/checker.py: remove references
            * Scripts/webkitpy/style/checker_unittest.py: ditto
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bdc920f..6689559 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-27  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        Remove references to ancient QGVLauncher and QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=48430
+
+        * manual-tests/plugins/windowed.html: change to QtTestBrowser
+        * manual-tests/plugins/windowless.html: ditto
+
 2010-10-27  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebCore/manual-tests/plugins/windowed.html b/WebCore/manual-tests/plugins/windowed.html
index 808a0ad..56a02f4 100644
--- a/WebCore/manual-tests/plugins/windowed.html
+++ b/WebCore/manual-tests/plugins/windowed.html
@@ -62,7 +62,7 @@
 <body>
 
     <b> Verify the following tests with and without the page scrolled (including seeming unrelated test cases like printing). <br/>
-        For the Qt port, test with both QtLauncher and QGVLauncher </b> <br/><br/>
+        For the Qt port, test with QGraphicsView enabled and disabled</b> <br/><br/>
 
     <!-- <embed id="flashPlugin" src="http://www.youtube.com/v/loXfcsXRB-w&#038;hl=en&#038;fs=1" --!>
     <embed id="flashPlugin" src="test.swf"
@@ -91,7 +91,7 @@
 
     <input type="checkbox" name="zoomCheckBox"> Verify if elements in flash are correctly painted and clickable after zooming <br/>
 
-    <input type="checkbox" name="screenshotBox"> Verify if taking a screenshot from QtLauncher display flash <br/>
+    <input type="checkbox" name="screenshotBox"> Verify if taking a screenshot from QtTestBrowser displays flash <br/>
 
     <input type="checkbox" name="paintSystemsCheckBox"> Verify if flash is displayed with graphicssystems - raster, opengl <br/>
 
diff --git a/WebCore/manual-tests/plugins/windowless.html b/WebCore/manual-tests/plugins/windowless.html
index 1020abb..27e8a82 100644
--- a/WebCore/manual-tests/plugins/windowless.html
+++ b/WebCore/manual-tests/plugins/windowless.html
@@ -62,7 +62,7 @@
 <body>
 
     <b> Verify the following tests with and without the page scrolled (including seeming unrelated test cases like printing). <br/>
-        For the Qt port, test with both QtLauncher and QGVLauncher </b> <br/><br/>
+        For the Qt port, test with QGraphicsView enabled and disabled</b> <br/><br/>
 
     <!-- <embed id="flashPlugin" src="http://www.youtube.com/v/loXfcsXRB-w&#038;hl=en&#038;fs=1" --!>
     <embed id="flashPlugin" src="test.swf"
@@ -92,7 +92,7 @@
 
     <input type="checkbox" name="zoomCheckBox"> Verify if elements in flash are correctly painted and clickable after zooming <br/>
 
-    <input type="checkbox" name="screenshotBox"> Verify if taking a screenshot from QtLauncher display flash <br/>
+    <input type="checkbox" name="screenshotBox"> Verify if taking a screenshot from QtTestBrowser displays flash <br/>
 
     <input type="checkbox" name="paintSystemsCheckBox"> Verify if flash is displayed with graphicssystems - raster, opengl <br/>
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2562831..16ed905 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-27  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        Remove references to ancient QGVLauncher and QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=48430
+
+        QtTestBrowser substitutes both and has checks enabled.
+
+        * Scripts/webkitpy/style/checker.py: remove references
+        * Scripts/webkitpy/style/checker_unittest.py: ditto
+
 2010-10-27  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/Scripts/webkitpy/style/checker.py b/WebKitTools/Scripts/webkitpy/style/checker.py
index e0c956f..b8b5f83 100644
--- a/WebKitTools/Scripts/webkitpy/style/checker.py
+++ b/WebKitTools/Scripts/webkitpy/style/checker.py
@@ -115,8 +115,7 @@ _PATH_RULES_SPECIFIER = [
     # Files in these directories are consumers of the WebKit
     # API and therefore do not follow the same header including
     # discipline as WebCore.
-    (["WebKitTools/WebKitAPITest/",
-      "WebKit/qt/QGVLauncher/"],
+    (["WebKitTools/WebKitAPITest/"],
      ["-build/include",
       "-readability/streams"]),
     ([# The EFL APIs use EFL naming style, which includes
diff --git a/WebKitTools/Scripts/webkitpy/style/checker_unittest.py b/WebKitTools/Scripts/webkitpy/style/checker_unittest.py
index 5254275..43d24fe 100755
--- a/WebKitTools/Scripts/webkitpy/style/checker_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/checker_unittest.py
@@ -213,11 +213,6 @@ class GlobalVariablesTest(unittest.TestCase):
                     "build/include")
         assertNoCheck("WebKitTools/WebKitAPITest/main.cpp",
                       "build/include")
-        assertNoCheck("WebKit/qt/QGVLauncher/main.cpp",
-                      "build/include")
-        assertNoCheck("WebKit/qt/QGVLauncher/main.cpp",
-                      "readability/streams")
-
         assertCheck("random_path.cpp",
                     "readability/naming")
         assertNoCheck("WebKit/gtk/webkit/webkit.h",

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list