Modified: trunk/Source/WebKit2/ChangeLog (164724 => 164725)
--- trunk/Source/WebKit2/ChangeLog 2014-02-26 18:48:16 UTC (rev 164724)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-26 18:59:59 UTC (rev 164725)
@@ -1,3 +1,14 @@
+2014-02-26 Anders Carlsson <ander...@apple.com>
+
+ Get rid of WKViewIOS.mm
+ https://bugs.webkit.org/show_bug.cgi?id=129378
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKView.h:
+ * UIProcess/API/ios/WKViewIOS.mm: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2014-02-26 Alexey Proskuryakov <a...@apple.com>
[iOS] Remove some erroneously captured blocks
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (164724 => 164725)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-02-26 18:48:16 UTC (rev 164724)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-02-26 18:59:59 UTC (rev 164725)
@@ -25,11 +25,7 @@
#import <WebKit2/WKFoundation.h>
-#if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-#else
#import <Cocoa/Cocoa.h>
-#endif
#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKBrowsingContextController;
@@ -37,13 +33,7 @@
@class WKProcessGroup;
@class WKViewData;
-#if TARGET_OS_IPHONE
-WK_EXPORT
-@interface WKView : UIView {
-#else
-WK_EXPORT
@interface WKView : NSView <NSTextInputClient> {
-#endif
@private
WKViewData *_data;
unsigned _unused;
@@ -51,13 +41,8 @@
#if WK_API_ENABLED
-#if TARGET_OS_IPHONE
-- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
-- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
-#else
- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
-#endif
@property(readonly) WKBrowsingContextController *browsingContextController;
@@ -66,8 +51,4 @@
@property BOOL drawsBackground;
@property BOOL drawsTransparentBackground;
-#if TARGET_OS_IPHONE
-@property (nonatomic, readonly) UIScrollView *scrollView;
-#endif
-
@end
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164724 => 164725)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-26 18:48:16 UTC (rev 164724)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-26 18:59:59 UTC (rev 164725)
@@ -503,7 +503,6 @@
2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */; };
2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */; };
2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944861884E3B500ED86DB /* WKViewIOS.mm */; };
2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
@@ -2181,8 +2180,8 @@
2684054618B85E7E0022C38B /* ViewUpdateDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewUpdateDispatcher.h; sourceTree = "<group>"; };
2684054818B85FF70022C38B /* ViewUpdateDispatcher.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ViewUpdateDispatcher.messages.in; sourceTree = "<group>"; };
2684054A18B866FF0022C38B /* VisibleContentRectUpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisibleContentRectUpdateInfo.cpp; sourceTree = "<group>"; };
- 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewUpdateDispatcherMessageReceiver.cpp; path = "ViewUpdateDispatcherMessageReceiver.cpp"; sourceTree = "<group>"; };
- 2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewUpdateDispatcherMessages.h; path = "ViewUpdateDispatcherMessages.h"; sourceTree = "<group>"; };
+ 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewUpdateDispatcherMessageReceiver.cpp; sourceTree = "<group>"; };
+ 2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewUpdateDispatcherMessages.h; sourceTree = "<group>"; };
26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebViewPrivate.h; sourceTree = "<group>"; };
290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
@@ -2246,7 +2245,6 @@
2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemote.h; sourceTree = "<group>"; };
2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerCARemote.cpp; sourceTree = "<group>"; };
2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerCARemote.h; sourceTree = "<group>"; };
- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKViewIOS.mm; path = ios/WKViewIOS.mm; sourceTree = "<group>"; };
2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIOSEventFactory.h; path = ios/WebIOSEventFactory.h; sourceTree = "<group>"; };
@@ -4267,14 +4265,6 @@
name = ios;
sourceTree = "<group>";
};
- 2DA944771884E3AB00ED86DB /* ios */ = {
- isa = PBXGroup;
- children = (
- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */,
- );
- name = ios;
- sourceTree = "<group>";
- };
2DA944961884E4DA00ED86DB /* ios */ = {
isa = PBXGroup;
children = (
@@ -5288,7 +5278,6 @@
BC0C376610F807660076D7CB /* C */,
37C4C08318149C2A003688B9 /* Cocoa */,
BC8A501311765F4500757573 /* cpp */,
- 2DA944771884E3AB00ED86DB /* ios */,
BC111B47112F616900337BAB /* mac */,
1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */,
1A2464F21891E45100234C5B /* APILoaderClient.h */,
@@ -7901,7 +7890,6 @@
BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */,
0F5947A3187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp in Sources */,
BC33E0D212408E8600360F3F /* InjectedBundleRangeHandle.cpp in Sources */,
- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */,
BC14DF78120B5B7900826C0C /* InjectedBundleScriptWorld.cpp in Sources */,
1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
