Title: [211547] trunk/Source/WebKit2
Revision
211547
Author
wenson_hs...@apple.com
Date
2017-02-01 17:54:46 -0800 (Wed, 01 Feb 2017)

Log Message

Unreviewed, fix the nightly open source build.

Adds more header checks when importing from WebKitAdditions.

* UIProcess/Cocoa/WebPageProxyCocoa.mm:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (211546 => 211547)


--- trunk/Source/WebKit2/ChangeLog	2017-02-02 01:49:20 UTC (rev 211546)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-02 01:54:46 UTC (rev 211547)
@@ -1,3 +1,14 @@
+2017-02-01  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        Unreviewed, fix the nightly open source build.
+
+        Adds more header checks when importing from WebKitAdditions.
+
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+
 2017-02-01  Simon Fraser  <simon.fra...@apple.com>
 
         [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (211546 => 211547)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm	2017-02-02 01:49:20 UTC (rev 211546)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm	2017-02-02 01:54:46 UTC (rev 211547)
@@ -34,7 +34,7 @@
 #import <WebCore/ValidationBubble.h>
 #import <wtf/cf/TypeCastsCF.h>
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
 #import <WebKitAdditions/WebPageProxyAdditions.mm>
 #endif
 

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211546 => 211547)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2017-02-02 01:49:20 UTC (rev 211546)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2017-02-02 01:54:46 UTC (rev 211547)
@@ -44,7 +44,7 @@
 #import <wtf/Vector.h>
 #import <wtf/text/WTFString.h>
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.h>)
 #import <WebKitAdditions/WKContentViewInteractionAdditions.h>
 #endif
 

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211546 => 211547)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-02 01:49:20 UTC (rev 211546)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-02 01:54:46 UTC (rev 211547)
@@ -501,7 +501,7 @@
 
 @implementation WKContentView (WKInteraction)
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
 #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
 #endif
 

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211546 => 211547)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2017-02-02 01:49:20 UTC (rev 211546)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2017-02-02 01:54:46 UTC (rev 211547)
@@ -51,7 +51,7 @@
 using namespace WebCore;
 using namespace WebKit;
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
 #import <WebKitAdditions/WebDragClientAdditions.mm>
 #endif
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to