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 256 matching lines @@
       ],
     }, # end of target 'webapp_it2me'
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
+        '../skia/skia.gyp:skia',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../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',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
+        '../skia/skia.gyp:skia',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
       # TODO(hclam): Remove this and depend on libvpx directly once we remove
       # libvpx from FFmpeg.
       'include_dirs': [
         '../third_party/libvpx/source/libvpx',
       ],
       # This target needs a hard dependency because dependent targets
       # depend on chromotocol_proto_lib for headers.
@@ skipping 28 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',
@@ skipping 324 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 106 matching lines @@
         ['target_arch=="arm"', {
           'sources!': [
             'base/decoder_vp8_unittest.cc',
             'base/encoder_vp8_unittest.cc',
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }