Skip to site navigation (Press enter)

[webkit-changes] [102454] trunk

caryclark Fri, 09 Dec 2011 08:18:45 -0800

Title: [102454] trunk

Revision: 102454
Author: [email protected]
Date: 2011-12-09 08:18:37 -0800 (Fri, 09 Dec 2011)

Log Message

Source/WebKit/chromium: Chromium DEPS roll to pick up new use_skia=1 default on Chromium-Mac
https://bugs.webkit.org/show_bug.cgi?id=74118


Reviewed by Adam Barth.

* DEPS:

Tools: layout_test update to accommodate new use_skia=1 default on Chromium-Mac
https://bugs.webkit.org/show_bug.cgi?id=74118

Reviewed by Adam Barth.

* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
(get):
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
(ChromiumMacPort.__init__):
* Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
(ChromiumMacPortTest.test_versions):
(ChromiumMacPortTest.test_graphics_type):

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (102453 => 102454)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-12-09 16:18:37 UTC (rev 102454)
@@ -1,3 +1,12 @@
+2011-12-09  Cary Clark  <[email protected]>
+
+        Chromium DEPS roll to pick up new use_skia=1 default on Chromium-Mac
+        https://bugs.webkit.org/show_bug.cgi?id=74118
+
+        Reviewed by Adam Barth.
+
+        * DEPS:
+
 2011-12-08  Fady Samuel  <[email protected]>
 
         [Chromium] Enable viewport metatag

Modified: trunk/Source/WebKit/chromium/DEPS (102453 => 102454)


--- trunk/Source/WebKit/chromium/DEPS	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Source/WebKit/chromium/DEPS	2011-12-09 16:18:37 UTC (rev 102454)
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '113603',
+  'chromium_rev': '113807',
   'nacl_svn': 'http://src.chromium.org/native_client/trunk',
   'nacl_rev': '7169',
 }

Modified: trunk/Tools/ChangeLog (102453 => 102454)


--- trunk/Tools/ChangeLog	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Tools/ChangeLog	2011-12-09 16:18:37 UTC (rev 102454)
@@ -1,3 +1,18 @@
+2011-12-09  Cary Clark  <[email protected]>
+
+        layout_test update to accommodate new use_skia=1 default on Chromium-Mac
+        https://bugs.webkit.org/show_bug.cgi?id=74118
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+        (get):
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+        (ChromiumMacPort.__init__):
+        * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+        (ChromiumMacPortTest.test_versions):
+        (ChromiumMacPortTest.test_graphics_type):
+
 2011-12-09  Tor Arne Vestbø  <[email protected]>
 
         [Qt] Use new qmake option in Qt5 to prevent dependency issues with GNUmake

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (102453 => 102454)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py	2011-12-09 16:18:37 UTC (rev 102454)
@@ -42,7 +42,7 @@
         elif platform.startswith('linux'):
             port_name = 'chromium-gpu-linux'
         elif platform == 'darwin':
-            port_name = 'chromium-gpu-cg-mac'
+            port_name = 'chromium-gpu-mac'
         else:
             raise NotImplementedError('unsupported platform: %s' % platform)

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (102453 => 102454)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py	2011-12-09 16:18:37 UTC (rev 102454)
@@ -112,7 +112,7 @@
     def __init__(self, host, port_name=None, os_version_string=None, **kwargs):
         # We're a little generic here because this code is reused by the
         # 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
-        port_name = port_name or 'chromium-cg-mac'
+        port_name = port_name or 'chromium-mac'
         chromium.ChromiumPort.__init__(self, host, port_name=port_name, **kwargs)
         if port_name.endswith('-mac'):
             self._version = mac.os_version(os_version_string, self.SUPPORTED_OS_VERSIONS)

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (102453 => 102454)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py	2011-12-09 15:19:05 UTC (rev 102453)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py	2011-12-09 16:18:37 UTC (rev 102454)
@@ -46,26 +46,26 @@
         self.assertEquals(expected, port.name())
 
     def test_versions(self):
