Issue 11066132: Remove use_libcc_for_compositor gyp variable - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(88)

My Issues | Starred Open | Closed | All

Issue 11066132: Remove use_libcc_for_compositor gyp variable (Closed)

Created:
8 years, 2 months ago by jamesr

Modified:
8 years, 2 months ago

Reviewers:
enne (OOO)

CC:
chromium-reviews, cc-bugs_chromium.org, darin-cc_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Remove use_libcc_for_compositor gyp variable We flipped the default to 1 a few weeks ago and the tree doesn't compile with this set to 0. Time to go! BUG= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162049

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : rebased #

Patch Set 4 : rebased #

Created: 8 years, 2 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+134 lines, -293 lines)			Patch
	M	build/common.gypi	View	1	1 chunk	+0 lines, -3 lines	0 comments	Download
	M	cc/cc.gyp	View	1 2	2 chunks	+55 lines, -60 lines	0 comments	Download
	M	cc/cc_tests.gyp	View	1 2 3	4 chunks	+39 lines, -53 lines	0 comments	Download
	M	webkit/compositor_bindings/WebCompositorImpl.cpp	View		1 chunk	+0 lines, -2 lines	0 comments	Download
	M	webkit/compositor_bindings/compositor_bindings.gyp	View		3 chunks	+27 lines, -48 lines	0 comments	Download
	M	webkit/compositor_bindings/compositor_bindings_tests.gyp	View		2 chunks	+13 lines, -25 lines	0 comments	Download
	M	webkit/compositor_bindings/web_compositor_support_impl.cc	View		5 chunks	+0 lines, -95 lines	0 comments	Download
	M	webkit/glue/webkit_glue.gypi	View		2 chunks	+0 lines, -7 lines	0 comments	Download

Messages

Total messages: 8 (0 generated)

Expand Messages | Collapse Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11066132/5001

8 years, 2 months ago (2012-10-15 21:56:54 UTC) #3

commit-bot: I haz the power

Failed to apply patch for cc/cc.gyp: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

8 years, 2 months ago (2012-10-15 21:56:57 UTC) #4

Failed to apply patch for cc/cc.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/cc.gyp
  Hunk #2 FAILED at 350.
  1 out of 2 hunks FAILED -- saving rejects to file cc/cc.gyp.rej

Patch:       cc/cc.gyp
Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index
be5b960804919083dfbf0631386b6fd54ce91db1..39e856adb3cc8f88cf5cff67fe1d159dba103a06
100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -5,7 +5,6 @@
 {
   'variables': {
     'chromium_code': 0,
-    'use_libcc_for_compositor%': 0,
     'cc_source_files': [
       'hash_pair.h',
       'own_ptr_vector.h',
@@ -351,67 +350,62 @@
       'includes': [
         'cc.gypi',
       ],
-      'conditions': [
-        ['use_libcc_for_compositor==1', {
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-           
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '<(DEPTH)/skia/skia.gyp:skia',
-            '<(DEPTH)/ui/gl/gl.gyp:gl',
-            '<(DEPTH)/ui/ui.gyp:ui',
-            '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-           
'<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
-           
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
-          ],
-          'defines': [
-            'WTF_USE_ACCELERATED_COMPOSITING=1',
-            # http://crbug.com/154052
-            'WEBKIT_GLUE_IMPLEMENTATION=1',
-          ],
-          'include_dirs': [
-            '<(webkit_src_dir)/Source/Platform/chromium',
-            '<@(cc_stubs_dirs)',
-          ],
-          'sources': [
-            '<@(cc_source_files)',
-            'stubs/Extensions3D.h',
-            'stubs/Extensions3DChromium.h',
-            'stubs/FloatPoint.h',
-            'stubs/FloatPoint3D.h',
-            'stubs/FloatQuad.h',
-            'stubs/FloatRect.h',
-            'stubs/FloatSize.h',
-            'stubs/GraphicsContext3D.h',
-            'stubs/GraphicsTypes3D.h',
-            'stubs/IntPoint.h',
-            'stubs/IntRect.h',
-            'stubs/IntSize.h',
-            'stubs/NotImplemented.h',
-            'stubs/Region.h',
-            'stubs/SkiaUtils.h',
-            'stubs/TilingData.h',
-            'stubs/TraceEvent.h',
-            'stubs/UnitBezier.h',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+       
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+       
'<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
+       
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
+      ],
+      'defines': [
+        # http://crbug.com/154052
+        'WEBKIT_GLUE_IMPLEMENTATION=1',
+      ],
+      'include_dirs': [
+        '<(webkit_src_dir)/Source/Platform/chromium',
+        '<@(cc_stubs_dirs)',
+      ],
+      'sources': [
+        '<@(cc_source_files)',
+        'stubs/Extensions3D.h',
+        'stubs/Extensions3DChromium.h',
+        'stubs/FloatPoint.h',
+        'stubs/FloatPoint3D.h',
+        'stubs/FloatQuad.h',
+        'stubs/FloatRect.h',
+        'stubs/FloatSize.h',
+        'stubs/GraphicsContext3D.h',
+        'stubs/GraphicsTypes3D.h',
+        'stubs/IntPoint.h',
+        'stubs/IntRect.h',
+        'stubs/IntSize.h',
+        'stubs/NotImplemented.h',
+        'stubs/Region.h',
+        'stubs/SkiaUtils.h',
+        'stubs/TilingData.h',
+        'stubs/TraceEvent.h',
+        'stubs/UnitBezier.h',
 
-            'stubs/extensions_3d_chromium.h',
-            'stubs/extensions_3d.h',
-            'stubs/float_point_3d.h',
-            'stubs/float_point.h',
-            'stubs/float_quad.h',
-            'stubs/float_rect.h',
-            'stubs/float_size.h',
-            'stubs/graphics_context_3d.h',
-            'stubs/graphics_types_3d.h',
-            'stubs/int_point.h',
-            'stubs/int_rect.h',
-            'stubs/int_size.h',
-            'stubs/not_implemented.h',
-            'stubs/skia_utils.h',
-            'stubs/tiling_data.h',
-            'stubs/trace_event.h',
-            'stubs/unit_bezier.h',
-          ],
-        }],
+        'stubs/extensions_3d_chromium.h',
+        'stubs/extensions_3d.h',
+        'stubs/float_point_3d.h',
+        'stubs/float_point.h',
+        'stubs/float_quad.h',
+        'stubs/float_rect.h',
+        'stubs/float_size.h',
+        'stubs/graphics_context_3d.h',
+        'stubs/graphics_types_3d.h',
+        'stubs/int_point.h',
+        'stubs/int_rect.h',
+        'stubs/int_size.h',
+        'stubs/not_implemented.h',
+        'stubs/skia_utils.h',
+        'stubs/tiling_data.h',
+        'stubs/trace_event.h',
+        'stubs/unit_bezier.h',
       ],
     },
   ],

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11066132/11001

