Changeset 167730 in webkit


Ignore:
Timestamp:
Apr 23, 2014 4:17:49 PM (10 years ago)
Author:
andersca@apple.com
Message:

Don't migrate the WKView.h header from WebCore to WebKit
​https://bugs.webkit.org/show_bug.cgi?id=132086

Reviewed by Dan Bernstein.

Source/WebCore:

  • 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.

Source/WebKit/mac:

  • MigrateHeaders.make:

Remove WKView.h from the list of headers to migrate.

  • WebView/WebView.mm:

Import WKView.h.

Location:
trunk/Source
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r167727 r167730  
     12014-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
    1282014-04-23  David Hyatt  <hyatt@apple.com>
    229

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

    r167717 r167730  
    752752                1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; };
    753753                1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; };
     754                1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A874ADE19085E9100B03171 /* WAKViewInternal.h */; };
    754755                1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */; };
    755756                1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A88A90317553CD7000C74F9 /* FileIconLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    76257626                1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = "<group>"; };
    76267627                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>"; };
    76277629                1A88A90217553CD7000C74F9 /* FileIconLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileIconLoader.cpp; sourceTree = "<group>"; };
    76287630                1A88A90317553CD7000C74F9 /* FileIconLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileIconLoader.h; sourceTree = "<group>"; };
    … …  
    1813118133                                A1483294187F508700DA63A6 /* WAKView.h */,
    1813218134                                A1483295187F508700DA63A6 /* WAKView.mm */,
     18135                                1A874ADE19085E9100B03171 /* WAKViewInternal.h */,
    1813318136                                A1483296187F508700DA63A6 /* WAKViewPrivate.h */,
    1813418137                                A1483297187F508700DA63A6 /* WAKWindow.h */,
    … …  
    2333023333                                A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
    2333123334                                A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */,
     23335                                1A874ADF19085E9100B03171 /* WAKViewInternal.h in Headers */,
    2333223336                                FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */,
    2333323337                                7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */,

  • trunk/Source/WebCore/platform/WAKViewInternal.h

    r167729 r167730  
    11/*
    2  * Copyright (C) 2005, 2006, 2007, 2009 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifndef WAKViewPrivate_h
    27 #define WAKViewPrivate_h
    28 
    2926#if TARGET_OS_IPHONE
    3027
    31 #import "WAKView.h"
     28#import "WAKViewPrivate.h"
    3229
    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
    4042@end
    4143
    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  
    2929#if PLATFORM(IOS)
    3030
    31 #import "WAKViewPrivate.h"
     31#import "WAKViewInternal.h"
    3232#import <wtf/Assertions.h>
    3333

  • trunk/Source/WebCore/platform/ios/wak/WAKScrollView.mm

    r165211 r167730  
    3131#import "WAKAppKitStubs.h"
    3232#import "WAKClipView.h"
    33 #import "WAKViewPrivate.h"
     33#import "WAKViewInternal.h"
    3434#import "WAKWindow.h"
    3535#import "WebEvent.h"

  • trunk/Source/WebCore/platform/ios/wak/WAKView.h

    r161603 r167730  
    3030
    3131#import "WAKResponder.h"
    32 #import "WKView.h"
    3332#import <Foundation/Foundation.h>
    3433#import <CoreGraphics/CoreGraphics.h>
    … …  
    4645
    4746@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 }
    5847
    5948+ (WAKView *)focusView;

  • trunk/Source/WebCore/platform/ios/wak/WAKView.mm

    r161603 r167730  
    2525
    2626#import "config.h"
    27 #import "WAKViewPrivate.h"
     27#import "WAKViewInternal.h"
    2828
    2929#if PLATFORM(IOS)

  • trunk/Source/WebCore/platform/ios/wak/WAKViewPrivate.h

    r161603 r167730  
    3030
    3131#import "WAKView.h"
     32#import "WKViewPrivate.h"
    3233
    3334@interface WAKView (WAKPrivate)

  • trunk/Source/WebKit/mac/ChangeLog

    r167700 r167730  
     12014-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
    1142014-04-22  Ryosuke Niwa  <rniwa@webkit.org>
    215

  • trunk/Source/WebKit/mac/MigrateHeaders.make

    r166933 r167730  
    215215    $(PRIVATE_HEADERS_DIR)/WKTypes.h \
    216216    $(PRIVATE_HEADERS_DIR)/WKUtilities.h \
    217     $(PRIVATE_HEADERS_DIR)/WKView.h \
    218217    $(PRIVATE_HEADERS_DIR)/WebAutocapitalize.h \
    219218    $(PRIVATE_HEADERS_DIR)/WebCoreFrameView.h \

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r167277 r167730  
    240240#import <WebCore/TileControllerMemoryHandlerIOS.h>
    241241#import <WebCore/WAKWindow.h>
     242#import <WebCore/WKView.h>
    242243#import <WebCore/WebCoreThread.h>
    243244#import <WebCore/WebCoreThreadMessage.h>
Note: See TracChangeset for help on using the changeset viewer.