Title: [108974] trunk/Tools
- Revision
- 108974
- Author
- commit-qu...@webkit.org
- Date
- 2012-02-27 02:06:06 -0800 (Mon, 27 Feb 2012)
Log Message
Add a ChromiumGpuAndroid port.
https://bugs.webkit.org/show_bug.cgi?id=79628
Patch by Hao Zheng <zheng...@chromium.org> on 2012-02-27
Reviewed by Adam Barth.
Android does have a gpu port, so revert r107697.
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.__init__):
* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
(ChromiumGpuAndroidPort):
(ChromiumGpuAndroidPort.__init__):
(ChromiumGpuAndroidPort.baseline_search_path):
(ChromiumGpuAndroidPort.default_child_processes):
(ChromiumGpuAndroidPort.tests):
* Scripts/webkitpy/layout_tests/port/factory.py:
(PortFactory):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (108973 => 108974)
--- trunk/Tools/ChangeLog 2012-02-27 10:01:36 UTC (rev 108973)
+++ trunk/Tools/ChangeLog 2012-02-27 10:06:06 UTC (rev 108974)
@@ -1,3 +1,23 @@
+2012-02-27 Hao Zheng <zheng...@chromium.org>
+
+ Add a ChromiumGpuAndroid port.
+ https://bugs.webkit.org/show_bug.cgi?id=79628
+
+ Reviewed by Adam Barth.
+
+ Android does have a gpu port, so revert r107697.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidPort.__init__):
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+ (ChromiumGpuAndroidPort):
+ (ChromiumGpuAndroidPort.__init__):
+ (ChromiumGpuAndroidPort.baseline_search_path):
+ (ChromiumGpuAndroidPort.default_child_processes):
+ (ChromiumGpuAndroidPort.tests):
+ * Scripts/webkitpy/layout_tests/port/factory.py:
+ (PortFactory):
+
2012-02-25 Gyuyoung Kim <gyuyoung....@samsung.com>
Change Build bot with BuildAndTest bot for EFL port.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (108973 => 108974)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-02-27 10:01:36 UTC (rev 108973)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-02-27 10:06:06 UTC (rev 108974)
@@ -141,12 +141,6 @@
def __init__(self, host, port_name, **kwargs):
chromium.ChromiumPort.__init__(self, host, port_name, **kwargs)
- # The chromium-android port always uses the GPU code path, so we set
- # these options here, almost as if this was the chromium-gpu-android
- # port.
- self._options.accelerated_2d_canvas = True
- self._options.accelerated_video = True
-
self._operating_system = 'android'
self._version = 'icecreamsandwich'
# FIXME: we may support other architectures in the future.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (108973 => 108974)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2012-02-27 10:01:36 UTC (rev 108973)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2012-02-27 10:06:06 UTC (rev 108974)
@@ -26,6 +26,7 @@
import sys
+import chromium_android
import chromium_linux
import chromium_mac
import chromium_win
@@ -70,6 +71,29 @@
return paths
+class ChromiumGpuAndroidPort(chromium_android.ChromiumAndroidPort):
+ port_name = 'chromium-gpu-android'
+
+ def __init__(self, host, port_name, **kwargs):
+ chromium_android.ChromiumAndroidPort.__init__(self, host, port_name, **kwargs)
+ _set_gpu_options(self)
+ # Always enable hardware gpu, as Android platform doesn't support Mesa.
+ self._options.enable_hardware_gpu = True
+
+ def baseline_search_path(self):
+ # Mimic the Linux -> Win expectations fallback in the ordinary Chromium port.
+ return (map(self._webkit_baseline_path, ['chromium-gpu-android', 'chromium-gpu-linux',
+ 'chromium-gpu-win', 'chromium-gpu']) +
+ chromium_android.ChromiumAndroidPort.baseline_search_path(self))
+
+ def default_child_processes(self):
+ return 1
+
+ def tests(self, paths):
+ paths = paths or _default_tests_paths(self)
+ return chromium_android.ChromiumAndroidPort.tests(self, paths)
+
+
class ChromiumGpuLinuxPort(chromium_linux.ChromiumLinuxPort):
port_name = 'chromium-gpu-linux'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (108973 => 108974)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2012-02-27 10:01:36 UTC (rev 108973)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2012-02-27 10:06:06 UTC (rev 108974)
@@ -43,6 +43,7 @@
class PortFactory(object):
PORT_CLASSES = (
'chromium_android.ChromiumAndroidPort',
+ 'chromium_gpu.ChromiumGpuAndroidPort',
'chromium_gpu.ChromiumGpuLinuxPort',
'chromium_gpu.ChromiumGpuMacPort',
'chromium_gpu.ChromiumGpuWinPort',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
