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

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1da8a466029e5de717e164f7fc1888682f2e0dfa
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 23:18:08 2010 +0000

    2010-10-06  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            Add a "FIXME" to clarify that all of the tests are currently marked
            "PASS FAIL" and hence we won't actually see any failures requiring
            new baselines (only crashes or timeouts).
    
            https://bugs.webkit.org/show_bug.cgi?id=47312
    
            * platform/chromium-gpu/test_expectations.txt:
    2010-10-06  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            new-run-webkit-tests: fix typo in chromium-gpu that was trying to
            enable 'accelerated-composting' instead of 'accelerated-compositing'.
    
            https://bugs.webkit.org/show_bug.cgi?id=47312
    
            * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
            * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69250 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1ad9273..0156393 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-06  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Add a "FIXME" to clarify that all of the tests are currently marked
+        "PASS FAIL" and hence we won't actually see any failures requiring
+        new baselines (only crashes or timeouts).
+
+        https://bugs.webkit.org/show_bug.cgi?id=47312
+
+
+        * platform/chromium-gpu/test_expectations.txt:
+
 2010-10-06  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index afec7be..68c423b 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -44,6 +44,10 @@ WONTFIX SKIP : http/tests/websocket = PASS FAIL
 WONTFIX SKIP : wml = PASS FAIL
 
 // (These are the tests we actually run and expect to pass)
+// We need to explicitly list fast/canvas and canvas/philip because the
+// parent directories are otherwise SKIPPed. We list compositing for completeness.
+//
+// FIXME: remove the FAILs from the following three lines.
 BUGNONE : compositing = PASS FAIL
 BUGNONE : fast/canvas = PASS FAIL
 BUGNONE : canvas/philip = PASS FAIL
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 964b346..4355aee 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-06  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        new-run-webkit-tests: fix typo in chromium-gpu that was trying to
+        enable 'accelerated-composting' instead of 'accelerated-compositing'.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47312
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+
 2010-10-06  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
index 80602d9..505c9b5 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
@@ -66,7 +66,7 @@ def get(**kwargs):
 def _set_gpu_options(options):
     if options:
         if options.accelerated_compositing is None:
-            options.accelerated_composting = True
+            options.accelerated_compositing = True
         if options.accelerated_2d_canvas is None:
             options.accelerated_2d_canvas = True
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
index 5c79a3f..1dd3eae 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
@@ -29,6 +29,12 @@ import unittest
 import chromium_gpu
 
 
+class MockOptions(object):
+    def __init__(self):
+        self.accelerated_compositing = None
+        self.accelerated_2d_canvas = None
+
+
 class ChromiumGpuTest(unittest.TestCase):
     def test_get_chromium_gpu_linux(self):
         self.assertOverridesWorked('chromium-gpu-linux')
@@ -41,7 +47,9 @@ class ChromiumGpuTest(unittest.TestCase):
 
     def assertOverridesWorked(self, port_name):
         # test that we got the right port
-        port = chromium_gpu.get(port_name=port_name, options=None)
+        port = chromium_gpu.get(port_name=port_name, options=MockOptions())
+        self.assertTrue(port._options.accelerated_compositing)
+        self.assertTrue(port._options.accelerated_2d_canvas)
 
         # we use startswith() instead of Equal to gloss over platform versions.
         self.assertTrue(port.name().startswith(port_name))

-- 
WebKit Debian packaging