Diff
Modified: trunk/Source/WebCore/ChangeLog (167729 => 167730)
--- trunk/Source/WebCore/ChangeLog 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 23:17:49 UTC (rev 167730)
@@ -1,3 +1,30 @@
+2014-04-23 Anders Carlsson <ander...@apple.com>
+
+ Don't migrate the WKView.h header from WebCore to WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=132086
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Add WAKViewInternal.h.
+
+ * platform/WAKViewInternal.h: Added.
+
+ * platform/ios/wak/WAKClipView.m:
+ Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+ * platform/ios/wak/WAKScrollView.mm:
+ Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+ * platform/ios/wak/WAKView.h:
+ Move ivars to a class extension in WAKViewInternal.h and remove WKView.h import.
+
+ * platform/ios/wak/WAKView.mm:
+ Import WAKViewInternal.h instead of WAKViewPrivate.h.
+
+ * platform/ios/wak/WAKViewPrivate.h:
+ Import WKViewPrivate.h.
+
2014-04-23 David Hyatt <hy...@apple.com>
[New Multicolumn] fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html fails
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (167729 => 167730)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-23 23:17:49 UTC (rev 167730)
@@ -751,6 +751,7 @@
1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B20F0A1B258700D8C87C /* JSHTMLUListElement.h */; };
1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; };
1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; };
+ 1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A874ADE19085E9100B03171 /* WAKViewInternal.h */; };
1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */; };
1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A88A90317553CD7000C74F9 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A8F6B020DB53006001DB794 /* SubstituteResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F6B010DB53006001DB794 /* SubstituteResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7624,6 +7625,7 @@
1A85B2AD0A1B2A6D00D8C87C /* HTMLDivElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLDivElement.idl; sourceTree = "<group>"; };
1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = "<group>"; };
1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLDivElement.h; sourceTree = "<group>"; };
+ 1A874ADE19085E9100B03171 /* WAKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKViewInternal.h; sourceTree = "<group>"; };
1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = "<group>"; };
1A88A90317553CD7000C74F9 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = "<group>"; };
1A8F6B010DB53006001DB794 /* SubstituteResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubstituteResource.h; sourceTree = "<group>"; };
@@ -18130,6 +18132,7 @@
A1483293187F508700DA63A6 /* WAKScrollView.mm */,
A1483294187F508700DA63A6 /* WAKView.h */,
A1483295187F508700DA63A6 /* WAKView.mm */,
+ 1A874ADE19085E9100B03171 /* WAKViewInternal.h */,
A1483296187F508700DA63A6 /* WAKViewPrivate.h */,
A1483297187F508700DA63A6 /* WAKWindow.h */,
A1483298187F508700DA63A6 /* WAKWindow.mm */,
@@ -23329,6 +23332,7 @@
A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */,
A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */,
+ 1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */,
FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */,
7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */,
BC80C9880CD294EE00A0B7B3 /* CSSTimingFunctionValue.h in Headers */,
Copied: trunk/Source/WebCore/platform/WAKViewInternal.h (from rev 167729, trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h) (0 => 167730)
--- trunk/Source/WebCore/platform/WAKViewInternal.h (rev 0)
+++ trunk/Source/WebCore/platform/WAKViewInternal.h 2014-04-23 23:17:49 UTC (rev 167730)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+#if TARGET_OS_IPHONE
+
+#import "WAKViewPrivate.h"
+
+@interface WAKView () {
+@package
+ WKViewContext viewContext;
+ WKViewRef viewRef;
+
+ NSMutableSet *subviewReferences; // This array is only used to keep WAKViews alive.
+ // The actual subviews are maintained by the WKView.
+
+ BOOL _isHidden;
+ BOOL _drawsOwnDescendants;
+}
+
+@end
+
+#endif
Modified: trunk/Source/WebCore/platform/ios/wak/WAKClipView.m (167729 => 167730)
--- trunk/Source/WebCore/platform/ios/wak/WAKClipView.m 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKClipView.m 2014-04-23 23:17:49 UTC (rev 167730)
@@ -28,7 +28,7 @@
#if PLATFORM(IOS)
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import <wtf/Assertions.h>
@implementation WAKClipView
Modified: trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm (167729 => 167730)
--- trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm 2014-04-23 23:17:49 UTC (rev 167730)
@@ -30,7 +30,7 @@
#import "WAKAppKitStubs.h"
#import "WAKClipView.h"
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#import "WAKWindow.h"
#import "WebEvent.h"
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (167729 => 167730)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.h 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h 2014-04-23 23:17:49 UTC (rev 167730)
@@ -29,7 +29,6 @@
#if TARGET_OS_IPHONE
#import "WAKResponder.h"
-#import "WKView.h"
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
@@ -45,17 +44,7 @@
@class WAKWindow;
@interface WAKView : WAKResponder
-{
- WKViewContext viewContext;
- WKViewRef viewRef;
-
- NSMutableSet *subviewReferences; // This array is only used to keep WAKViews alive.
- // The actual subviews are maintained by the WKView.
- BOOL _isHidden;
- BOOL _drawsOwnDescendants;
-}
-
+ (WAKView *)focusView;
- (id)initWithFrame:(CGRect)rect;
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (167729 => 167730)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2014-04-23 23:17:49 UTC (rev 167730)
@@ -24,7 +24,7 @@
*/
#import "config.h"
-#import "WAKViewPrivate.h"
+#import "WAKViewInternal.h"
#if PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h (167729 => 167730)
--- trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h 2014-04-23 23:17:49 UTC (rev 167730)
@@ -29,6 +29,7 @@
#if TARGET_OS_IPHONE
#import "WAKView.h"
+#import "WKViewPrivate.h"
@interface WAKView (WAKPrivate)
- (WKViewRef)_viewRef;
Modified: trunk/Source/WebKit/mac/ChangeLog (167729 => 167730)
--- trunk/Source/WebKit/mac/ChangeLog 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-23 23:17:49 UTC (rev 167730)
@@ -1,3 +1,16 @@
+2014-04-23 Anders Carlsson <ander...@apple.com>
+
+ Don't migrate the WKView.h header from WebCore to WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=132086
+
+ Reviewed by Dan Bernstein.
+
+ * MigrateHeaders.make:
+ Remove WKView.h from the list of headers to migrate.
+
+ * WebView/WebView.mm:
+ Import WKView.h.
+
2014-04-22 Ryosuke Niwa <rn...@webkit.org>
Cursor doesn't change back to pointer when leaving the Safari window
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (167729 => 167730)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2014-04-23 23:17:49 UTC (rev 167730)
@@ -214,7 +214,6 @@
$(PRIVATE_HEADERS_DIR)/WKGraphics.h \
$(PRIVATE_HEADERS_DIR)/WKTypes.h \
$(PRIVATE_HEADERS_DIR)/WKUtilities.h \
- $(PRIVATE_HEADERS_DIR)/WKView.h \
$(PRIVATE_HEADERS_DIR)/WebAutocapitalize.h \
$(PRIVATE_HEADERS_DIR)/WebCoreFrameView.h \
$(PRIVATE_HEADERS_DIR)/WebCoreThread.h \
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167729 => 167730)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-23 22:35:16 UTC (rev 167729)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-23 23:17:49 UTC (rev 167730)
@@ -239,6 +239,7 @@
#import <WebCore/TextRun.h>
#import <WebCore/TileControllerMemoryHandlerIOS.h>
#import <WebCore/WAKWindow.h>
+#import <WebCore/WKView.h>
#import <WebCore/WebCoreThread.h>
#import <WebCore/WebCoreThreadMessage.h>
#import <WebCore/WebCoreThreadRun.h>