8 years, 2 months ago (2012-10-15 22:41:13 UTC) #5

commit-bot: I haz the power

Failed to apply patch for cc/cc_tests.gyp: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

8 years, 2 months ago (2012-10-15 22:41:15 UTC) #6

Failed to apply patch for cc/cc_tests.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/cc_tests.gyp
  Hunk #2 FAILED at 108.
  1 out of 2 hunks FAILED -- saving rejects to file cc/cc_tests.gyp.rej

Patch:       cc/cc_tests.gyp
Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index
2834a0a178e81de06d75f6c361575ba0301b60b0..c94200e8154bc85d9d9d943b544f48c3c38428bc
100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -5,7 +5,6 @@
 {
   'variables': {
     'chromium_code': 0,
-    'use_libcc_for_compositor%': 0,
     'cc_tests_source_files': [
       'hash_pair_unittest.cc',
       'active_animation_unittest.cc',
@@ -109,67 +108,50 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
+        '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+        'cc.gyp:cc',
+        'cc_test_support',
       ],
       'sources': [
         'test/run_all_unittests.cc',
+        '<@(cc_tests_source_files)',
       ],
-      'conditions': [
-        ['use_libcc_for_compositor==1', {
-          'dependencies': [
-            '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-            '../skia/skia.gyp:skia',
-            'cc.gyp:cc',
-            'cc_test_support',
-          ],
-          'defines': [
-            'USE_LIBCC_FOR_COMPOSITOR',
-          ],
-          'include_dirs': [
-            'stubs',
-            'test',
-            '.',
-            '../third_party/WebKit/Source/Platform/chromium',
-          ],
-          'sources': [
-            '<@(cc_tests_source_files)',
-          ],
-        }],
+      'include_dirs': [
+        'stubs',
+        'test',
+        '.',
+        '../third_party/WebKit/Source/Platform/chromium',
       ],
     },
-  ],
-  'conditions': [
-    ['use_libcc_for_compositor==1', {
-      'targets': [
-        {
-          'target_name': 'cc_test_support',
-          'type': 'static_library',
-          'include_dirs': [
-            'stubs',
-            'test',
-            '.',
-            '..',
-            '../third_party/WebKit/Source/Platform/chromium',
-          ],
-          'dependencies': [
-            '../ui/gl/gl.gyp:gl',
-            '../testing/gtest.gyp:gtest',
-            '../testing/gmock.gyp:gmock',
-            '../skia/skia.gyp:skia',
-            '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-           
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
-            '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-           
'../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/support/webkit_support.gyp:glue',
-          ],
-          'sources': [
-            '<@(cc_tests_support_files)',
-            'test/test_webkit_platform.cc',
-            'test/test_webkit_platform.h',
-          ],
-        },
+    {
+      'target_name': 'cc_test_support',
+      'type': 'static_library',
+      'include_dirs': [
+        'stubs',
+        'test',
+        '.',
+        '..',
+        '../third_party/WebKit/Source/Platform/chromium',
       ],
-    }],
+      'dependencies': [
+        '../ui/gl/gl.gyp:gl',
+        '../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
+        '../skia/skia.gyp:skia',
+        '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+       
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
+        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+       
'../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
+        '../webkit/support/webkit_support.gyp:glue',
+      ],
+      'sources': [
+        '<@(cc_tests_support_files)',
+        'test/test_webkit_platform.cc',
+        'test/test_webkit_platform.h',
+      ],
+    },
   ],
 }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11066132/15001

8 years, 2 months ago (2012-10-15 23:01:17 UTC) #7

Change committed as 162049

Expand Messages | Collapse Messages

Powered by Google App Engine

This is Rietveld 408576698