⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 291978 in webkit


Ignore:
Timestamp:
Mar 28, 2022, 10:58:11 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Some Apple internal clients fail to build due to redeclared AppKit types in WebKitLegacy
​https://bugs.webkit.org/show_bug.cgi?id=238368

Patch by Ian Anderson <​iana@apple.com> on 2022-03-28
Reviewed by Jonathan Bedard.

Source/WebCore:

Some Apple internal Mac Catalyst clients need to use both AppKit and
WebKitLegacy. WebKitLegacy's redeclaration of AppKit types causes errors
for those clients. Copy AppKit's Apple internal logic for identifying
the special Mac Catalyst clients that are allowed to use the AppKit
types, and when such clients use WebKitLegacy, don't redeclare the
AppKit types.

  • platform/ios/KeyEventCodesIOS.h:
  • platform/ios/wak/WAKAppKitStubs.h:
  • platform/ios/wak/WAKView.h:
  • platform/ios/wak/WAKWindow.h:

Source/WebKitLegacy/ios:

WebKitLegacy can't always define NSView to WAKView in Mac Catalyst, but
views are always WAKView in Mac Catalyst. Switch on TARGET_OS_IPHONE to
declare WAKView explicitly.

  • WebView/WebUIKitDelegate.h:

Source/WebKitLegacy/mac:

WebKitLegacy can't always define NSClipView/NSView/NSScrollView/
NSWindow/NSResponder to their WAK counterparts in Mac Catalyst, but
those types are always the WAK ones in Mac Catalyst. Switch on
TARGET_OS_IPHONE to declare the WAK types explicitly.

  • Misc/WebDownload.h:
  • Misc/WebNSViewExtras.h:
  • Plugins/WebPluginDatabase.h:
  • WebView/WebDocument.h:
  • WebView/WebDocumentPrivate.h:
  • WebView/WebFramePrivate.h:
  • WebView/WebFrameView.h:

(WEBKIT_CLASS_DEPRECATED_MAC):

  • WebView/WebFrameViewPrivate.h:
  • WebView/WebHTMLRepresentation.h:
  • WebView/WebHTMLRepresentationPrivate.h:
  • WebView/WebHTMLView.h:
  • WebView/WebHTMLViewPrivate.h:
  • WebView/WebUIDelegate.h:
  • WebView/WebUIDelegatePrivate.h:
  • WebView/WebView.h:

(WEBKIT_CLASS_DEPRECATED_MAC):

  • WebView/WebViewPrivate.h:
