Diff
Modified: trunk/Source/WebCore/ChangeLog (185020 => 185021)
--- trunk/Source/WebCore/ChangeLog 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/ChangeLog 2015-05-30 00:11:48 UTC (rev 185021)
@@ -1,3 +1,27 @@
+2015-05-29 Anders Carlsson <[email protected]>
+
+ Get rid of WAKViewPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=145482
+ rdar://problem/21162149
+
+ Reviewed by Dan Bernstein.
+
+ Merge WAKViewPrivate.h into WAKViewInternal.h and move the NSView sizing enum
+ to WAKView.h since that was the only thing WebKit used (indirectly) from WAKViewPrivate.h.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/WAKViewInternal.h:
+ (WAKViewForWKViewRef):
+ * platform/ios/ScrollViewIOS.mm:
+ * platform/ios/wak/WAKResponder.m:
+ * platform/ios/wak/WAKView.h:
+ * platform/ios/wak/WAKView.mm:
+ * platform/ios/wak/WAKViewPrivate.h: Removed.
+ (WAKViewForWKViewRef): Deleted.
+ * platform/ios/wak/WAKWindow.mm:
+ * platform/ios/wak/WKView.h:
+ * platform/ios/wak/WKView.mm:
+
2015-05-29 Daniel Bates <[email protected]>
Clean up logic for updating caps lock indicator state
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (185020 => 185021)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-30 00:11:48 UTC (rev 185021)
@@ -3830,7 +3830,6 @@
A14832B7187F636C00DA63A6 /* WAKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483293187F508700DA63A6 /* WAKScrollView.mm */; };
A14832B8187F638600DA63A6 /* WAKView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483294187F508700DA63A6 /* WAKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
A14832B9187F63D500DA63A6 /* WAKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483295187F508700DA63A6 /* WAKView.mm */; };
- A14832BA187F63E900DA63A6 /* WAKViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483296187F508700DA63A6 /* WAKViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
A14832BB187F643200DA63A6 /* WAKWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A1483297187F508700DA63A6 /* WAKWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
A14832BC187F648E00DA63A6 /* WAKWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1483298187F508700DA63A6 /* WAKWindow.mm */; };
A14832BD187F64B400DA63A6 /* WKContentObservation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A2187F508700DA63A6 /* WKContentObservation.cpp */; };
@@ -11134,7 +11133,6 @@
A1483293187F508700DA63A6 /* WAKScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKScrollView.mm; sourceTree = "<group>"; };
A1483294187F508700DA63A6 /* WAKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKView.h; sourceTree = "<group>"; };
A1483295187F508700DA63A6 /* WAKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKView.mm; sourceTree = "<group>"; };
- A1483296187F508700DA63A6 /* WAKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKViewPrivate.h; sourceTree = "<group>"; };
A1483297187F508700DA63A6 /* WAKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKWindow.h; sourceTree = "<group>"; };
A1483298187F508700DA63A6 /* WAKWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WAKWindow.mm; sourceTree = "<group>"; };
A1483299187F508700DA63A6 /* WebCoreThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreThread.h; sourceTree = "<group>"; };
@@ -18789,7 +18787,6 @@
A1483294187F508700DA63A6 /* WAKView.h */,
A1483295187F508700DA63A6 /* WAKView.mm */,
1A874ADE19085E9100B03171 /* WAKViewInternal.h */,
- A1483296187F508700DA63A6 /* WAKViewPrivate.h */,
A1483297187F508700DA63A6 /* WAKWindow.h */,
A1483298187F508700DA63A6 /* WAKWindow.mm */,
A1483299187F508700DA63A6 /* WebCoreThread.h */,
@@ -27028,7 +27025,6 @@
A14832B6187F631F00DA63A6 /* WAKScrollView.h in Headers */,
A14832B8187F638600DA63A6 /* WAKView.h in Headers */,
1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */,
- A14832BA187F63E900DA63A6 /* WAKViewPrivate.h in Headers */,
A14832BB187F643200DA63A6 /* WAKWindow.h in Headers */,
FD7F299213D4C0CB00AD9535 /* WaveShaperDSPKernel.h in Headers */,
FD7F299413D4C0CB00AD9535 /* WaveShaperNode.h in Headers */,
Modified: trunk/Source/WebCore/platform/WAKViewInternal.h (185020 => 185021)
--- trunk/Source/WebCore/platform/WAKViewInternal.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/WAKViewInternal.h 2015-05-30 00:11:48 UTC (rev 185021)
@@ -25,7 +25,8 @@
#if TARGET_OS_IPHONE
-#import "WAKViewPrivate.h"
+#import "WAKView.h"
+#import "WKView.h"
@interface WAKView () {
@package
@@ -39,6 +40,23 @@
BOOL _drawsOwnDescendants;
}
+- (WKViewRef)_viewRef;
++ (WAKView *)_wrapperForViewRef:(WKViewRef)_viewRef;
+- (id)_initWithViewRef:(WKViewRef)view;
+- (BOOL)_handleResponderCall:(WKViewResponderCallbackType)type;
+- (NSMutableSet *)_subviewReferences;
+- (BOOL)_selfHandleEvent:(WebEvent *)event;
+
@end
+static inline WAKView *WAKViewForWKViewRef(WKViewRef view)
+{
+ if (!view)
+ return nil;
+ WAKView *wrapper = (WAKView *)view->wrapper;
+ if (wrapper)
+ return wrapper;
+ return [WAKView _wrapperForViewRef:view];
+}
+
#endif
Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -34,7 +34,7 @@
#import "WAKAppKitStubs.h"
#import "WAKClipView.h"
#import "WAKScrollView.h"
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import "WAKWindow.h"
#import "WKViewPrivate.h"
#import "WebCoreFrameView.h"
Modified: trunk/Source/WebCore/platform/ios/wak/WAKResponder.m (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WAKResponder.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKResponder.m 2015-05-30 00:11:48 UTC (rev 185021)
@@ -28,7 +28,7 @@
#if PLATFORM(IOS)
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import "WKViewPrivate.h"
@implementation WAKResponder
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h 2015-05-30 00:11:48 UTC (rev 185021)
@@ -36,6 +36,16 @@
extern NSString *WAKViewFrameSizeDidChangeNotification;
extern NSString *WAKViewDidScrollNotification;
+enum {
+ NSViewNotSizable = 0,
+ NSViewMinXMargin = 1,
+ NSViewWidthSizable = 2,
+ NSViewMaxXMargin = 4,
+ NSViewMinYMargin = 8,
+ NSViewHeightSizable = 16,
+ NSViewMaxYMargin = 32
+};
+
@class WAKWindow;
WEBCORE_EXPORT @interface WAKView : WAKResponder
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -31,7 +31,6 @@
#import "GraphicsContext.h"
#import "WAKClipView.h"
#import "WAKScrollView.h"
-#import "WAKViewPrivate.h"
#import "WAKWindow.h"
#import "WKGraphics.h"
#import "WKUtilities.h"
Deleted: trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2015-05-30 00:11:48 UTC (rev 185021)
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2005, 2006, 2007, 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WAKViewPrivate_h
-#define WAKViewPrivate_h
-
-#if TARGET_OS_IPHONE
-
-#import "WAKView.h"
-#import "WKViewPrivate.h"
-
-@interface WAKView (WAKPrivate)
-- (WKViewRef)_viewRef;
-+ (WAKView *)_wrapperForViewRef:(WKViewRef)_viewRef;
-- (id)_initWithViewRef:(WKViewRef)view;
-- (BOOL)_handleResponderCall:(WKViewResponderCallbackType)type;
-- (NSMutableSet *)_subviewReferences;
-- (BOOL)_selfHandleEvent:(WebEvent *)event;
-@end
-
-static inline WAKView *WAKViewForWKViewRef(WKViewRef view)
-{
- if (!view)
- return nil;
- WAKView *wrapper = (WAKView *)view->wrapper;
- if (wrapper)
- return wrapper;
- return [WAKView _wrapperForViewRef:view];
-}
-
-#endif // TARGET_OS_IPHONE
-
-#endif // WAKViewPrivate_h
Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -29,7 +29,7 @@
#if PLATFORM(IOS)
#import "LegacyTileCache.h"
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import "WebCoreSystemInterface.h"
#import "WebCoreThreadRun.h"
#import "WebEvent.h"
Modified: trunk/Source/WebCore/platform/ios/wak/WKView.h (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WKView.h 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.h 2015-05-30 00:11:48 UTC (rev 185021)
@@ -37,16 +37,6 @@
@class WAKWindow;
-enum {
- NSViewNotSizable = 0,
- NSViewMinXMargin = 1,
- NSViewWidthSizable = 2,
- NSViewMaxXMargin = 4,
- NSViewMinYMargin = 8,
- NSViewHeightSizable = 16,
- NSViewMaxYMargin = 32
-};
-
typedef enum {
WKViewNotificationViewDidMoveToWindow,
WKViewNotificationViewFrameSizeChanged,
Modified: trunk/Source/WebCore/platform/ios/wak/WKView.mm (185020 => 185021)
--- trunk/Source/WebCore/platform/ios/wak/WKView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -23,12 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
+#import "config.h"
#import "WKViewPrivate.h"
#if PLATFORM(IOS)
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import "WAKWindow.h"
#import "WKUtilities.h"
#import <wtf/Assertions.h>
Modified: trunk/Source/WebKit/mac/ChangeLog (185020 => 185021)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-30 00:11:48 UTC (rev 185021)
@@ -1,5 +1,24 @@
2015-05-29 Anders Carlsson <[email protected]>
+ Get rid of WAKViewPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=145482
+ rdar://problem/21162149
+
+ Reviewed by Dan Bernstein.
+
+ Remove WAKViewPrivate.h imports.
+
+ * DefaultDelegates/WebDefaultUIDelegate.m:
+ * MigrateHeaders.make:
+ * Misc/WebKitNSStringExtras.mm:
+ * Misc/WebNSViewExtras.m:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebFrame.mm:
+ * WebView/WebFrameView.mm:
+ * WebView/WebHTMLView.mm:
+
+2015-05-29 Anders Carlsson <[email protected]>
+
WebResourceLoadDelegatePrivate.h cannot be imported standalone (missing WebNSInteger type)
https://bugs.webkit.org/show_bug.cgi?id=145476
rdar://problem/21162400
Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m (185020 => 185021)
--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-05-30 00:11:48 UTC (rev 185021)
@@ -37,7 +37,6 @@
#endif
#if PLATFORM(IOS)
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
#import <WebCore/WKViewPrivate.h>
#endif
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (185020 => 185021)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-30 00:11:48 UTC (rev 185021)
@@ -208,7 +208,6 @@
$(PRIVATE_HEADERS_DIR)/WAKResponder.h \
$(PRIVATE_HEADERS_DIR)/WAKScrollView.h \
$(PRIVATE_HEADERS_DIR)/WAKView.h \
- $(PRIVATE_HEADERS_DIR)/WAKViewPrivate.h \
$(PRIVATE_HEADERS_DIR)/WAKWindow.h \
$(PRIVATE_HEADERS_DIR)/WKContentObservation.h \
$(PRIVATE_HEADERS_DIR)/WKGraphics.h \
Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (185020 => 185021)
--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -39,7 +39,6 @@
#import <sys/param.h>
#if PLATFORM(IOS)
-#import <WebCore/WAKViewPrivate.h>
#import <WebKitLegacy/DOM.h>
#import <WebKitLegacy/WebFrame.h>
#import <WebKitLegacy/WebFrameView.h>
Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (185020 => 185021)
--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2015-05-30 00:11:48 UTC (rev 185021)
@@ -41,7 +41,6 @@
#endif
#if PLATFORM(IOS)
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (185020 => 185021)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -136,7 +136,6 @@
#import <WebCore/HTMLPlugInImageElement.h>
#import <WebCore/WAKClipView.h>
#import <WebCore/WAKScrollView.h>
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
#import <WebCore/WebCoreThreadMessage.h>
#import "WebKitVersionChecks.h"
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (185020 => 185021)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -121,7 +121,6 @@
#import <WebCore/RenderLayer.h>
#import <WebCore/TextResourceDecoder.h>
#import <WebCore/WAKScrollView.h>
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WKGraphics.h>
#import <WebCore/WebCoreThreadRun.h>
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (185020 => 185021)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -78,7 +78,6 @@
#import <WebCore/MainFrame.h>
#import <WebCore/WAKClipView.h>
#import <WebCore/WAKScrollView.h>
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
#import <WebCore/WKGraphics.h>
#import <WebCore/WebEvent.h>
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (185020 => 185021)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-29 23:59:26 UTC (rev 185020)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-30 00:11:48 UTC (rev 185021)
@@ -152,7 +152,6 @@
#import <WebCore/PlatformEventFactoryIOS.h>
#import <WebCore/WAKClipView.h>
#import <WebCore/WAKScrollView.h>
-#import <WebCore/WAKViewPrivate.h>
#import <WebCore/WAKWindow.h>
#import <WebCore/WKGraphics.h>
#import <WebCore/WebEvent.h>
