From 09acb9032a227ba6d44a880f96b538fcfd6cd465 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Jan 2015 20:53:06 -0800
Subject: [PATCH] Allow using blink's private headers

---
 atom.gyp                    | 2 ++
 atom/common/node_includes.h | 2 ++
 script/lib/config.py        | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/atom.gyp b/atom.gyp
index 3a08bd070572..7aa21a9d5845 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -550,6 +550,8 @@
         'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
         # The `node.h` is using `#include"ares.h"`.
         'vendor/node/deps/cares/include',
+        # The `third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h` is using `platform/PlatformExport.h`.
+        'vendor/brightray/vendor/download/libchromiumcontent/src/third_party/WebKit/Source',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
diff --git a/atom/common/node_includes.h b/atom/common/node_includes.h
index c2594122be7d..80567cbd49b4 100644
--- a/atom/common/node_includes.h
+++ b/atom/common/node_includes.h
@@ -7,6 +7,7 @@
 
 // Include common headers for using node APIs.
 
+#undef ASSERT
 #undef CHECK
 #undef CHECK_EQ
 #undef CHECK_NE
@@ -15,6 +16,7 @@
 #undef CHECK_LE
 #undef CHECK_LT
 #undef DISALLOW_COPY_AND_ASSIGN
+#undef NO_RETURN
 #undef debug_string  // This is defined in OS X 10.9 SDK in AssertMacros.h.
 #include "vendor/node/src/env.h"
 #include "vendor/node/src/env-inl.h"
diff --git a/script/lib/config.py b/script/lib/config.py
index 0558c248b99a..6619123a83a8 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -4,7 +4,7 @@ import platform
 import sys
 
 BASE_URL = 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '55efd338101e08691560192b2be0f9c3b1b0eb72'
+LIBCHROMIUMCONTENT_COMMIT = 'fba5addae75d944d62a8bd5f4fd23c2929405c83'
 
 ARCH = {
     'cygwin': '32bit',