Changeset 211342 in webkit


Ignore:
Timestamp:
Jan 28, 2017 3:13:17 PM (7 years ago)
Author:
Wenson Hsieh
Message:

Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
​https://bugs.webkit.org/show_bug.cgi?id=167555

Reviewed by Dan Bernstein.

Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
USE(APPLE_INTERNAL_SDK) instead.

Source/WebCore:

  • page/ios/EventHandlerIOS.mm:
  • platform/ios/DragImageIOS.mm:
  • platform/ios/PasteboardIOS.mm:
  • platform/mac/DragDataMac.mm:

Source/WebKit2:

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

Source/WTF:

  • wtf/Platform.h:
Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r211237 r211342  
     12017-01-28  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=167555
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
     9        USE(APPLE_INTERNAL_SDK) instead.
     10
     11        * wtf/Platform.h:
     12
    1132017-01-26  Saam Barati  <sbarati@apple.com>
    214

  • trunk/Source/WTF/wtf/Platform.h

    r211173 r211342  
    670670#include <wtf/FeatureDefines.h>
    671671
    672 #if defined(__has_include) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
     672#if USE(APPLE_INTERNAL_SDK)
    673673#include <WebKitAdditions/AdditionalFeatureDefines.h>
    674674#endif

  • trunk/Source/WebCore/ChangeLog

    r211341 r211342  
     12017-01-28  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=167555
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
     9        USE(APPLE_INTERNAL_SDK) instead.
     10
     11        * page/ios/EventHandlerIOS.mm:
     12        * platform/ios/DragImageIOS.mm:
     13        * platform/ios/PasteboardIOS.mm:
     14        * platform/mac/DragDataMac.mm:
     15
    1162017-01-28  Yoav Weiss  <yoav@yoav.ws>
    217

  • trunk/Source/WebCore/page/ios/EventHandlerIOS.mm

    r211192 r211342  
    5050#endif
    5151
    52 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/EventHandlerAdditions.mm>)
     52#if USE(APPLE_INTERNAL_SDK)
    5353#import <WebKitAdditions/EventHandlerAdditions.mm>
    5454#endif

  • trunk/Source/WebCore/platform/ios/DragImageIOS.mm

    r211192 r211342  
    2929#import <CoreGraphics/CoreGraphics.h>
    3030
    31 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragImageAdditions.mm>)
     31#if USE(APPLE_INTERNAL_SDK)
    3232
    3333#import <WebKitAdditions/DragImageAdditions.mm>

  • trunk/Source/WebCore/platform/ios/PasteboardIOS.mm

    r211227 r211342  
    5959@end
    6060
    61 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PasteboardAdditions.mm>)
     61#if USE(APPLE_INTERNAL_SDK)
    6262#import <WebKitAdditions/PasteboardAdditions.mm>
    6363#endif

  • trunk/Source/WebCore/platform/mac/DragDataMac.mm

    r211192 r211342  
    3434#import "WebCoreNSURLExtras.h"
    3535
    36 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragDataAdditions.mm>)
     36#if USE(APPLE_INTERNAL_SDK)
    3737
    3838#import <WebKitAdditions/DragDataAdditions.mm>

  • trunk/Source/WebKit2/ChangeLog

    r211341 r211342  
     12017-01-28  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=167555
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
     9        USE(APPLE_INTERNAL_SDK) instead.
     10
     11        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
     12        * UIProcess/ios/WKContentViewInteraction.h:
     13        * UIProcess/ios/WKContentViewInteraction.mm:
     14        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
     15
    1162017-01-28  Yoav Weiss  <yoav@yoav.ws>
    217

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

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

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

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

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

    r211227 r211342  
    500500@implementation WKContentView (WKInteraction)
    501501
    502 #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
     502#if USE(APPLE_INTERNAL_SDK)
    503503#import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
    504504#endif

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

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