Revert 96327 - Switch over to using SkRegions to calculate dirty areas.

remoting/remoting.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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     # Use a consistent MIME-type independent of branding.
@@ skipping 149 matching lines @@
       'type': 'loadable_module',
       'defines': [
         'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
       ],
       'dependencies': [
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'sources': [
         'host/plugin/host_plugin.cc',
         'host/plugin/host_plugin.def',
         'host/plugin/host_plugin.rc',
         'host/plugin/host_plugin_resource.h',
         'host/plugin/host_plugin_utils.cc',
         'host/plugin/host_plugin_utils.h',
         'host/plugin/host_script_object.cc',
         'host/plugin/host_script_object.h',
       ],
       'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-          ],
-        }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'xcode_settings': {
             'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
             'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
             'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
             'WRAPPER_EXTENSION': '<(plugin_extension)',
           },
           # TODO(mark): Come up with a fancier way to do this.  It should
@@ skipping 94 matching lines @@
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
         '../media/media.gyp:yuv_convert',
         'remoting_jingle_glue',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
         'proto/trace.gyp:trace_proto_lib',
         # TODO(hclam): Enable VP8 in the build.
         #'third_party/on2/on2.gyp:vp8',
       ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
       # This target needs a hard dependency because dependent targets
       # depend on chromotocol_proto_lib for headers.
       'hard_dependency': 1,
       'sources': [
@@ skipping 26 matching lines @@
         'base/encoder_row_based.cc',
         'base/encoder_row_based.h',
         'base/rate_counter.cc',
         'base/rate_counter.h',
         'base/running_average.cc',
         'base/running_average.h',
         'base/task_thread_proxy.cc',
         'base/task_thread_proxy.h',
         'base/tracer.cc',
         'base/tracer.h',
+        'base/types.h',
         'base/util.cc',
         'base/util.h',
       ],
       'conditions': [
         ['target_arch=="arm"', {
           'sources!': [
             'base/decoder_vp8.cc',
             'base/decoder_vp8.h',
             'base/encoder_vp8.cc',
             'base/encoder_vp8.h',
           ],
         }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-          ],
-        }],
       ],
     },  # end of target 'remoting_base'
 
     {
       'target_name': 'remoting_host',
       'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
         'remoting_protocol',
         'differ_block',
         '../crypto/crypto.gyp:crypto',
       ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'sources': [
         'host/access_verifier.h',
         'host/capturer.h',
         'host/capturer_helper.cc',
         'host/capturer_helper.h',
         'host/capturer_fake.cc',
         'host/capturer_fake.h',
         'host/capturer_linux.cc',
         'host/capturer_mac.cc',
         'host/capturer_win.cc',
@@ skipping 66 matching lines @@
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXdamage',
               '-lXtst',
               '-lpam',
               '-lXext'
             ],
           },
         }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-          ],
-        }],
         ['OS=="mac"', {
           'sources': [
             '../third_party/GTM/AppKit/GTMCarbonEvent.h',
             '../third_party/GTM/AppKit/GTMCarbonEvent.m',
             '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h',
             '../third_party/GTM/DebugUtils/GTMTypeCasting.h',
             '../third_party/GTM/Foundation/GTMObjectSingleton.h',
             '../third_party/GTM/GTMDefines.h',
           ],
           'include_dirs': [
@@ skipping 12 matching lines @@
     },  # end of target 'remoting_host'
 
     {
       'target_name': 'remoting_client',
       'type': 'static_library',
       'dependencies': [
         'remoting_base',
         'remoting_jingle_glue',
         'remoting_protocol',
       ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'sources': [
         'client/chromoting_client.cc',
         'client/chromoting_client.h',
         'client/chromoting_stats.cc',
         'client/chromoting_stats.h',
         'client/chromoting_view.cc',
         'client/chromoting_view.h',
         'client/client_config.cc',
         'client/client_config.h',
         'client/client_context.cc',
         'client/client_context.h',
         'client/frame_consumer.h',
         'client/input_handler.cc',
         'client/input_handler.h',
         'client/ipc_host_resolver.cc',
         'client/ipc_host_resolver.h',
         'client/rectangle_update_decoder.cc',
         'client/rectangle_update_decoder.h',
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-          ],
-        }],
-      ],
     },  # end of target 'remoting_client'
 
     {
       'target_name': 'remoting_simple_host',
       'type': 'executable',
       'dependencies': [
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../media/media.gyp:media',
       ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'sources': [
         'host/capturer_fake_ascii.cc',
         'host/capturer_fake_ascii.h',
         'host/continue_window.h',
         'host/continue_window.cc',
         'host/continue_window_mac.mm',
         'host/continue_window_linux.cc',
         'host/continue_window_win.cc',
         'host/disconnect_window_linux.cc',
         'host/disconnect_window_mac.h',
         'host/disconnect_window_mac.mm',
         'host/disconnect_window_win.cc',
         'host/simple_host_process.cc',
         '../base/test/mock_chrome_application_mac.mm',
         '../base/test/mock_chrome_application_mac.h',
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-          ],
-        }],
-      ],
     },  # end of target 'remoting_simple_host'
 
     {
       'target_name': 'remoting_host_keygen',
       'type': 'executable',
       'dependencies': [
         'remoting_base',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../crypto/crypto.gyp:crypto',
@@ skipping 133 matching lines @@
         'protocol/video_reader.h',
         'protocol/video_stub.h',
         'protocol/video_writer.cc',
         'protocol/video_writer.h',
       ],
     },  # end of target 'remoting_protocol'
 
     {
       'target_name': 'differ_block',
       'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
       'dependencies': [
         '../media/media.gyp:cpu_features',
       ],
       'conditions': [
         [ 'target_arch == "ia32" or target_arch == "x64"', {
           'dependencies': [
             'differ_block_sse2',
           ],
         }],
       ],
       'sources': [
         'host/differ_block.cc',
         'host/differ_block.h',
       ],
     }, # end of target differ_block
 
     {
       'target_name': 'differ_block_sse2',
       'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
         }],
       ],
       'sources': [
         'host/differ_block_sse2.cc',
       ],
@@ skipping 26 matching lines @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../media/media.gyp:media',
         '../ui/ui.gyp:ui',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '../testing/gmock/include',
-        '../skia/config',
       ],
       'sources': [
         'base/auth_token_util_unittest.cc',
         'base/codec_test.cc',
         'base/codec_test.h',
         'base/compound_buffer_unittest.cc',
         'base/compressor_zlib_unittest.cc',
         'base/decoder_vp8_unittest.cc',
         'base/decompressor_zlib_unittest.cc',
         'base/encode_decode_unittest.cc',
@@ skipping 56 matching lines @@
               },
             ],
           ],
         }],
         ['target_arch=="arm"', {
           'sources!': [
             'base/decoder_vp8_unittest.cc',
             'base/encoder_vp8_unittest.cc',
           ],
         }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/skia/include/config',
-                ],
-        }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }