Changeset 167730 in webkit
- Timestamp:
- Apr 23, 2014 4:17:49 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r167727 r167730 1 2014-04-23 Anders Carlsson <andersca@apple.com> 2 3 Don't migrate the WKView.h header from WebCore to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=132086 5 6 Reviewed by Dan Bernstein. 7 8 * WebCore.xcodeproj/project.pbxproj: 9 Add WAKViewInternal.h. 10 11 * platform/WAKViewInternal.h: Added. 12 13 * platform/ios/wak/WAKClipView.m: 14 Import WAKViewInternal.h instead of WAKViewPrivate.h. 15 16 * platform/ios/wak/WAKScrollView.mm: 17 Import WAKViewInternal.h instead of WAKViewPrivate.h. 18 19 * platform/ios/wak/WAKView.h: 20 Move ivars to a class extension in WAKViewInternal.h and remove WKView.h import. 21 22 * platform/ios/wak/WAKView.mm: 23 Import WAKViewInternal.h instead of WAKViewPrivate.h. 24 25 * platform/ios/wak/WAKViewPrivate.h: 26 Import WKViewPrivate.h. 27 1 28 2014-04-23 David Hyatt <hyatt@apple.com> 2 29 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r167717 r167730 752 752 1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; }; 753 753 1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; }; 754 1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A874ADE19085E9100B03171 /* WAKViewInternal.h */; }; 754 755 1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */; }; 755 756 1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A88A90317553CD7000C74F9 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 7625 7626 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = "<group>"; }; 7626 7627 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLDivElement.h; sourceTree = "<group>"; }; 7628 1A874ADE19085E9100B03171 /* WAKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAKViewInternal.h; sourceTree = "<group>"; }; 7627 7629 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = "<group>"; }; 7628 7630 1A88A90317553CD7000C74F9 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = "<group>"; }; … … 18131 18133 A1483294187F508700DA63A6 /* WAKView.h */, 18132 18134 A1483295187F508700DA63A6 /* WAKView.mm */, 18135 1A874ADE19085E9100B03171 /* WAKViewInternal.h */, 18133 18136 A1483296187F508700DA63A6 /* WAKViewPrivate.h */, 18134 18137 A1483297187F508700DA63A6 /* WAKWindow.h */, … … 23330 23333 A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */, 23331 23334 A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */, 23335 1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */, 23332 23336 FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */, 23333 23337 7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */, -
trunk/Source/WebCore/platform/WAKViewInternal.h
r167729 r167730 1 1 /* 2 * Copyright (C) 20 05, 2006, 2007, 2009Apple Inc. All rights reserved.2 * Copyright (C) 2014 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #ifndef WAKViewPrivate_h27 #define WAKViewPrivate_h28 29 26 #if TARGET_OS_IPHONE 30 27 31 #import "WAKView .h"28 #import "WAKViewPrivate.h" 32 29 33 @interface WAKView (WAKPrivate) 34 - (WKViewRef)_viewRef; 35 + (WAKView *)_wrapperForViewRef:(WKViewRef)_viewRef; 36 - (id)_initWithViewRef:(WKViewRef)view; 37 - (BOOL)_handleResponderCall:(WKViewResponderCallbackType)type; 38 - (NSMutableSet *)_subviewReferences; 39 - (BOOL)_selfHandleEvent:(WebEvent *)event; 30 @interface WAKView () { 31 @package 32 WKViewContext viewContext; 33 WKViewRef viewRef; 34 35 NSMutableSet *subviewReferences; // This array is only used to keep WAKViews alive. 36 // The actual subviews are maintained by the WKView. 37 38 BOOL _isHidden; 39 BOOL _drawsOwnDescendants; 40 } 41 40 42 @end 41 43 42 static inline WAKView *WAKViewForWKViewRef(WKViewRef view) 43 { 44 if (!view) 45 return nil; 46 WAKView *wrapper = (WAKView *)view->wrapper; 47 if (wrapper) 48 return wrapper; 49 return [WAKView _wrapperForViewRef:view]; 50 } 51 52 #endif // TARGET_OS_IPHONE 53 54 #endif // WAKViewPrivate_h 44 #endif -
trunk/Source/WebCore/platform/ios/wak/WAKClipView.m
r161603 r167730 29 29 #if PLATFORM(IOS) 30 30 31 #import "WAKView Private.h"31 #import "WAKViewInternal.h" 32 32 #import <wtf/Assertions.h> 33 33 -
trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm
r165211 r167730 31 31 #import "WAKAppKitStubs.h" 32 32 #import "WAKClipView.h" 33 #import "WAKView Private.h"33 #import "WAKViewInternal.h" 34 34 #import "WAKWindow.h" 35 35 #import "WebEvent.h" -
trunk/Source/WebCore/platform/ios/wak/WAKView.h
r161603 r167730 30 30 31 31 #import "WAKResponder.h" 32 #import "WKView.h"33 32 #import <Foundation/Foundation.h> 34 33 #import <CoreGraphics/CoreGraphics.h> … … 46 45 47 46 @interface WAKView : WAKResponder 48 {49 WKViewContext viewContext;50 WKViewRef viewRef;51 52 NSMutableSet *subviewReferences; // This array is only used to keep WAKViews alive.53 // The actual subviews are maintained by the WKView.54 55 BOOL _isHidden;56 BOOL _drawsOwnDescendants;57 }58 47 59 48 + (WAKView *)focusView; -
trunk/Source/WebCore/platform/ios/wak/WAKView.mm
r161603 r167730 25 25 26 26 #import "config.h" 27 #import "WAKView Private.h"27 #import "WAKViewInternal.h" 28 28 29 29 #if PLATFORM(IOS) -
trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h
r161603 r167730 30 30 31 31 #import "WAKView.h" 32 #import "WKViewPrivate.h" 32 33 33 34 @interface WAKView (WAKPrivate) -
trunk/Source/WebKit/mac/ChangeLog
r167700 r167730 1 2014-04-23 Anders Carlsson <andersca@apple.com> 2 3 Don't migrate the WKView.h header from WebCore to WebKit 4 https://bugs.webkit.org/show_bug.cgi?id=132086 5 6 Reviewed by Dan Bernstein. 7 8 * MigrateHeaders.make: 9 Remove WKView.h from the list of headers to migrate. 10 11 * WebView/WebView.mm: 12 Import WKView.h. 13 1 14 2014-04-22 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/Source/WebKit/mac/MigrateHeaders.make
r166933 r167730 215 215 $(PRIVATE_HEADERS_DIR)/WKTypes.h \ 216 216 $(PRIVATE_HEADERS_DIR)/WKUtilities.h \ 217 $(PRIVATE_HEADERS_DIR)/WKView.h \218 217 $(PRIVATE_HEADERS_DIR)/WebAutocapitalize.h \ 219 218 $(PRIVATE_HEADERS_DIR)/WebCoreFrameView.h \ -
trunk/Source/WebKit/mac/WebView/WebView.mm
r167277 r167730 240 240 #import <WebCore/TileControllerMemoryHandlerIOS.h> 241 241 #import <WebCore/WAKWindow.h> 242 #import <WebCore/WKView.h> 242 243 #import <WebCore/WebCoreThread.h> 243 244 #import <WebCore/WebCoreThreadMessage.h>
Note: See TracChangeset
for help on using the changeset viewer.