Switch over to using SkRegions to calculate dirty areas.

BUG=91619
TEST=Set up a remoting sesssion and make sure it works.

Review URL: http://codereview.chromium.org/7491070

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96327 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 50 insertions, 7 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 325313b..51b2973 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -167,6 +167,9 @@
         'remoting_jingle_glue',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
+      'include_dirs': [
+        '../skia/config',
+      ],
       'sources': [
         'host/plugin/host_plugin.cc',
         'host/plugin/host_plugin.def',
@@ -178,6 +181,11 @@
         'host/plugin/host_script_object.h',
       ],
       'conditions': [
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/skia/include/config',
+          ],
+        }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'xcode_settings': {
@@ -292,6 +300,9 @@
         # 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',
@@ -338,7 +349,6 @@
         'base/task_thread_proxy.h',
         'base/tracer.cc',
         'base/tracer.h',
-        'base/types.h',
         'base/util.cc',
         'base/util.h',
       ],
@@ -351,6 +361,11 @@
             'base/encoder_vp8.h',
           ],
         }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/skia/include/config',
+          ],
+        }],
       ],
     },  # end of target 'remoting_base'
 
@@ -364,6 +379,9 @@
         'differ_block',
         '../crypto/crypto.gyp:crypto',
       ],
+      'include_dirs': [
+        '../skia/config',
+      ],
       'sources': [
         'host/access_verifier.h',
         'host/capturer.h',
@@ -450,6 +468,11 @@
             ],
           },
         }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/skia/include/config',
+          ],
+        }],
         ['OS=="mac"', {
           'sources': [
             '../third_party/GTM/AppKit/GTMCarbonEvent.h',
@@ -482,6 +505,9 @@
         'remoting_jingle_glue',
         'remoting_protocol',
       ],
+      'include_dirs': [
+        '../skia/config',
+      ],
       'sources': [
         'client/chromoting_client.cc',
         'client/chromoting_client.h',
@@ -501,6 +527,13 @@
         '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'
 
     {
@@ -514,6 +547,9 @@
         '../base/base.gyp:base_i18n',
         '../media/media.gyp:media',
       ],
+      'include_dirs': [
+        '../skia/config',
+      ],
       'sources': [
         'host/capturer_fake_ascii.cc',
         'host/capturer_fake_ascii.h',
@@ -530,6 +566,13 @@
         '../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'
 
     {
@@ -683,9 +726,6 @@
     {
       'target_name': 'differ_block',
       'type': 'static_library',
-      'include_dirs': [
-        '..',
-      ],
       'dependencies': [
         '../media/media.gyp:cpu_features',
       ],
@@ -705,9 +745,6 @@
     {
       'target_name': 'differ_block_sse2',
       'type': 'static_library',
-      'include_dirs': [
-        '..',
-      ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
@@ -754,6 +791,7 @@
       ],
       'include_dirs': [
         '../testing/gmock/include',
+        '../skia/config',
       ],
       'sources': [
         'base/auth_token_util_unittest.cc',
@@ -830,6 +868,11 @@
             '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