 ===================================================================
 --- third_party/WebKit/public/web/WebUserGestureToken.h	(revision 155959)
 +++ third_party/WebKit/public/web/WebUserGestureToken.h	(working copy)
-@@ -56,7 +56,7 @@
-     WEBKIT_EXPORT bool hasGestures() const;
+@@ -58,7 +58,7 @@
+     WEBKIT_EXPORT void setJavascriptPrompt();
      bool isNull() const { return m_token.isNull(); }
  
 -#if WEBKIT_IMPLEMENTATION

===================================================================
--- third_party/WebKit/public/platform/WebDeviceMotionData.h	(revision 155959)
+++ third_party/WebKit/public/platform/WebDeviceMotionData.h	(working copy)
@@ -69,7 +69,7 @@
     bool hasRotationRateGamma : 1;
 };
 
-#if WEBKIT_IMPLEMENTATION
+#if INSIDE_WEBKIT
 COMPILE_ASSERT(sizeof(WebDeviceMotionData) == (10 * sizeof(double) + 2 * sizeof(char)), WebDeviceMotionData_has_wrong_size);
 #endif
 
Index: third_party/WebKit/public/platform/WebFloatQuad.h
===================================================================
--- third_party/WebKit/public/platform/WebFloatQuad.h	(revision 155959)

===================================================================
--- third_party/WebKit/public/platform/WebURL.h	(revision 155959)
+++ third_party/WebKit/public/platform/WebURL.h	(working copy)
@@ -35,7 +35,7 @@
 #include "WebString.h"
 #include <url/url_parse.h>
 
-#if WEBKIT_IMPLEMENTATION
