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 77 matching lines @@
     'remoting_it2me_locale_files': [
       'webapp/me2mom/_locales/en/messages.json',
     ],
   },
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
+      '../skia/config',
+      '../third_party/skia/include/config',

[Wez, 2011/08/08 20:49:34]

Do we need these if our targets have appropriate Skia dependencies?

[dmac, 2011/08/10 20:30:36]

Tightened up the includes properly.

     ],
   },
 
   'conditions': [
     ['os_posix == 1', {
       'targets': [
         # Simple webserver for testing remoting client plugin.
         {
           'target_name': 'remoting_client_test_webserver',
           'type': 'executable',
@@ skipping 15 matching lines @@
       'dependencies': [
         'remoting_base',
         'remoting_client',
         'remoting_jingle_glue',
         '../media/media.gyp:media',
         '../ppapi/ppapi.gyp:ppapi_cpp_objects',
 
         # TODO(sergeyu): This is a hack: plugin should not depend on
         # webkit glue. Skia is needed here to add include path webkit glue
         # depends on. See comments in chromoting_instance.cc for details.
         # crbug.com/74951

[Wez, 2011/08/08 20:49:34]

Now that we have a real dependency on Skia, is this comment valid?

         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/skia/skia.gyp:skia',
       ],
       'sources': [
         'client/plugin/chromoting_instance.cc',
         'client/plugin/chromoting_instance.h',
         'client/plugin/chromoting_scriptable_object.cc',
         'client/plugin/chromoting_scriptable_object.h',
         'client/plugin/pepper_entrypoints.cc',
         'client/plugin/pepper_entrypoints.h',
@@ skipping 118 matching lines @@
             '<@(remoting_it2me_os_files)',
             '--locales',
             '<@(remoting_it2me_locale_files)',
           ],
         },
       ],
     }, # end of target 'webapp_it2me'
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
       'dependencies': [

[Wez, 2011/08/08 20:49:34]

Doesn't base depend on skia now, since EncoderVp8 uses it internally?

         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
         '../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',
@@ skipping 40 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 471 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
 }