Changeset 211547 in webkit


Ignore:
Timestamp:
Feb 1, 2017 5:54:46 PM (7 years ago)
Author:
Wenson Hsieh
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:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r211541 r211547  
     12017-02-01  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Unreviewed, fix the nightly open source build.
     4
     5        Adds more header checks when importing from WebKitAdditions.
     6
     7        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
     8        * UIProcess/ios/WKContentViewInteraction.h:
     9        * UIProcess/ios/WKContentViewInteraction.mm:
     10        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
     11
    1122017-02-01  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm

    r211342 r211547  
    3535#import <wtf/cf/TypeCastsCF.h>
    3636
    37 #if USE(APPLE_INTERNAL_SDK)
     37#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
    3838#import <WebKitAdditions/WebPageProxyAdditions.mm>
    3939#endif

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

    r211442 r211547  
    4545#import <wtf/text/WTFString.h>
    4646
    47 #if USE(APPLE_INTERNAL_SDK)
     47#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.h>)
    4848#import <WebKitAdditions/WKContentViewInteractionAdditions.h>
    4949#endif

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

    r211442 r211547  
    502502@implementation WKContentView (WKInteraction)
    503503
    504 #if USE(APPLE_INTERNAL_SDK)
     504#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
    505505#import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
    506506#endif

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

    r211438 r211547  
    5252using namespace WebKit;
    5353
    54 #if USE(APPLE_INTERNAL_SDK)
     54#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
    5555#import <WebKitAdditions/WebDragClientAdditions.mm>
    5656#endif
Note: See TracChangeset for help on using the changeset viewer.