-        self.assertTrue(self.make_port().name() in ('chromium-cg-mac-leopard', 'chromium-cg-mac-snowleopard', 'chromium-cg-mac-lion', 'chromium-cg-mac-future'))
+        self.assertTrue(self.make_port().name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac-lion', 'chromium-mac-future'))
 
-        self.assert_name(None, '10.5.3', 'chromium-cg-mac-leopard')
-        self.assert_name('chromium-cg-mac', '10.5.3', 'chromium-cg-mac-leopard')
-        self.assert_name('chromium-cg-mac-leopard', '10.5.3', 'chromium-cg-mac-leopard')
-        self.assert_name('chromium-cg-mac-leopard', '10.6.3', 'chromium-cg-mac-leopard')
+        self.assert_name(None, '10.5.3', 'chromium-mac-leopard')
+        self.assert_name('chromium-mac', '10.5.3', 'chromium-mac-leopard')
+        self.assert_name('chromium-mac-leopard', '10.5.3', 'chromium-mac-leopard')
+        self.assert_name('chromium-mac-leopard', '10.6.3', 'chromium-mac-leopard')
 
-        self.assert_name(None, '10.6.3', 'chromium-cg-mac-snowleopard')
-        self.assert_name('chromium-cg-mac', '10.6.3', 'chromium-cg-mac-snowleopard')
-        self.assert_name('chromium-cg-mac-snowleopard', '10.5.3', 'chromium-cg-mac-snowleopard')
-        self.assert_name('chromium-cg-mac-snowleopard', '10.6.3', 'chromium-cg-mac-snowleopard')
+        self.assert_name(None, '10.6.3', 'chromium-mac-snowleopard')
+        self.assert_name('chromium-mac', '10.6.3', 'chromium-mac-snowleopard')
+        self.assert_name('chromium-mac-snowleopard', '10.5.3', 'chromium-mac-snowleopard')
+        self.assert_name('chromium-mac-snowleopard', '10.6.3', 'chromium-mac-snowleopard')
 
-        self.assert_name(None, '10.7', 'chromium-cg-mac-lion')
-        self.assert_name(None, '10.7.3', 'chromium-cg-mac-lion')
-        self.assert_name(None, '10.8', 'chromium-cg-mac-future')
-        self.assert_name('chromium-cg-mac', '10.7.3', 'chromium-cg-mac-lion')
-        self.assert_name('chromium-cg-mac-future', '10.4.3', 'chromium-cg-mac-future')
-        self.assert_name('chromium-cg-mac-future', '10.5.3', 'chromium-cg-mac-future')
-        self.assert_name('chromium-cg-mac-future', '10.6.3', 'chromium-cg-mac-future')
-        self.assert_name('chromium-cg-mac-future', '10.7.3', 'chromium-cg-mac-future')
+        self.assert_name(None, '10.7', 'chromium-mac-lion')
+        self.assert_name(None, '10.7.3', 'chromium-mac-lion')
+        self.assert_name(None, '10.8', 'chromium-mac-future')
+        self.assert_name('chromium-mac', '10.7.3', 'chromium-mac-lion')
+        self.assert_name('chromium-mac-future', '10.4.3', 'chromium-mac-future')
+        self.assert_name('chromium-mac-future', '10.5.3', 'chromium-mac-future')
+        self.assert_name('chromium-mac-future', '10.6.3', 'chromium-mac-future')
+        self.assert_name('chromium-mac-future', '10.7.3', 'chromium-mac-future')
 
         self.assertRaises(AssertionError, self.assert_name, None, '10.4.1', 'should-raise-assertion-so-this-value-does-not-matter')
 
@@ -82,8 +82,8 @@
     def test_graphics_type(self):
         self.assertEquals('cpu-cg', self.make_port(port_name='chromium-cg-mac').graphics_type())
         self.assertEquals('cpu', self.make_port(port_name='chromium-mac').graphics_type())
-        # For now, Mac defaults to cpu-cg graphics type.
-        self.assertEquals('cpu-cg', self.make_port().graphics_type())
+        # Mac defaults to cpu graphics type.
+        self.assertEquals('cpu', self.make_port().graphics_type())
 
 
 if __name__ == '__main__':

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes