Diff
Modified: trunk/LayoutTests/ChangeLog (94699 => 94700)
--- trunk/LayoutTests/ChangeLog 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/LayoutTests/ChangeLog 2011-09-07 19:31:48 UTC (rev 94700)
@@ -1,3 +1,13 @@
+2011-09-07 Elliot Poger <[email protected]>
+
+ now that layout tests distinguish between Core Graphics and Skia
+ expectations, update test_expectations accordingly.
+ https://bugs.webkit.org/show_bug.cgi?id=67324
+
+ Reviewed by Dirk Pranke.
+
+ * platform/chromium/test_expectations.txt:
+
2011-09-07 W. James MacLean <[email protected]>
Eliminate motion jitter in animated, blurred SVG image
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (94699 => 94700)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-07 19:31:48 UTC (rev 94700)
@@ -225,14 +225,14 @@
// Compositing tests will never pass in the non-accelerated GPU code
// paths.
-WONTFIX SKIP CPU : compositing = PASS TIMEOUT FAIL
-WONTFIX SKIP CPU : platform/chromium/compositing = PASS TIMEOUT FAIL
-WONTFIX SKIP CPU : animations/3d = PASS TIMEOUT FAIL
+WONTFIX SKIP CPU CPU-CG : compositing = PASS TIMEOUT FAIL
+WONTFIX SKIP CPU CPU-CG : platform/chromium/compositing = PASS TIMEOUT FAIL
+WONTFIX SKIP CPU CPU-CG : animations/3d = PASS TIMEOUT FAIL
// We don't ship compositing on Leopard.
-WONTFIX SKIP GPU LEOPARD : compositing = PASS TIMEOUT FAIL
-WONTFIX SKIP GPU LEOPARD : platform/chromium/compositing = PASS TIMEOUT FAIL
-WONTFIX SKIP GPU LEOPARD : animations/3d = PASS TIMEOUT FAIL
+WONTFIX SKIP GPU GPU-CG LEOPARD : compositing = PASS TIMEOUT FAIL
+WONTFIX SKIP GPU GPU-CG LEOPARD : platform/chromium/compositing = PASS TIMEOUT FAIL
+WONTFIX SKIP GPU GPU-CG LEOPARD : animations/3d = PASS TIMEOUT FAIL
WONTFIX MAC WIN : platform/chromium-linux = FAIL
WONTFIX SKIP LINUX MAC : platform/win = FAIL CRASH PASS
@@ -2650,41 +2650,41 @@
//
// We only maintain pixel GPU baselines for Snow Leopard
-WONTFIX GPU LEOPARD : media = IMAGE PASS
+WONTFIX GPU GPU-CG LEOPARD : media = IMAGE PASS
// Will need windows and linux baselines
-BUGWK47923 GPU : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT
+BUGWK47923 GPU GPU-CG : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT
// Chromium does not support PDF content in <img> tags.
WONTFIX GPU WIN LINUX : compositing/color-matching/pdf-image-match.html = IMAGE+TEXT
-WONTFIX GPU MAC : compositing/color-matching/pdf-image-match.html = IMAGE
-WONTFIX GPU : compositing/images/direct-pdf-image.html = IMAGE
+WONTFIX GPU GPU-CG MAC : compositing/color-matching/pdf-image-match.html = IMAGE
+WONTFIX GPU GPU-CG : compositing/images/direct-pdf-image.html = IMAGE
// Chromium does not support PDF or plugin content in layers right now.
BUGWK47925 LINUX WIN GPU : compositing/plugins/composited-plugin.html = IMAGE+TEXT
-BUGWK47925 MAC GPU : compositing/plugins/composited-plugin.html = IMAGE+TEXT
-BUGWK47925 MAC GPU : compositing/plugins/small-to-large-composited-plugin.html = TEXT
+BUGWK47925 MAC GPU GPU-CG : compositing/plugins/composited-plugin.html = IMAGE+TEXT
+BUGWK47925 MAC GPU GPU-CG : compositing/plugins/small-to-large-composited-plugin.html = TEXT
BUGWK47949 LINUX WIN GPU : compositing/reflections/nested-reflection-anchor-point.html = IMAGE+TEXT
-BUGWK47949 MAC GPU : compositing/reflections/nested-reflection-anchor-point.html = IMAGE
+BUGWK47949 MAC GPU GPU-CG : compositing/reflections/nested-reflection-anchor-point.html = IMAGE
BUGWK47949 LINUX WIN GPU : compositing/reflections/reflection-opacity.html = IMAGE+TEXT
-BUGWK47949 MAC GPU : compositing/reflections/reflection-opacity.html = IMAGE
+BUGWK47949 MAC GPU GPU-CG : compositing/reflections/reflection-opacity.html = IMAGE
// Flaky because these are a poorly written tests. Need dino's new animation API
-BUGWK54306 GPU : compositing/reflections/animation-inside-reflection.html = PASS IMAGE IMAGE+TEXT
-BUGWK54306 GPU : compositing/reflections/nested-reflection-animated.html = PASS IMAGE
+BUGWK54306 GPU GPU-CG : compositing/reflections/animation-inside-reflection.html = PASS IMAGE IMAGE+TEXT
+BUGWK54306 GPU GPU-CG : compositing/reflections/nested-reflection-animated.html = PASS IMAGE
// These tests are too slow with our MESA backend. We can re-enable when we have
// bots running tests on real hardware.
-BUGWK49629 SKIP GPU : platform/chromium/compositing/lots-of-img-layers.html = PASS
-BUGWK49629 SKIP GPU : platform/chromium/compositing/lots-of-img-layers-with-opacity.html = PASS
-BUGWK49629 SKIP GPU : compositing/iframes/page-cache-layer-tree.html = PASS
+BUGWK49629 SKIP GPU GPU-CG : platform/chromium/compositing/lots-of-img-layers.html = PASS
+BUGWK49629 SKIP GPU GPU-CG : platform/chromium/compositing/lots-of-img-layers-with-opacity.html = PASS
+BUGWK49629 SKIP GPU GPU-CG : compositing/iframes/page-cache-layer-tree.html = PASS
BUGNONE SLOW WIN DEBUG GPU : fast/canvas/canvas-getImageData.html = PASS
// Accelerated 2d for mac isn't supported yet, so SKIP this test for now.
-BUGCR74979 SKIP MAC GPU : media/video-canvas-alpha.html = IMAGE
+BUGCR74979 SKIP MAC GPU GPU-CG : media/video-canvas-alpha.html = IMAGE
BUGWK67116 GPU DEBUG : compositing/layer-creation/overflow-scroll-overlap.html = PASS TEXT
@@ -2692,7 +2692,7 @@
// that needs to be implemented for GPU
BUGCR94918 GPU SKIP : media/media-document-audio-repaint.html = IMAGE+TEXT IMAGE
-BUGWK55968 MAC GPU : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE+TEXT
+BUGWK55968 MAC GPU GPU-CG : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE+TEXT
BUGWK55968 WIN DEBUG GPU : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE
// Flaky scrollbar issues
@@ -3125,7 +3125,7 @@
// pulled in from downstream during webkit roll 84350:84431
BUGCASEQ LINUX WIN : editing/selection/select-from-textfield-outwards.html = IMAGE+TEXT
BUGCASEQ LINUX WIN : fast/forms/input-text-drag-down.html = IMAGE+TEXT
-BUGCASEQ LEOPARD CPU : fast/canvas/image-object-in-canvas.html = IMAGE
+BUGCASEQ LEOPARD CPU CPU-CG : fast/canvas/image-object-in-canvas.html = IMAGE
BUGDPRANKE MAC DEBUG : transitions/cancel-transition.html = PASS TEXT
BUGDPRANKE LINUX DEBUG : fast/dom/Node/mutation-blur.html = PASS CRASH
@@ -3193,10 +3193,10 @@
BUGWK59642 WIN : editing/input/scroll-viewport-page-up-down.html = PASS TEXT
// These seem to be minor debug-only differences.
-BUGWK60135 SNOWLEOPARD CPU : css2.1/t1508-c527-font-05-b.html = PASS IMAGE+TEXT
-BUGWK60135 SNOWLEOPARD CPU : css2.1/t1508-c527-font-10-c.html = PASS IMAGE+TEXT
-BUGWK60135 SNOWLEOPARD DEBUG CPU : fast/text/international/thai-line-breaks.html = PASS IMAGE
-BUGWK60135 SNOWLEOPARD DEBUG CPU : fast/text/international/thai-baht-space.html = PASS IMAGE+TEXT
+BUGWK60135 SNOWLEOPARD CPU CPU-CG : css2.1/t1508-c527-font-05-b.html = PASS IMAGE+TEXT
+BUGWK60135 SNOWLEOPARD CPU CPU-CG : css2.1/t1508-c527-font-10-c.html = PASS IMAGE+TEXT
+BUGWK60135 SNOWLEOPARD DEBUG CPU CPU-CG : fast/text/international/thai-line-breaks.html = PASS IMAGE
+BUGWK60135 SNOWLEOPARD DEBUG CPU CPU-CG : fast/text/international/thai-baht-space.html = PASS IMAGE+TEXT
BUGWK60135 SNOWLEOPARD : css1/font_properties/font.html = PASS IMAGE+TEXT
BUGWK60133 DEBUG : http/tests/multipart/multipart-wait-before-boundary.html = PASS TIMEOUT
@@ -3438,13 +3438,13 @@
BUGCR86359 WIN : fast/dom/DeviceOrientation/add-listener-from-callback.html = PASS CRASH
// Broken because Chromium disables compositing for RTL pages
-BUGWK56591 GPU : compositing/rtl/rtl-absolute-overflow-scrolled.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-absolute-overflow.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-absolute.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-fixed-overflow-scrolled.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-fixed-overflow.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-fixed.html = TEXT
-BUGWK56591 GPU : compositing/rtl/rtl-relative.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-absolute-overflow-scrolled.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-absolute-overflow.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-absolute.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-fixed-overflow-scrolled.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-fixed-overflow.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-fixed.html = TEXT
+BUGWK56591 GPU GPU-CG : compositing/rtl/rtl-relative.html = TEXT
BUGWK63033 : svg/custom/absolute-root-position-masking.xhtml = IMAGE
BUGWK63036 MAC : svg/dom/SVGTransformList-basics.xhtml = IMAGE
Modified: trunk/Tools/ChangeLog (94699 => 94700)
--- trunk/Tools/ChangeLog 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/ChangeLog 2011-09-07 19:31:48 UTC (rev 94700)
@@ -1,3 +1,16 @@
+2011-09-07 Elliot Poger <[email protected]>
+
+ filter test_expectations properly for chromium-mac vs chromium-cg-mac
+ https://bugs.webkit.org/show_bug.cgi?id=67324
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
+
2011-09-07 Eric Boren <[email protected]>
[Chromium] Modify WebTouchEvent structure to match WebCore::TouchEvent
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (94699 => 94700)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-09-07 19:31:48 UTC (rev 94700)
@@ -51,6 +51,8 @@
if port_name.startswith('chromium-gpu-linux'):
return ChromiumGpuLinuxPort(port_name=port_name, **kwargs)
if port_name.startswith('chromium-gpu-cg-mac'):
+ return ChromiumGpuCgMacPort(port_name=port_name, **kwargs)
+ if port_name.startswith('chromium-gpu-mac'):
return ChromiumGpuMacPort(port_name=port_name, **kwargs)
if port_name.startswith('chromium-gpu-win'):
return ChromiumGpuWinPort(port_name=port_name, **kwargs)
@@ -59,8 +61,8 @@
# FIXME: These should really be a mixin class.
-def _set_gpu_options(port):
- port._graphics_type = 'gpu'
+def _set_gpu_options(port, graphics_type='gpu'):
+ port._graphics_type = graphics_type
if port.get_option('accelerated_compositing') is None:
port._options.accelerated_compositing = True
if port.get_option('accelerated_2d_canvas') is None:
@@ -101,10 +103,10 @@
return _tests(self, paths)
-class ChromiumGpuMacPort(chromium_mac.ChromiumMacPort):
+class ChromiumGpuCgMacPort(chromium_mac.ChromiumMacPort):
def __init__(self, port_name='chromium-gpu-cg-mac', **kwargs):
chromium_mac.ChromiumMacPort.__init__(self, port_name=port_name, **kwargs)
- _set_gpu_options(self)
+ _set_gpu_options(self, graphics_type='gpu-cg')
def baseline_search_path(self):
return (map(self._webkit_baseline_path, ['chromium-gpu-cg-mac', 'chromium-gpu']) +
@@ -114,6 +116,19 @@
return _tests(self, paths)
+class ChromiumGpuMacPort(chromium_mac.ChromiumMacPort):
+ def __init__(self, port_name='chromium-gpu-mac', **kwargs):
+ chromium_mac.ChromiumMacPort.__init__(self, port_name=port_name, **kwargs)
+ _set_gpu_options(self)
+
+ def baseline_search_path(self):
+ return (map(self._webkit_baseline_path, ['chromium-gpu-mac', 'chromium-gpu']) +
+ chromium_mac.ChromiumMacPort.baseline_search_path(self))
+
+ def tests(self, paths):
+ return _tests(self, paths)
+
+
class ChromiumGpuWinPort(chromium_win.ChromiumWinPort):
def __init__(self, port_name='chromium-gpu-win', **kwargs):
chromium_win.ChromiumWinPort.__init__(self, port_name=port_name, **kwargs)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py (94699 => 94700)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-09-07 19:31:48 UTC (rev 94700)
@@ -45,6 +45,8 @@
if sys.platform != 'darwin':
return
self.assert_port_works('chromium-gpu-cg-mac')
+ self.assert_port_works('chromium-gpu-mac')
+ # For now, chromium-gpu on Mac defaults to the chromium-gpu-cg-mac port.
self.assert_port_works('chromium-gpu-cg-mac', 'chromium-gpu', 'darwin')
def integration_test_chromium_gpu_win(self):
@@ -125,6 +127,12 @@
self.assertEquals(port.name(), 'chromium-gpu-cg-mac-snowleopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-gpu-cg-mac'))
+ def test_graphics_type(self):
+ port = factory.get('chromium-gpu-cg-mac')
+ self.assertEquals('gpu-cg', port.graphics_type())
+ port = factory.get('chromium-gpu-mac')
+ self.assertEquals('gpu', port.graphics_type())
+
if __name__ == '__main__':
port_testcase.main()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (94699 => 94700)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-09-07 19:31:48 UTC (rev 94700)
@@ -101,6 +101,10 @@
self._version = port_name[port_name.index('-mac-') + len('-mac-'):]
assert self._version in self.SUPPORTED_OS_VERSIONS
self._using_core_graphics = port_name.find('-cg-') != -1
+ if self._using_core_graphics:
+ self._graphics_type = 'cpu-cg'
+ else:
+ self._graphics_type = 'cpu'
self._operating_system = 'mac'
def baseline_search_path(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (94699 => 94700)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2011-09-07 19:31:48 UTC (rev 94700)
@@ -81,6 +81,15 @@
port = chromium_mac.ChromiumMacPort(port_name='chromium-cg-mac-snowleopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-cg-mac'))
+ def test_graphics_type(self):
+ port = chromium_mac.ChromiumMacPort(port_name='chromium-cg-mac')
+ self.assertEquals('cpu-cg', port.graphics_type())
+ port = chromium_mac.ChromiumMacPort(port_name='chromium-mac')
+ self.assertEquals('cpu', port.graphics_type())
+ # For now, Mac defaults to cpu-cg graphics type.
+ port = chromium_mac.ChromiumMacPort()
+ self.assertEquals('cpu-cg', port.graphics_type())
+
if __name__ == '__main__':
port_testcase.main()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (94699 => 94700)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-09-07 19:29:30 UTC (rev 94699)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-09-07 19:31:48 UTC (rev 94700)
@@ -119,7 +119,8 @@
self.assert_port("chromium-gpu-linux", chromium_gpu.ChromiumGpuLinuxPort)
def test_chromium_gpu_mac(self):
- self.assert_port("chromium-gpu-cg-mac", chromium_gpu.ChromiumGpuMacPort)
+ self.assert_port("chromium-gpu-cg-mac", chromium_gpu.ChromiumGpuCgMacPort)
+ self.assert_port("chromium-gpu-mac", chromium_gpu.ChromiumGpuMacPort)
def test_chromium_gpu_win(self):
self.assert_port("chromium-gpu-win", chromium_gpu.ChromiumGpuWinPort)
