Changeset 161939 in webkit


Ignore:
Timestamp:
Jan 13, 2014 7:35:51 PM (10 years ago)
Author:
timothy_horton@apple.com
Message:

iOS WebKit2 build fixes

  • NetworkProcess/NetworkResourceLoader.cpp:
  • NetworkProcess/NetworkResourceLoader.h:

Introduce/clarify some confusion about CFNETWORK vs. PLATFORM(IOS).

  • NetworkProcess/RemoteNetworkingContext.h:
  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:

Get rid of an override of something that doesn't exist anymore.

  • WebKit2.xcodeproj/project.pbxproj:

Add some files. It's likely there are more missing, but this is a start.

  • Shared/WebEventConversion.h:
  • WebProcess/WebPage/WebPage.h:

Use WebKitAdditions.

  • UIProcess/API/ios/WKGeolocationProviderIOS.mm:

Something bizarre is happening with internal deprecation warnings.

  • UIProcess/API/ios/WKInteractionView.mm:

(-[WKTextPosition isEqual:]):
Fix a typo.

  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:

Remove an override of something that doesn't exist anymore.

  • WebCore.xcodeproj/project.pbxproj:

Make some headers private instead of project for WK2's use.

Location:
trunk/Source
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r161936 r161939  
     12014-01-13  Tim Horton  <timothy_horton@apple.com>
     2
     3        iOS WebKit2 build fixes
     4
     5        * WebCore.xcodeproj/project.pbxproj:
     6        Make some headers private instead of project for WK2's use.
     7
    182014-01-13  Simon Fraser  <simon.fraser@apple.com>
    29

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r161936 r161939  
    519519                0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E409187F82E10045882C /* ScrollingTreeIOS.cpp */; };
    520520                0FC4E410187F82E10045882C /* ScrollingTreeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40A187F82E10045882C /* ScrollingTreeIOS.h */; };
    521                 0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; };
     521                0FC4E411187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4E40B187F82E10045882C /* ScrollingTreeScrollingNodeIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
    522522                0FC4E412187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FC4E40C187F82E10045882C /* ScrollingTreeScrollingNodeIOS.mm */; };
    523523                0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33230F2B9715004B6795 /* ColorCG.cpp */; };

  • trunk/Source/WebKit2/ChangeLog

    r161928 r161939  
     12014-01-13  Tim Horton  <timothy_horton@apple.com>
     2
     3        iOS WebKit2 build fixes
     4
     5        * NetworkProcess/NetworkResourceLoader.cpp:
     6        * NetworkProcess/NetworkResourceLoader.h:
     7        Introduce/clarify some confusion about CFNETWORK vs. PLATFORM(IOS).
     8
     9        * NetworkProcess/RemoteNetworkingContext.h:
     10        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
     11        Get rid of an override of something that doesn't exist anymore.
     12
     13        * WebKit2.xcodeproj/project.pbxproj:
     14        Add some files. It's likely there are more missing, but this is a start.
     15
     16        * Shared/WebEventConversion.h:
     17        * WebProcess/WebPage/WebPage.h:
     18        Use WebKitAdditions.
     19
     20        * UIProcess/API/ios/WKGeolocationProviderIOS.mm:
     21        Something bizarre is happening with internal deprecation warnings.
     22
     23        * UIProcess/API/ios/WKInteractionView.mm:
     24        (-[WKTextPosition isEqual:]):
     25        Fix a typo.
     26
     27        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
     28        Remove an override of something that doesn't exist anymore.
     29
    1302014-01-13  Andy Estes  <aestes@apple.com>
    231

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r161625 r161939  
    406406#endif
    407407
    408 #if PLATFORM(MAC)
     408#if PLATFORM(MAC) && !PLATFORM(IOS)
    409409void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
    410410{

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r161625 r161939  
    109109#if !PLATFORM(IOS)
    110110    virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE;
     111    virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
    111112#endif
    112     virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
    113113#endif // PLATFORM(MAC)
    114114

  • trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h

    r159724 r161939  
    6868    virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
    6969    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
    70 #if PLATFORM(IOS)
    71     virtual void reportNetworkDataUsage(uint64_t rawBytesSent, uint64_t rawBytesReceived, uint64_t cellularBytesSent, uint64_t cellularBytesReceived) OVERRIDE { }
    72 #endif // PLATFORM(IOS)
    7370#endif
    7471

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

    r159724 r161939  
    3333#if ENABLE(TOUCH_EVENTS)
    3434#if PLATFORM(IOS)
    35 #include <WebCore/PlatformTouchEventIOS.h>
     35#include <WebKitAdditions/PlatformTouchEventIOS.h>
    3636#else
    3737#include <WebCore/PlatformTouchEvent.h>

  • trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm

    r160300 r161939  
    4646using namespace WebKit;
    4747
     48#pragma clang diagnostic push
     49#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     50
    4851@interface WKGeolocationProviderIOS ()
    4952-(void)_startUpdating;
    … …  
    276279}
    277280@end
     281
     282#pragma clang diagnostic pop

  • trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm

    r161850 r161939  
    15601560- (BOOL)isEqual:(id)other
    15611561{
    1562     if (![object isKindOfClass:[WKTextPosition class]])
     1562    if (![other isKindOfClass:[WKTextPosition class]])
    15631563        return NO;
    15641564

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r161918 r161939  
    408408                2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */; };
    409409                2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
     410                2DA944871884E3B500ED86DB /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944781884E3B500ED86DB /* PageClientImplIOS.h */; };
     411                2DA944881884E3B500ED86DB /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */; };
     412                2DA944891884E3B500ED86DB /* UIWKRemoteView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */; };
     413                2DA9448A1884E3B500ED86DB /* UIWKRemoteView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */; };
     414                2DA9448B1884E3B500ED86DB /* WKContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447C1884E3B500ED86DB /* WKContentView.h */; };
     415                2DA9448C1884E3B500ED86DB /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9447D1884E3B500ED86DB /* WKContentView.mm */; };
     416                2DA9448D1884E3B500ED86DB /* WKContentViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */; };
     417                2DA9448E1884E3B500ED86DB /* WKGeolocationProviderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */; };
     418                2DA9448F1884E3B500ED86DB /* WKGeolocationProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */; };
     419                2DA944901884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */; };
     420                2DA944911884E3B500ED86DB /* WKInteractionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944821884E3B500ED86DB /* WKInteractionView.h */; };
     421                2DA944921884E3B500ED86DB /* WKInteractionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944831884E3B500ED86DB /* WKInteractionView.mm */; };
     422                2DA944931884E3B500ED86DB /* WKScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944841884E3B500ED86DB /* WKScrollView.h */; };
     423                2DA944941884E3B500ED86DB /* WKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944851884E3B500ED86DB /* WKScrollView.mm */; };
     424                2DA944951884E3B500ED86DB /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944861884E3B500ED86DB /* WKView.mm */; };
     425                2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
     426                2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
     427                2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
     428                2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */; };
     429                2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */; };
     430                2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */; };
     431                2DA944A41884E4F000ED86DB /* WKGestureTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */; };
    410432                2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */; };
    411433                2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */; };
    … …  
    20122034                2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerCARemote.cpp; sourceTree = "<group>"; };
    20132035                2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerCARemote.h; sourceTree = "<group>"; };
     2036                2DA944781884E3B500ED86DB /* PageClientImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageClientImplIOS.h; path = ios/PageClientImplIOS.h; sourceTree = "<group>"; };
     2037                2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PageClientImplIOS.mm; path = ios/PageClientImplIOS.mm; sourceTree = "<group>"; };
     2038                2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIWKRemoteView.h; path = ios/UIWKRemoteView.h; sourceTree = "<group>"; };
     2039                2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UIWKRemoteView.mm; path = ios/UIWKRemoteView.mm; sourceTree = "<group>"; };
     2040                2DA9447C1884E3B500ED86DB /* WKContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentView.h; path = ios/WKContentView.h; sourceTree = "<group>"; };
     2041                2DA9447D1884E3B500ED86DB /* WKContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentView.mm; path = ios/WKContentView.mm; sourceTree = "<group>"; };
     2042                2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInternal.h; path = ios/WKContentViewInternal.h; sourceTree = "<group>"; };
     2043                2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGeolocationProviderIOS.h; path = ios/WKGeolocationProviderIOS.h; sourceTree = "<group>"; };
     2044                2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOS.mm; path = ios/WKGeolocationProviderIOS.mm; sourceTree = "<group>"; };
     2045                2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKGeolocationProviderIOSObjCSecurityOrigin.mm; path = ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm; sourceTree = "<group>"; };
     2046                2DA944821884E3B500ED86DB /* WKInteractionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInteractionView.h; path = ios/WKInteractionView.h; sourceTree = "<group>"; };
     2047                2DA944831884E3B500ED86DB /* WKInteractionView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInteractionView.mm; path = ios/WKInteractionView.mm; sourceTree = "<group>"; };
     2048                2DA944841884E3B500ED86DB /* WKScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKScrollView.h; path = ios/WKScrollView.h; sourceTree = "<group>"; };
     2049                2DA944851884E3B500ED86DB /* WKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollView.mm; path = ios/WKScrollView.mm; sourceTree = "<group>"; };
     2050                2DA944861884E3B500ED86DB /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/WKView.mm; sourceTree = "<group>"; };
     2051                2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
     2052                2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
     2053                2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIOSEventFactory.h; path = ios/WebIOSEventFactory.h; sourceTree = "<group>"; };
     2054                2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebIOSEventFactory.mm; path = ios/WebIOSEventFactory.mm; sourceTree = "<group>"; };
     2055                2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPlatformTouchPointIOS.cpp; path = ios/WebPlatformTouchPointIOS.cpp; sourceTree = "<group>"; };
     2056                2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebTouchEventIOS.cpp; path = ios/WebTouchEventIOS.cpp; sourceTree = "<group>"; };
     2057                2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKGestureTypes.h; path = ios/WKGestureTypes.h; sourceTree = "<group>"; };
    20142058                2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreePropertyApplier.h; sourceTree = "<group>"; };
    20152059                2DDE0AF918298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreePropertyApplier.mm; sourceTree = "<group>"; };
    … …  
    35553599                        isa = PBXGroup;
    35563600                        children = (
     3601                                2DA944961884E4DA00ED86DB /* ios */,
    35573602                                BCDDB314124EBCEF0048D13C /* API */,
    35583603                                518E8EF116B208F000E91429 /* Authentication */,
    … …  
    38943939                        sourceTree = "<group>";
    38953940                };
     3941                2DA944771884E3AB00ED86DB /* ios */ = {
     3942                        isa = PBXGroup;
     3943                        children = (
     3944                                2DA944781884E3B500ED86DB /* PageClientImplIOS.h */,
     3945                                2DA944791884E3B500ED86DB /* PageClientImplIOS.mm */,
     3946                                2DA9447A1884E3B500ED86DB /* UIWKRemoteView.h */,
     3947                                2DA9447B1884E3B500ED86DB /* UIWKRemoteView.mm */,
     3948                                2DA9447C1884E3B500ED86DB /* WKContentView.h */,
     3949                                2DA9447D1884E3B500ED86DB /* WKContentView.mm */,
     3950                                2DA9447E1884E3B500ED86DB /* WKContentViewInternal.h */,
     3951                                2DA9447F1884E3B500ED86DB /* WKGeolocationProviderIOS.h */,
     3952                                2DA944801884E3B500ED86DB /* WKGeolocationProviderIOS.mm */,
     3953                                2DA944811884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */,
     3954                                2DA944821884E3B500ED86DB /* WKInteractionView.h */,
     3955                                2DA944831884E3B500ED86DB /* WKInteractionView.mm */,
     3956                                2DA944841884E3B500ED86DB /* WKScrollView.h */,
     3957                                2DA944851884E3B500ED86DB /* WKScrollView.mm */,
     3958                                2DA944861884E3B500ED86DB /* WKView.mm */,
     3959                        );
     3960                        name = ios;
     3961                        sourceTree = "<group>";
     3962                };
     3963                2DA944961884E4DA00ED86DB /* ios */ = {
     3964                        isa = PBXGroup;
     3965                        children = (
     3966                                2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */,
     3967                                2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */,
     3968                                2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */,
     3969                                2DA9449A1884E4F000ED86DB /* WebIOSEventFactory.mm */,
     3970                                2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */,
     3971                                2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */,
     3972                                2DA9449D1884E4F000ED86DB /* WKGestureTypes.h */,
     3973                        );
     3974                        name = ios;
     3975                        sourceTree = "<group>";
     3976                };
    38963977                31099974146C8AA80029DEB9 /* Notifications (User) */ = {
    38973978                        isa = PBXGroup;
    … …  
    47674848                        isa = PBXGroup;
    47684849                        children = (
     4850                                2DA944771884E3AB00ED86DB /* ios */,
    47694851                                BC0C376610F807660076D7CB /* C */,
    47704852                                37C4C08318149C2A003688B9 /* Cocoa */,
    … …  
    58875969                                1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
    58885970                                1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
     5971                                2DA9448D1884E3B500ED86DB /* WKContentViewInternal.h in Headers */,
    58895972                                515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
    58905973                                37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */,
    … …  
    60616144                                5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,
    60626145                                514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,
     6146                                2DA944871884E3B500ED86DB /* PageClientImplIOS.h in Headers */,
    60636147                                1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */,
    60646148                                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
    … …  
    60696153                                296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
    60706154                                511D81FF185BBDEE001AED56 /* SQLiteIDBTransaction.h in Headers */,
     6155                                2DA9448B1884E3B500ED86DB /* WKContentView.h in Headers */,
     6156                                2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
    60716157                                7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */,
    60726158                                1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
    … …  
    61186204                                1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */,
    61196205                                75E749EA180DBB9800088BA6 /* WebOriginDataManagerMessages.h in Headers */,
     6206                                2DA944931884E3B500ED86DB /* WKScrollView.h in Headers */,
    61206207                                51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */,
    61216208                                BCCB75C61203A1CE00222D1B /* WebContextMessageKinds.h in Headers */,
    … …  
    61256212                                2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */,
    61266213                                330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
     6214                                2DA944911884E3B500ED86DB /* WKInteractionView.h in Headers */,
    61276215                                330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
    61286216                                330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
    … …  
    61566244                                1A90C1EE1264FD50003E44D4 /* WebFindOptions.h in Headers */,
    61576245                                BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
     6246                                2DA944891884E3B500ED86DB /* UIWKRemoteView.h in Headers */,
    61586247                                BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
    61596248                                75A8D2D7187D303A00C39C9E /* WKSessionRef.h in Headers */,
    … …  
    62566345                                33367630130C9998006C9DE2 /* WebResourceCacheManager.h in Headers */,
    62576346                                33367656130C9ECA006C9DE2 /* WebResourceCacheManagerMessages.h in Headers */,
     6347                                2DA944A41884E4F000ED86DB /* WKGestureTypes.h in Headers */,
    62586348                                33367636130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h in Headers */,
    62596349                                33367658130C9ECB006C9DE2 /* WebResourceCacheManagerProxyMessages.h in Headers */,
    … …  
    62716361                                1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */,
    62726362                                BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
     6363                                2DA9448E1884E3B500ED86DB /* WKGeolocationProviderIOS.h in Headers */,
    62736364                                51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
    62746365                                BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
    … …  
    72137304                                1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */,
    72147305                                BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
     7306                                2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
    72157307                                1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
    72167308                                5136183D163126DA00A99DDE /* ConnectionStack.cpp in Sources */,
    … …  
    72307322                                BCE81D98131AE02100241910 /* DictionaryPopupInfo.cpp in Sources */,
    72317323                                5167EEA1170377BF007681CA /* DiskCacheMonitor.mm in Sources */,
     7324                                2DA9448F1884E3B500ED86DB /* WKGeolocationProviderIOS.mm in Sources */,
    72327325                                518E8F0716B2093700E91429 /* Download.cpp in Sources */,
    72337326                                2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */,
    … …  
    72467339                                8CFECE941490F140002AAA32 /* EditorState.cpp in Sources */,
    72477340                                93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */,
     7341                                2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
    72487342                                51B15A8413843A3900321AD8 /* EnvironmentUtilities.cpp in Sources */,
    72497343                                1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */,
    … …  
    72887382                                0F5947A3187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp in Sources */,
    72897383                                BC33E0D212408E8600360F3F /* InjectedBundleRangeHandle.cpp in Sources */,
     7384                                2DA944951884E3B500ED86DB /* WKView.mm in Sources */,
    72907385                                BC14DF78120B5B7900826C0C /* InjectedBundleScriptWorld.cpp in Sources */,
    72917386                                1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
    … …  
    73547449                                BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
    73557450                                BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
     7451                                2DA944941884E3B500ED86DB /* WKScrollView.mm in Sources */,
     7452                                2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */,
    73567453                                BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
    73577454                                51E351F5180F5C7500E53BE9 /* WebIDBFactoryBackend.cpp in Sources */,
    … …  
    73887485                                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
    73897486                                BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */,
     7487                                2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
    73907488                                1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
    73917489                                9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */,
    … …  
    74687566                                BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
    74697567                                51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */,
     7568                                2DA9448C1884E3B500ED86DB /* WKContentView.mm in Sources */,
    74707569                                1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */,
    74717570                                518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
    … …  
    74937592                                51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */,
    74947593                                512935D71288D19400A4B695 /* WebContextMenuItem.cpp in Sources */,
     7594                                2DA9448A1884E3B500ED86DB /* UIWKRemoteView.mm in Sources */,
    74957595                                510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */,
    74967596                                2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */,
    … …  
    75027602                                1A9E329A1822E1CC00F5D04C /* WKRemoteObject.mm in Sources */,
    75037603                                F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,
     7604                                2DA944901884E3B500ED86DB /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */,
    75047605                                330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */,
    75057606                                330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */,
    … …  
    76027703                                1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */,
    76037704                                BC857E8712B71EBB00EDEB2E /* WebPageProxyMac.mm in Sources */,
     7705                                2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */,
    76047706                                BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */,
    76057707                                1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
    … …  
    76547756                                51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
    76557757                                29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */,
     7758                                2DA944921884E3B500ED86DB /* WKInteractionView.mm in Sources */,
    76567759                                1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */,
    76577760                                512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */,
    … …  
    77657868                                BC407607124FF0270068F20A /* WKType.cpp in Sources */,
    77667869                                7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */,
     7870                                2DA944881884E3B500ED86DB /* PageClientImplIOS.mm in Sources */,
    77677871                                51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */,
    77687872                                BC407609124FF0270068F20A /* WKURL.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h

    r159724 r161939  
    5959    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
    6060    virtual WebCore::NetworkStorageSession& storageSession() const OVERRIDE;
    61 #if PLATFORM(IOS)
    62     virtual void reportNetworkDataUsage(uint64_t rawBytesSent, uint64_t rawBytesReceived, uint64_t cellularBytesSent, uint64_t cellularBytesReceived) OVERRIDE { }
    63 #endif // PLATFORM(IOS)
    6461};
    6562

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

    r161679 r161939  
    7878#if ENABLE(TOUCH_EVENTS)
    7979#if PLATFORM(IOS)
    80 #include <WebCore/PlatformTouchEventIOS.h>
     80#include <WebKitAdditions/PlatformTouchEventIOS.h>
    8181#else
    8282#include <WebCore/PlatformTouchEvent.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h

    r161530 r161939  
    8383#if PLATFORM(IOS)
    8484    virtual void setDeviceScaleFactor(float) OVERRIDE;
    85     virtual bool allowCompositingLayerVisualDegradation() const OVERRIDE { return false; }
    8685#endif
    8786
Note: See TracChangeset for help on using the changeset viewer.