Merge pull request #14 from brightray/latest-chromium

Update to Chromium r202921

VERSION

@@ -1 +1 @@
-CHROMIUM_REVISION=194718
+CHROMIUM_REVISION=202921

chromiumcontent.gypi

@@ -54,6 +54,8 @@
       'WEBKIT_PLUGINS_IMPLEMENTATION',
       'WEBKIT_STORAGE_IMPLEMENTATION',
       'WEBKIT_USER_AGENT_IMPLEMENTATION',
+      'WEBORIGIN_IMPLEMENTATION',
+      'WTF_IMPLEMENTATION',
     ],
     'defines!': [
       '_HAS_EXCEPTIONS=0',
@@ -105,7 +107,7 @@
           'NET_IMPLEMENTATION',
         ],
       }],
-      ['_target_name in ["v8", "v8_snapshot", "v8_nosnapshot", "v8_base", "mksnapshot", "v8_shell", "preparser_lib"]', {
+      ['_target_name in ["v8", "v8_snapshot", "v8_shell", "preparser_lib"] or "v8_nosnapshot." in _target_name or "v8_base." in _target_name or "mksnapshot." in _target_name', {
         # Override src/v8/build/common.gypi's RuntimeLibrary setting.
         'configurations': {
           'Debug': {

patches/resource_update.patch

@@ -0,0 +1,18 @@
+Index: cc/resources/resource_update.h
+===================================================================
+--- cc/resources/resource_update.h	(revision 202921)
++++ cc/resources/resource_update.h	(working copy)
+@@ -7,12 +7,12 @@
+ 
+ #include "base/memory/ref_counted.h"
+ #include "cc/base/cc_export.h"
++#include "third_party/skia/include/core/SkCanvas.h"
+ #include "skia/ext/refptr.h"
+ #include "ui/gfx/rect.h"
+ #include "ui/gfx/vector2d.h"
+ 
+ class SkBitmap;
+-class SkCanvas;
+ 
+ namespace cc {
+ 

patches/v8_debug.patch

@@ -0,0 +1,26 @@
+Index: v8/include/v8.h
+===================================================================
+--- v8/include/v8.h	(revision 14861)
++++ v8/include/v8.h	(working copy)
+@@ -4118,7 +4118,7 @@
+  * be performed.
+  */
+ class V8EXPORT AssertNoGCScope {
+-#ifndef DEBUG
++#ifdef NDEBUG
+   V8_INLINE(AssertNoGCScope(Isolate* isolate)) {}
+ #else
+   AssertNoGCScope(Isolate* isolate);
+Index: v8/src/api.cc
+===================================================================
+--- v8/src/api.cc	(revision 14861)
++++ v8/src/api.cc	(working copy)
+@@ -6279,7 +6279,7 @@
+ }
+ 
+ 
+-#ifdef DEBUG
++#ifndef NDEBUG
+ v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate)
+   : isolate_(isolate),
+     last_state_(i::EnterAllocationScope(

script/create-dist

@@ -74,15 +74,11 @@ INCLUDE_DIRS = [
     'testing/gtest/include',
     'third_party/WebKit/Source/Platform/chromium/public',
     'third_party/WebKit/Source/WebKit/chromium/public',
+    'third_party/WebKit/public',
     'third_party/skia/include',
-    'ui/base',
-    'ui/gfx',
-    'ui/shell_dialogs',
-    'ui/surface',
+    'ui',
     'v8/include',
-    'webkit/glue',
-    'webkit/plugins',
-    'webkit/user_agent',
+    'webkit',
 ]
 OTHER_HEADERS = [
     'chrome/browser/ui/cocoa/event_utils.h',