Fix up compositor mocking.

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 38 matching lines @@
         'layer.h',
         'layer_animation_delegate.h',
         'layer_animation_element.cc',
         'layer_animation_element.h',
         'layer_animation_manager.cc',
         'layer_animation_manager.h',
         'layer_animation_sequence.cc',
         'layer_animation_sequence.h',
         'layer_animator.cc',
         'layer_animator.h',
+        'test_compositor.cc',

[sky, 2011/10/26 15:36:15]

Why are we compiling these all the time? Shouldn't they only be there for tests?

[jonathan.backer, 2011/10/26 15:58:33]

Mostly being expedient.

The previous GYP setup was flawed in that had .cc files in two different targets
(compositor and compositor_test_support). I could have a new target for
test_compositor that depends on compositor.

Another complication is that test_compositor and compositor_test_support need to
be usable independently (sometimes we want the test_compositor without the
compositor_test_support).

So in short, if I separate I need an additional target: compositor,
test_compositor, and compositor_test_support. I thought it was getting a bit
much.

+        'test_compositor.h',
+        'test_texture.cc',
+        'test_texture.h',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
           'sources!': [
             'compositor_stub.cc',
           ],
         }],
         ['OS == "win" and views_compositor == 1', {
           'sources!': [
             'compositor_stub.cc',
@@ skipping 30 matching lines @@
               'compositor_cc.h',
             ],
           }
         ],
       ],
     },
     {
       'target_name': 'compositor_test_support',
       'type': 'static_library',
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/skia/skia.gyp:skia',
+        'compositor',
       ],
       'sources': [
         'compositor_test_support.cc',
         'compositor_test_support.h',
       ],
       'conditions': [
         ['use_webkit_compositor == 1', {
             'dependencies': [
               '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
               '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
             ],
         }],
-        ['views_compositor==1', {
-          'sources': [
-          'compositor.cc',
-          'compositor.h',
-          'layer.cc',
-          'layer.h',
-          'layer_animator.cc',
-          'layer_animator.h',
-          'layer_animator_delegate.h',
-          'test_compositor.cc',
-          'test_compositor.h',
-          'test_texture.cc',
-          'test_texture.h',
-          ],
-        }],
       ],
     },
     {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        'compositor',
         'compositor_test_support',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
         'layer_animation_sequence_unittest.cc',
         'layer_animator_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
         'test_compositor_host.h',
         'test_compositor_host_linux.cc',
@@ skipping 18 matching lines @@
         }],
         ['OS!="mac"', {
           'dependencies': [
             '<(DEPTH)/chrome/chrome.gyp:packed_resources',
            ],
         }],
       ],
     },
   ],
 }