Location:
trunk/Source
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r291972 r291978  
     12022-03-28  Ian Anderson  <iana@apple.com>
     2
     3        Some Apple internal clients fail to build due to redeclared AppKit types in WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=238368
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        Some Apple internal Mac Catalyst clients need to use both AppKit and
     9        WebKitLegacy. WebKitLegacy's redeclaration of AppKit types causes errors
     10        for those clients. Copy AppKit's Apple internal logic for identifying
     11        the special Mac Catalyst clients that are allowed to use the AppKit
     12        types, and when such clients use WebKitLegacy, don't redeclare the
     13        AppKit types.
     14
     15        * platform/ios/KeyEventCodesIOS.h:
     16        * platform/ios/wak/WAKAppKitStubs.h:
     17        * platform/ios/wak/WAKView.h:
     18        * platform/ios/wak/WAKWindow.h:
     19
    1202022-03-28  Chris Dumez  <cdumez@apple.com>
    221

  • trunk/Source/WebCore/platform/ios/KeyEventCodesIOS.h

    r228534 r291978  
    2727
    2828#if TARGET_OS_IPHONE
     29
     30#import <WebCore/WAKAppKitStubs.h>
     31
     32#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     33#import <AppKit/NSEvent.h>
     34#else
    2935
    3036// Unicodes we reserve for function keys on the keyboard,
    … …  
    106112    NSModeSwitchFunctionKey   = 0xF747
    107113};
     114#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    108115
     116#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     117#import <AppKit/NSText.h>
     118#else
    109119enum {
    110120    NSParagraphSeparatorCharacter = 0x2029,
    … …  
    119129    NSDeleteCharacter = 0x007f
    120130};
     131#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    121132
    122133#endif // TARGET_OS_IPHONE

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

    r284736 r291978  
    3333#import <CoreGraphics/CoreGraphics.h>
    3434
     35// WebKitLegacy was built around AppKit, which isn't present on iOS,
     36// so WebKitLegacy redeclares many AppKit types on iOS. This is a problem
     37// for Mac Catalyst where AppKit is present and usable, because the
     38// redeclared types now conflict with the original types. Normally the AppKit
     39// types are marked unavailable, so WebKitLegacy still needs to redeclare
     40// them to make them available. As long as Mac Catalyst clients stick to UIKit
     41// and WebKitLegacy, and don't directly import AppKit, things are fine.
     42// However, there are a few special Apple internal Mac Catalyst clients that
     43// are able to use all of the normally unavailable AppKit types, and so
     44// those clients need WebKitLegacy to use the AppKit types directly rather
     45// than redeclare them. Duplicate the Apple internal APPKIT_API_UNAVAILABLE_BEGIN_MACCATALYST
     46// logic to identify when this is the case.
     47#if TARGET_OS_MACCATALYST && ((defined(__UIKIT_BUILDING_UIKIT__) && __UIKIT_BUILDING_UIKIT__) || (defined(__SWIFTUI_BUILDING_SWIFTUI__) && __SWIFTUI_BUILDING_SWIFTUI__) || (defined(__UIKIT_AX_BUILDING_UIKIT_AX__) && __UIKIT_AX_BUILDING_UIKIT_AX__))
     48#define WAK_APPKIT_API_AVAILABLE_MACCATALYST 1
     49#else
     50#define WAK_APPKIT_API_AVAILABLE_MACCATALYST 0
     51#endif
     52
     53#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     54#import <AppKit/NSClipView.h>
     55#import <AppKit/NSScrollView.h>
     56#import <AppKit/NSView.h>
     57#else
    3558#ifndef NSClipView
    3659#define NSClipView WAKClipView
    … …  
    4265#define NSScrollView WAKScrollView
    4366#endif
     67#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
     68// There is no <WebKit/WebDynamicScrollBarsView.h> in Mac Catalyst.
    4469#ifndef WebDynamicScrollBarsView
    4570#define WebDynamicScrollBarsView WAKScrollView
    4671#endif
     72#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     73#import <AppKit/NSResponder.h>
     74#import <AppKit/NSWindow.h>
     75#else
    4776#ifndef NSWindow
    4877#define NSWindow WAKWindow
    … …  
    5180#define NSResponder WAKResponder
    5281#endif
     82#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    5383
    5484// FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
    … …  
    164194};
    165195
     196#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     197#import <AppKit/NSEvent.h>
     198#else
    166199#ifndef NSEventModifierFlagCapsLock
    167200#define NSEventModifierFlagCapsLock WKNSEventModifierFlagCapsLock
    … …  
    175208#define NSEventModifierFlagDeviceIndependentFlagsMask WKNSEventModifierFlagDeviceIndependentFlagsMask
    176209#endif
     210#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    177211
    178212typedef enum _WKWritingDirection {
    … …  
    187221};
    188222
     223#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     224#import <AppKit/NSTextView.h>
     225#else
    189226#ifndef NSSelectionAffinityUpstream
    190227#define NSSelectionAffinity WKNSSelectionAffinity
    … …  
    192229#define NSSelectionAffinityDownstream WKNSSelectionAffinityDownstream
    193230#endif
     231#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    194232
    195233typedef NS_ENUM(NSInteger, WKNSControlStateValue) {
    … …  
    199237};
    200238
     239#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     240#import <AppKit/NSCell.h>
     241#else
    201242#ifndef NSControlStateValueMixed
    202243#define NSControlStateValue WKNSControlStateValue
    … …  
    205246#define NSControlStateValueOn WKNSControlStateValueOn
    206247#endif
     248#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    207249
    208250typedef NS_ENUM(NSUInteger, WKNSCompositingOperation) {
    … …  
    223265};
    224266
     267#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     268#import <AppKit/NSGraphics.h>
     269#else
    225270#ifndef NSCompositeClear
    226271#define NSCompositingOperation WKNSCompositingOperation
    … …  
    240285#define NSCompositePlusLighter WKNSCompositePlusLighter
    241286#endif
     287#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    242288
    243289typedef NS_ENUM(NSUInteger, WKNSSelectionDirection) {
    … …  
    247293};
    248294
     295#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     296// Included earlier, but the following constants are
     297// in NSWindow.h.
     298// #import <AppKit/NSWindow.h>
     299#else
    249300#ifndef NSDirectSelection
    250301#define NSSelectionDirection WKNSSelectionDirection
    … …  
    253304#define NSSelectingPrevious WKNSSelectingPrevious
    254305#endif
     306#endif // WAK_APPKIT_API_AVAILABLE_MACCATALYST
    255307
    256308#endif // TARGET_OS_IPHONE

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

    r284736 r291978  
    3838extern NSString *WAKViewDidScrollNotification;
    3939
     40#if WAK_APPKIT_API_AVAILABLE_MACCATALYST
     41#import <AppKit/NSView.h>
     42#else
    4043enum {
    4144    NSViewNotSizable = 0,
    … …  
    4750    NSViewMaxYMargin = 32
    4851};
     52#endif
    4953
    5054@class WAKWindow;

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

    r284736 r291978  
    115115- (void)setVisible:(BOOL)visible;
    116116- (NSSelectionDirection)keyViewSelectionDirection;
    117 - (BOOL)makeFirstResponder:(NSResponder *)responder;
     117- (BOOL)makeFirstResponder:(WAKResponder *)responder;
    118118- (WAKView *)_newFirstResponderAfterResigning NS_RETURNS_NOT_RETAINED;
    119119- (void)setFrame:(NSRect)frameRect display:(BOOL)flag;

  • trunk/Source/WebKitLegacy/ios/ChangeLog

    r291341 r291978  
     12022-03-28  Ian Anderson  <iana@apple.com>
     2
     3        Some Apple internal clients fail to build due to redeclared AppKit types in WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=238368
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        WebKitLegacy can't always define NSView to WAKView in Mac Catalyst, but
     9        views are always WAKView in Mac Catalyst. Switch on TARGET_OS_IPHONE to
     10        declare WAKView explicitly.
     11
     12        * WebView/WebUIKitDelegate.h:
     13
    1142022-03-16  Youenn Fablet  <youenn@apple.com>
    215

  • trunk/Source/WebKitLegacy/ios/WebView/WebUIKitDelegate.h

    r271607 r291978  
    8686- (void)webViewDidRestoreFromPageCache:(WebView *)webView;
    8787
     88#if TARGET_OS_IPHONE
     89- (WAKView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments fromPlugInPackage:(WebPluginPackage *)package;
     90#else
    8891- (NSView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments fromPlugInPackage:(WebPluginPackage *)package;
     92#endif
    8993- (void)webView:(WebView *)webView willShowFullScreenForPlugInView:(id)plugInView;
    9094- (void)webView:(WebView *)webView didHideFullScreenForPlugInView:(id)plugInView;

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r291946 r291978  
     12022-03-28  Ian Anderson  <iana@apple.com>
     2
     3        Some Apple internal clients fail to build due to redeclared AppKit types in WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=238368
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        WebKitLegacy can't always define NSClipView/NSView/NSScrollView/
     9        NSWindow/NSResponder to their WAK counterparts in Mac Catalyst, but
     10        those types are always the WAK ones in Mac Catalyst. Switch on
     11        TARGET_OS_IPHONE to declare the WAK types explicitly.
     12
     13        * Misc/WebDownload.h:
     14        * Misc/WebNSViewExtras.h:
     15        * Plugins/WebPluginDatabase.h:
     16        * WebView/WebDocument.h:
     17        * WebView/WebDocumentPrivate.h:
     18        * WebView/WebFramePrivate.h:
     19        * WebView/WebFrameView.h:
     20        (WEBKIT_CLASS_DEPRECATED_MAC):
     21        * WebView/WebFrameViewPrivate.h:
     22        * WebView/WebHTMLRepresentation.h:
     23        * WebView/WebHTMLRepresentationPrivate.h:
     24        * WebView/WebHTMLView.h:
     25        * WebView/WebHTMLViewPrivate.h:
     26        * WebView/WebUIDelegate.h:
     27        * WebView/WebUIDelegatePrivate.h:
     28        * WebView/WebView.h:
     29        (WEBKIT_CLASS_DEPRECATED_MAC):
     30        * WebView/WebViewPrivate.h:
     31
    1322022-03-26  Yusuke Suzuki  <ysuzuki@apple.com>
    233

  • trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h

    r284736 r291978  
    4545#endif
    4646
     47#if !TARGET_OS_IPHONE
    4748@class NSWindow;
     49#endif
    4850@class WebDownloadInternal;
    4951
    … …  
    7981    @method downloadWindowForAuthenticationSheet:
    8082*/
     83#if TARGET_OS_IPHONE
     84- (WAKWindow *)downloadWindowForAuthenticationSheet:(WebDownload *)download;
     85#else
    8186- (NSWindow *)downloadWindowForAuthenticationSheet:(WebDownload *)download;
     87#endif
    8288
    8389@end

  • trunk/Source/WebKitLegacy/mac/Misc/WebNSViewExtras.h

    r185328 r291978  
    4242@class WebView;
    4343
     44#if TARGET_OS_IPHONE
     45@interface WAKView (WebExtras)
     46#else
    4447@interface NSView (WebExtras)
     48#endif
    4549
    4650// Returns the nearest enclosing view of the given class, or nil if none.
     51#if TARGET_OS_IPHONE
     52- (WAKView *)_web_superviewOfClass:(Class)viewClass;
     53#else
    4754- (NSView *)_web_superviewOfClass:(Class)viewClass;
     55#endif
    4856- (WebFrameView *)_web_parentWebFrameView;
    4957#if !TARGET_OS_IPHONE
    … …  
    7987@class WebView;
    8088
    81 @interface NSView (WebDocumentViewExtras)
     89@interface WAKView (WebDocumentViewExtras)
    8290- (WebFrame *)_frame;
    8391- (WebView *)_webView;

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.h

    r215685 r291978  
    6565- (void)close;
    6666
     67#if TARGET_OS_IPHONE
     68- (void)addPluginInstanceView:(WAKView *)view;
     69- (void)removePluginInstanceView:(WAKView *)view;
     70#else
    6771- (void)addPluginInstanceView:(NSView *)view;
    6872- (void)removePluginInstanceView:(NSView *)view;
     73#endif
    6974- (void)removePluginInstanceViewsFor:(WebFrame *)webFrame;
    7075- (void)destroyAllPluginInstanceViews;

  • trunk/Source/WebKitLegacy/mac/WebView/WebDocument.h

    r231383 r291978  
    8181    @abstract Called before the host window is set on the parent web view.
    8282*/
     83#if TARGET_OS_IPHONE
     84- (void)viewWillMoveToHostWindow:(WAKWindow *)hostWindow;
     85#else
    8386- (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow;
     87#endif
    8488
    8589/*!

  • trunk/Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h

    r236846 r291978  
    3030#import <WebKitLegacy/WebFrame.h>
    3131#import <WebKitLegacy/WebHTMLView.h>
     32#if TARGET_OS_IPHONE
     33#import <WebKitLegacy/WAKView.h>
     34#endif
    3235
    3336@class DOMDocument;
    … …  
    7275// View that draws the selection and can be made first responder. Often this is self but it could be
    7376// a nested view, as for example in the case of WebPDFView.
     77#if TARGET_OS_IPHONE
     78- (WAKView *)selectionView;
     79#else
    7480- (NSView *)selectionView;
     81#endif
    7582@end
    7683

  • trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h

    r285047 r291978  
    135135- (NSRect)rectForScrollToVisible; // return caretRect if selection is caret, selectionRect otherwise
    136136@property (nonatomic, readwrite) CGColorRef caretColor;
     137#if TARGET_OS_IPHONE
     138- (WAKView *)documentView;
     139#else
    137140- (NSView *)documentView;
     141#endif
    138142- (int)layoutCount;
    139143- (BOOL)isTelephoneNumberParsingAllowed;

  • trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.h

    r231383 r291978  
    4747*/
    4848WEBKIT_CLASS_DEPRECATED_MAC(10_3, 10_14)
     49#if TARGET_OS_IPHONE
     50@interface WebFrameView : WAKView
     51#else
    4952@interface WebFrameView : NSView
     53#endif
    5054{
    5155@package
    … …  
    6468    @discussion The subview that renders the WebFrameView's contents
    6569*/
     70#if TARGET_OS_IPHONE
     71@property (nonatomic, readonly, strong) WAKView<WebDocumentView> *documentView;
     72#else
    6673@property (nonatomic, readonly, strong) NSView<WebDocumentView> *documentView;
     74#endif
    6775
    6876/*!

  • trunk/Source/WebKitLegacy/mac/WebView/WebFrameViewPrivate.h

    r207934 r291978  
    2828
    2929#import <WebKitLegacy/WebFrameView.h>
     30#if TARGET_OS_IPHONE
     31#import <WebKitLegacy/WAKAppKitStubs.h>
     32#endif
    3033
    3134@interface WebFrameView (WebPrivate)
    … …  
    6972    @result The content view (NSClipView) of the WebFrameView's scroll view.
    7073 */
     74#if TARGET_OS_IPHONE
     75- (WAKClipView *)_contentView;
     76#else
    7177- (NSClipView *)_contentView;
     78#endif
    7279
    7380/*!

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.h

    r215685 r291978  
    3232
    3333@class WebHTMLRepresentationPrivate;
     34#if !TARGET_OS_IPHONE
    3435@class NSView;
     36#endif
    3537
    3638@class DOMNode;

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentationPrivate.h

    r168047 r291978  
    2828
    2929#import <WebKitLegacy/WebHTMLRepresentation.h>
     30#if TARGET_OS_IPHONE
     31#import <WebKitLegacy/WAKView.h>
     32#endif
    3033
    3134@protocol WebPluginManualLoader;
    3235
    3336@interface WebHTMLRepresentation (WebPrivate)
     37#if TARGET_OS_IPHONE
     38- (void)_redirectDataToManualLoader:(id<WebPluginManualLoader>)manualLoader forPluginView:(WAKView *)pluginView;
     39#else
    3440- (void)_redirectDataToManualLoader:(id<WebPluginManualLoader>)manualLoader forPluginView:(NSView *)pluginView;
     41#endif
    3542- (void)printDOMTree;
    3643@end

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.h

    r168047 r291978  
    4646@interface WebHTMLView : NSControl <WebDocumentView, WebDocumentSearching>
    4747#else
    48 @interface WebHTMLView : NSView <WebDocumentView, WebDocumentSearching>
     48@interface WebHTMLView : WAKView <WebDocumentView, WebDocumentSearching>
    4949#endif
    5050{

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h

    r285047 r291978  
    2828
    2929#import <WebKitLegacy/WebHTMLView.h>
     30#if TARGET_OS_IPHONE
     31#import <WebKitLegacy/WAKView.h>
     32#endif
    3033
    3134@class DOMDocumentFragment;
    … …  
    109112
    110113- (BOOL)_isUsingAcceleratedCompositing;
     114#if TARGET_OS_IPHONE
     115- (WAKView *)_compositingLayersHostingView;
     116#else
    111117- (NSView *)_compositingLayersHostingView;
     118#endif
    112119
    113120#if !TARGET_OS_IPHONE

  • trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegate.h

    r231383 r291978  
    248248    real first responder if some control not in the window has focus.
    249249*/
     250#if TARGET_OS_IPHONE
     251- (WAKResponder *)webViewFirstResponder:(WebView *)sender;
     252#else
    250253- (NSResponder *)webViewFirstResponder:(WebView *)sender;
     254#endif
    251255
    252256/*!
    … …  
    261265    elsewhere, or possibly ignore this call.
    262266*/
     267#if TARGET_OS_IPHONE
     268- (void)webView:(WebView *)sender makeFirstResponder:(WAKResponder *)responder;
     269#else
    263270- (void)webView:(WebView *)sender makeFirstResponder:(NSResponder *)responder;
     271#endif
    264272
    265273/*!

  • trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h

    r278767 r291978  
    2929#import <WebKitLegacy/WebAllowDenyPolicyListener.h>
    3030#import <WebKitLegacy/WebUIDelegate.h>
     31#if TARGET_OS_IPHONE
     32#import <WebKitLegacy/WAKView.h>
     33#endif
    3134
    3235#if !defined(ENABLE_DASHBOARD_SUPPORT)
    … …  
    205208- (void)webView:(WebView *)webView addMessageToConsole:(NSDictionary *)message withSource:(NSString *)source;
    206209
     210#if TARGET_OS_IPHONE
     211- (WAKView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments;
     212#else
    207213- (NSView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments;
     214#endif
    208215
    209216#if ENABLE_DASHBOARD_SUPPORT

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.h

    r235119 r291978  
    127127*/
    128128WEBKIT_CLASS_DEPRECATED_MAC(10_3, 10_14, "No longer supported; please adopt WKWebView.")
     129#if TARGET_OS_IPHONE
     130@interface WebView : WAKView
     131#else
    129132@interface WebView : NSView
     133#endif
    130134{
    131135@private
    … …  
    408412    not in an actual window.
    409413*/
     414#if TARGET_OS_IPHONE
     415@property (nonatomic, strong) WAKWindow *hostWindow;
     416#else
    410417@property (nonatomic, strong) NSWindow *hostWindow;
     418#endif
    411419
    412420/*!

  • trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h

    r281273 r291978  
    3333#if TARGET_OS_IPHONE
    3434#import <CoreGraphics/CGColor.h>
     35#import <WebKitLegacy/WAKView.h>
    3536#endif
    3637
    … …  
    684685    remove was successful.
    685686 */
     687#if TARGET_OS_IPHONE
     688- (BOOL)_setMediaLayer:(CALayer*)layer forPluginView:(WAKView*)pluginView;
     689#else
    686690- (BOOL)_setMediaLayer:(CALayer*)layer forPluginView:(NSView*)pluginView;
     691#endif
    687692
    688693/*!
    … …  
    896901- (void)_setFontFallbackPrefersPictographs:(BOOL)flag;
    897902
     903#if TARGET_OS_IPHONE
     904- (void)showCandidates:(NSArray *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString forSelectedRange:(NSRange)range view:(WAKView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock;
     905#else
    898906- (void)showCandidates:(NSArray *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString forSelectedRange:(NSRange)range view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock;
     907#endif
    899908- (void)forceRequestCandidatesForTesting;
    900909- (BOOL)shouldRequestCandidates;
Note: See TracChangeset for help on using the changeset viewer.