Changeset 195937 in webkit


Ignore:
Timestamp:
Jan 31, 2016 3:00:03 PM (8 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Remove has_include guards around use of WebKitAdditions
​https://bugs.webkit.org/show_bug.cgi?id=153728

Reviewed by Andy Estes.

Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with has_include.

Source/WebCore:

  • dom/EventNames.h:
  • loader/EmptyClients.cpp:

(WebCore::fillWithEmptyClients):

  • page/MainFrame.cpp:

(WebCore::MainFrame::MainFrame):

  • page/MainFrame.h:
  • page/PageConfiguration.h:
  • platform/cocoa/WebKitAdditions.mm:
  • platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
  • platform/ios/LegacyTileGridTile.mm:

Source/WebKit/mac:

  • WebKitAdditions.mm:
  • WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

Source/WebKit2:

  • Shared/Cocoa/WebKitAdditions.mm:
  • Shared/WebCoreArgumentCoders.h:
  • Shared/mac/RemoteLayerBackingStore.mm:
  • UIProcess/API/Cocoa/WKWebView.mm:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::resetState):

  • UIProcess/WebPageProxy.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::m_shouldDispatchFakeMouseMoveEvents):

Location:
trunk/Source
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r195928 r195937  
     12016-01-31  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Remove __has_include guards around use of WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=153728
     5
     6        Reviewed by Andy Estes.
     7
     8        Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
     9
     10        * dom/EventNames.h:
     11        * loader/EmptyClients.cpp:
     12        (WebCore::fillWithEmptyClients):
     13        * page/MainFrame.cpp:
     14        (WebCore::MainFrame::MainFrame):
     15        * page/MainFrame.h:
     16        * page/PageConfiguration.h:
     17        * platform/cocoa/WebKitAdditions.mm:
     18        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
     19        * platform/ios/LegacyTileGridTile.mm:
     20
    1212016-01-31  Darin Adler  <darin@apple.com>
    222

  • trunk/Source/WebCore/dom/EventNames.h

    r195698 r195937  
    2828#include <wtf/text/AtomicString.h>
    2929
    30 #if defined(__has_include) && __has_include(<WebKitAdditions/EventNamesAdditions.h>)
     30#if USE(APPLE_INTERNAL_SDK)
    3131#import <WebKitAdditions/EventNamesAdditions.h>
    3232#endif

  • trunk/Source/WebCore/loader/EmptyClients.cpp

    r195698 r195937  
    4545#include <wtf/NeverDestroyed.h>
    4646
    47 #if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsIncludes.h>)
     47#if USE(APPLE_INTERNAL_SDK)
    4848#include <WebKitAdditions/EmptyClientsIncludes.h>
    4949#endif
    … …  
    139139    pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
    140140
    141 #if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsFill.cpp>)
     141#if USE(APPLE_INTERNAL_SDK)
    142142#include <WebKitAdditions/EmptyClientsFill.cpp>
    143143#endif

  • trunk/Source/WebCore/page/MainFrame.cpp

    r195698 r195937  
    4040#endif /* PLATFORM(MAC) */
    4141
    42 #if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
     42#if USE(APPLE_INTERNAL_SDK)
    4343#include <WebKitAdditions/MainFrameIncludes.h>
    4444#endif
    … …  
    5858    , m_diagnosticLoggingClient(configuration.diagnosticLoggingClient)
    5959{
    60 #if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameInitialization.cpp>)
     60#if USE(APPLE_INTERNAL_SDK)
    6161#include <WebKitAdditions/MainFrameInitialization.cpp>
    6262#endif

  • trunk/Source/WebCore/page/MainFrame.h

    r195698 r195937  
    3030#include <wtf/Vector.h>
    3131
    32 #if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
     32#if USE(APPLE_INTERNAL_SDK)
    3333#include <WebKitAdditions/MainFrameIncludes.h>
    3434#endif
    … …  
    6969    WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
    7070
    71 #if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameMembers.h>)
     71#if USE(APPLE_INTERNAL_SDK)
    7272#include <WebKitAdditions/MainFrameMembers.h>
    7373#endif

  • trunk/Source/WebCore/page/PageConfiguration.h

    r195698 r195937  
    3030#include <wtf/RefPtr.h>
    3131
    32 #if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationIncludes.h>)
     32#if USE(APPLE_INTERNAL_SDK)
    3333#include <WebKitAdditions/PageConfigurationIncludes.h>
    3434#endif
    … …  
    7878    DiagnosticLoggingClient* diagnosticLoggingClient { nullptr };
    7979
    80 #if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationMembers.h>)
     80#if USE(APPLE_INTERNAL_SDK)
    8181#include <WebKitAdditions/PageConfigurationMembers.h>
    8282#endif

  • trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm

    r195698 r195937  
    2626#include "config.h"
    2727
    28 #if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreAdditions.cpp>)
     28#if USE(APPLE_INTERNAL_SDK)
    2929#include <WebKitAdditions/WebCoreAdditions.cpp>
    3030#endif

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r195595 r195937  
    6666#endif
    6767
    68 #if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
     68#if USE(APPLE_INTERNAL_SDK)
    6969#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
    7070#else

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

    r194819 r195937  
    4040#include <wtf/NeverDestroyed.h>
    4141
    42 #if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
     42#if USE(APPLE_INTERNAL_SDK)
    4343#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
    4444#else

  • trunk/Source/WebKit/mac/ChangeLog

    r195901 r195937  
     12016-01-31  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Remove __has_include guards around use of WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=153728
     5
     6        Reviewed by Andy Estes.
     7
     8        Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
     9
     10        * WebKitAdditions.mm:
     11        * WebView/WebView.mm:
     12        (-[WebView _commonInitializationWithFrameName:groupName:]):
     13        (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
     14
    1152016-01-29  Ada Chan  <adachan@apple.com>
    216

  • trunk/Source/WebKit/mac/WebKitAdditions.mm

    r195698 r195937  
    2424 */
    2525
    26 #ifdef __has_include
    27 #if __has_include(<WebKitAdditions/WebKitLegacyAdditions.cpp>)
     26#if USE(APPLE_INTERNAL_SDK)
    2827#include <WebKitAdditions/WebKitLegacyAdditions.cpp>
    2928#endif
    30 #endif

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r195698 r195937  
    296296#endif
    297297
    298 #if defined(__has_include) && __has_include(<WebKitAdditions/WebViewIncludes.h>)
     298#if USE(APPLE_INTERNAL_SDK)
    299299#import <WebKitAdditions/WebViewIncludes.h>
    300300#endif
    … …  
    974974#endif
    975975
    976 #if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
     976#if USE(APPLE_INTERNAL_SDK)
    977977#import <WebKitAdditions/WebViewInitialization.mm>
    978978#endif
    … …  
    12181218#endif
    12191219
    1220 #if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
     1220#if USE(APPLE_INTERNAL_SDK)
    12211221#import <WebKitAdditions/WebViewInitialization.mm>
    12221222#endif

  • trunk/Source/WebKit2/ChangeLog

    r195934 r195937  
     12016-01-31  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Remove __has_include guards around use of WebKitAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=153728
     5
     6        Reviewed by Andy Estes.
     7
     8        Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
     9
     10        * Shared/Cocoa/WebKitAdditions.mm:
     11        * Shared/WebCoreArgumentCoders.h:
     12        * Shared/mac/RemoteLayerBackingStore.mm:
     13        * UIProcess/API/Cocoa/WKWebView.mm:
     14        * UIProcess/WebPageProxy.cpp:
     15        (WebKit::WebPageProxy::WebPageProxy):
     16        (WebKit::WebPageProxy::reattachToWebProcess):
     17        (WebKit::WebPageProxy::resetState):
     18        * UIProcess/WebPageProxy.h:
     19        * WebProcess/WebPage/WebPage.cpp:
     20        (WebKit::m_shouldDispatchFakeMouseMoveEvents):
     21
    1222016-01-31  Timothy Horton  <timothy_horton@apple.com>
    223

  • trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm

    r195698 r195937  
    2626#import "config.h"
    2727
    28 #if defined(__has_include) && __has_include(<WebKitAdditions/WebKitAdditions.mm>)
     28#if USE(APPLE_INTERNAL_SDK)
    2929#import <WebKitAdditions/WebKitAdditions.mm>
    3030#endif

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r195698 r195937  
    466466} // namespace IPC
    467467
    468 #if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreArgumentCodersAdditions.h>)
     468#if USE(APPLE_INTERNAL_SDK)
    469469#include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
    470470#endif

  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

    r195082 r195937  
    4545#endif
    4646
    47 #if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
     47#if USE(APPLE_INTERNAL_SDK)
    4848#import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
    4949#else

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r195722 r195937  
    143143};
    144144
    145 #if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
     145#if USE(APPLE_INTERNAL_SDK)
    146146#import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
    147147#else

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r195934 r195937  
    166166#endif
    167167
    168 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
     168#if USE(APPLE_INTERNAL_SDK)
    169169#include <WebKitAdditions/WebPageProxyIncludes.h>
    170170#endif
    … …  
    475475#endif
    476476
    477 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
     477#if USE(APPLE_INTERNAL_SDK)
    478478#include <WebKitAdditions/WebPageProxyInitialization.cpp>
    479479#endif
    … …  
    707707#endif
    708708
    709 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
     709#if USE(APPLE_INTERNAL_SDK)
    710710#include <WebKitAdditions/WebPageProxyInitialization.cpp>
    711711#endif
    … …  
    50465046#endif
    50475047
    5048 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInvalidation.cpp>)
     5048#if USE(APPLE_INTERNAL_SDK)
    50495049#include <WebKitAdditions/WebPageProxyInvalidation.cpp>
    50505050#endif

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r195755 r195937  
    123123#endif
    124124
    125 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
     125#if USE(APPLE_INTERNAL_SDK)
    126126#include <WebKitAdditions/WebPageProxyIncludes.h>
    127127#endif
    … …  
    15581558#endif
    15591559
    1560 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyMembers.h>)
     1560#if USE(APPLE_INTERNAL_SDK)
    15611561#include <WebKitAdditions/WebPageProxyMembers.h>
    15621562#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r195755 r195937  
    232232#endif
    233233
    234 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageIncludes.h>)
     234#if USE(APPLE_INTERNAL_SDK)
    235235#include <WebKitAdditions/WebPageIncludes.h>
    236236#endif
    … …  
    399399    pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
    400400
    401 #if defined(__has_include) && __has_include(<WebKitAdditions/WebPageInitialization.h>)
     401#if USE(APPLE_INTERNAL_SDK)
    402402#include <WebKitAdditions/WebPageInitialization.h>
    403403#endif
Note: See TracChangeset for help on using the changeset viewer.