Changeset 236846 in webkit


Ignore:
Timestamp:
Oct 4, 2018, 1:36:56 PM (7 years ago)
Author:
mitz@apple.com
Message:

WebInspectorUI and WebKitLegacy parts of [Xcode] Update some build settings as recommended by Xcode 10
​https://bugs.webkit.org/show_bug.cgi?id=190250

Reviewed by Andy Estes.

Source/WebCore/PAL:

  • pal/spi/mac/NSWindowSPI.h: Added a private API declaration.

Source/WebInspectorUI:

  • Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_INFINITE_RECURSION, CLANG_WARN_SUSPICIOUS_MOVE, CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF.
  • WebInspectorUI.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.

Source/WebKitLegacy:

  • WebKitLegacy.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.

Source/WebKitLegacy/mac:
WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
​https://bugs.webkit.org/show_bug.cgi?id=190250

Reviewed by Andy Estes.

  • Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF, CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED. Also enabled GCC_WARN_UNDECLARED_SELECTOR by deleting the line that set it to NO, which let an earlier line set it to YES.

Enabling -Wundeclared-selector exposed some long-standing mistakes and required the most
changes below.

  • DefaultDelegates/WebDefaultContextMenuDelegate.mm: Imported an internal header that provides some missing method declarations.
  • Misc/WebDownload.mm:

(-[WebDownload initWithRequest:delegate:]): Suppressed warning about this implementation of

a deprecated method.

  • Misc/WebIconDatabase.mm: Suppressed warning around our implementation of a deprecated class.
  • Misc/WebNSObjectExtras.mm: Declare a category that is implemented in this file, because other code in the file uses a method from it.
  • Plugins/WebBaseNetscapePluginView.mm:

(-[WebBaseNetscapePluginView renewGState]): Suppressed warning about this implementation of

a deprecated method.

  • Plugins/WebPluginController.mm:

(installFlip4MacPlugInWorkaroundIfNecessary): Suppressed the undeclared selector warning

around use of a selector that may be present in some WebKit client.

  • Plugins/WebPluginDatabase.mm: Imported an internal header that provides some missing method declarations.
  • WebCoreSupport/PopupMenuMac.mm: Imported a header that delcares delegate methods we call from here.
  • WebCoreSupport/WebCachedFramePlatformData.h: Imported an internal header that provides some missing method declarations.
  • WebCoreSupport/WebChromeClient.mm: Imported a header that declares delegate methods we call from here.
  • WebCoreSupport/WebFrameLoaderClient.mm: Imported headers that declare delegate methods we call from here.

(WebFrameLoaderClient::setTitle): Suppressed the undeclared selector warning around use of

an obsolete delegate method for binary compatibility.

(pluginView): Ditto.

  • WebCoreSupport/WebVisitedLinkStore.mm: Imported a header that declares delegate methods we call from here.
  • WebView/WebDeviceOrientationInternal.h: Declared -setController in a new WebDeviceOrientationProviderMock protocol.
  • WebView/WebDeviceOrientationProviderMock.mm:

(-[WebDeviceOrientationProviderMock setController:]): Moved from an internal category to the

main @implementation.

  • WebView/WebDeviceOrientationProviderMockInternal.h: Declared that WebDeviceOrientationProviderMock conforms to WebDeviceOrientationProviderMock.
  • WebView/WebDynamicScrollBarsView.mm:

(-[WebDynamicScrollBarsView accessibilityIsIgnored]): Suppressed warning about this implementation

of a deprecated method.

  • WebView/WebHTMLView.mm:

(-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]): Suppressed the undeclared

selector warning around action methods that are not declared anywhere in WebKit.

(-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): Suppressed warning

about implementing this deprecated method.

(-[WebHTMLView draggingSourceOperationMaskForLocal:]): Ditto.
(-[WebHTMLView draggedImage:endedAt:operation:]): Ditto.
(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
(-[WebHTMLView accessibilityAttributeValue:]): Ditto.
(-[WebHTMLView characterIndexForPoint:]): Ditto.
(-[WebHTMLView firstRectForCharacterRange:]): Ditto.
(-[WebHTMLView attributedSubstringFromRange:]): Ditto.
(-[WebHTMLView setMarkedText:selectedRange:]): Ditto.
(-[WebHTMLView doCommandBySelector:]): Ditto.
(-[WebHTMLView insertText:]): Ditto.

  • WebView/WebHTMLViewInternal.h: Declared an internal method that’s used from another file.
  • WebView/WebJSPDFDoc.mm: Imported a header that declares delegate methods we call from here.
  • WebView/WebPDFView.h: Removed previewView ivar.
  • WebView/WebPDFView.mm: Removed declaration of FileInternal category and merged its implementation with the main implementation.

(-[WebPDFView dealloc]): Removed previewView ivar.
(-[WebPDFView initWithFrame:]): Removed code to deal with PDFPreviewView, which doesn’t

exist in macOS versions we support.

(+[WebPDFView _PDFPreviewViewClass]): Deleted. PDFPreviewView doesn’t exist anymore.
(-[WebPDFView _canLookUpInDictionary]): Suppressed undeclared selector warning around use of

action methods internal to PDFKit.

(-[WebPDFView _lookUpInDictionaryFromMenu:]): Ditto.
(-[WebPDFView _menuItemsFromPDFKitForEvent:]): Ditto.

  • WebView/WebUIDelegatePrivate.h: Restored declarations of the delegate methods we actually call on macOS, even though in r86988 we started calling different methods on iOS.
  • WebView/WebView.mm:
  • Imported headers that declare delegate methods that we call.
  • Removed declaration of WebFileInternal category and merged its implementation with the main implementation.
  • Many internal methods were inexplicibly implemented as part of the WebViewEditingInMail category, which made them impossible to call from the main implementation. Moved those into the main implementation. One of those had to be declared in a class extension, because it is called from a method implemented in the WebPrivate category, and that category’s implementation appears first in the file.

(-[WebView _cacheHistoryDelegateImplementations]): Suppressed undeclared selector warning

around use of obsolete delegate method for binary compatibility.

  • WebView/WebViewInternal.h: Declared an internal method that’s used from another file.
Location:
trunk/Source
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/PAL/ChangeLog

    r236832 r236846  
     12018-10-04  Dan Bernstein  <mitz@apple.com>
     2
     3        PAL change for the WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
     4        https://bugs.webkit.org/show_bug.cgi?id=190250
     5
     6        Reviewed by Andy Estes.
     7
     8        * pal/spi/mac/NSWindowSPI.h: Added a private API declaration.
     9
    1102018-10-04  Dan Bernstein  <mitz@apple.com>
    211

  • trunk/Source/WebCore/PAL/pal/spi/mac/NSWindowSPI.h

    r221473 r236846  
    3939
    4040- (id)_newFirstResponderAfterResigning;
     41- (void)_setCursorForMouseLocation:(NSPoint)point;
    4142
    4243@end

  • trunk/Source/WebInspectorUI/ChangeLog

    r236845 r236846  
     12018-10-04  Dan Bernstein  <mitz@apple.com>
     2
     3        WebInspectorUI part of [Xcode] Update some build settings as recommended by Xcode 10
     4        https://bugs.webkit.org/show_bug.cgi?id=190250
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_INFINITE_RECURSION,
     9          CLANG_WARN_SUSPICIOUS_MOVE, CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and
     10          CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF.
     11
     12        * WebInspectorUI.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.
     13
    1142018-10-04  Devin Rousso  <drousso@apple.com>
    215

  • trunk/Source/WebInspectorUI/Configurations/Base.xcconfig

    r235412 r236846  
    2020CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
    2121CLANG_WARN_BOOL_CONVERSION = YES;
     22CLANG_WARN_COMMA = YES;
    2223CLANG_WARN_CONSTANT_CONVERSION = YES;
    2324CLANG_WARN_CXX0X_EXTENSIONS = NO;
    2425CLANG_WARN_EMPTY_BODY = YES;
    2526CLANG_WARN_ENUM_CONVERSION = YES;
     27CLANG_WARN_INFINITE_RECURSION = YES;
    2628CLANG_WARN_INT_CONVERSION = YES;
    2729CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
    2830CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
    2931CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
     32CLANG_WARN_SUSPICIOUS_MOVE = YES;
    3033CLANG_WARN_STRICT_PROTOTYPES = YES;
    3134CLANG_WARN_UNREACHABLE_CODE = YES;
    … …  
    5356GCC_WARN_ABOUT_RETURN_TYPE = YES;
    5457GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
     58CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    5559GCC_WARN_UNDECLARED_SELECTOR = YES;
     60CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
    5661GCC_WARN_UNINITIALIZED_AUTOS = YES
    5762GCC_WARN_UNUSED_FUNCTION = YES;

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

    r205692 r236846  
    105105                        attributes = {
    106106                                LastSwiftUpdateCheck = 0700;
    107                                 LastUpgradeCheck = 0700;
     107                                LastUpgradeCheck = 1000;
    108108                                ORGANIZATIONNAME = Apple;
    109109                        };

  • trunk/Source/WebKitLegacy/ChangeLog

    r236773 r236846  
     12018-10-04  Dan Bernstein  <mitz@apple.com>
     2
     3        WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
     4        https://bugs.webkit.org/show_bug.cgi?id=190250
     5
     6        Reviewed by Andy Estes.
     7
     8        * WebKitLegacy.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.
     9
    1102018-10-01  Dean Jackson  <dino@apple.com>
    211

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

    r236773 r236846  
    32233223                        attributes = {
    32243224                                LastSwiftUpdateCheck = 0700;
    3225                                 LastUpgradeCheck = 0700;
     3225                                LastUpgradeCheck = 1000;
    32263226                        };
    32273227                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKitLegacy" */;

  • trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationProviderIOS.mm

    r229963 r236846  
    3131#import "WebGeolocationCoreLocationProvider.h"
    3232#import <WebGeolocationPosition.h>
     33#import <WebUIDelegatePrivate.h>
    3334#import <WebCore/GeolocationPosition.h>
    3435#import <WebCore/WebCoreThread.h>

  • trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm

    r236066 r236846  
    5353using namespace WebCore;
    5454
    55 @interface WebPDFView (Secrets)
    56 + (Class)_representationClassForWebFrame:(WebFrame *)webFrame;
    57 @end
    58 
    5955#pragma mark Constants
    6056

  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm

    r235935 r236846  
    716716
    717717// Do the right thing for a Carbon window.
     718IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    718719- (id)initWithCoder:(NSCoder *)coder
     720IGNORE_WARNINGS_END
    719721{
    720722
    … …  
    818820    UInt32 hiCommandID = 0;
    819821
     822IGNORE_WARNINGS_BEGIN("undeclared-selector")
    820823    // Pretty simple, if tedious.
    821824    if (inActionSelector == @selector(clear:))
    … …  
    833836    else if (inActionSelector == @selector(undo:))
    834837        hiCommandID = kHICommandUndo;
     838IGNORE_WARNINGS_END
    835839
    836840    // Done.

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r236840 r236846  
     12018-10-04  Dan Bernstein  <mitz@apple.com>
     2
     3        WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
     4        https://bugs.webkit.org/show_bug.cgi?id=190250
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF,
     9          CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED.
     10          Also enabled GCC_WARN_UNDECLARED_SELECTOR by deleting the line that set it to NO, which let
     11          an earlier line set it to YES.
     12
     13        Enabling -Wundeclared-selector exposed some long-standing mistakes and required the most
     14        changes below.
     15
     16        * DefaultDelegates/WebDefaultContextMenuDelegate.mm: Imported an internal header that
     17          provides some missing method declarations.
     18
     19        * Misc/WebDownload.mm:
     20        (-[WebDownload initWithRequest:delegate:]): Suppressed warning about this implementation of
     21          a deprecated method.
     22
     23        * Misc/WebIconDatabase.mm: Suppressed warning around our implementation of a deprecated class.
     24
     25        * Misc/WebNSObjectExtras.mm: Declare a category that is implemented in this file, because
     26          other code in the file uses a method from it.
     27
     28        * Plugins/WebBaseNetscapePluginView.mm:
     29        (-[WebBaseNetscapePluginView renewGState]): Suppressed warning about this implementation of
     30          a deprecated method.
     31
     32        * Plugins/WebPluginController.mm:
     33        (installFlip4MacPlugInWorkaroundIfNecessary): Suppressed the undeclared selector warning
     34          around use of a selector that may be present in some WebKit client.
     35
     36        * Plugins/WebPluginDatabase.mm: Imported an internal header that provides some missing
     37          method declarations.
     38
     39        * WebCoreSupport/PopupMenuMac.mm: Imported a header that delcares delegate methods we call
     40          from here.
     41
     42        * WebCoreSupport/WebCachedFramePlatformData.h: Imported an internal header that provides some
     43          missing method declarations.
     44
     45        * WebCoreSupport/WebChromeClient.mm: Imported a header that declares delegate methods we call
     46          from here.
     47
     48        * WebCoreSupport/WebFrameLoaderClient.mm: Imported headers that declare delegate methods we
     49          call from here.
     50        (WebFrameLoaderClient::setTitle): Suppressed the undeclared selector warning around use of
     51          an obsolete delegate method for binary compatibility.
     52        (pluginView): Ditto.
     53
     54        * WebCoreSupport/WebVisitedLinkStore.mm: Imported a header that declares delegate methods we
     55          call from here.
     56
     57        * WebView/WebDeviceOrientationInternal.h: Declared -setController in a new
     58          WebDeviceOrientationProviderMock protocol.
     59
     60        * WebView/WebDeviceOrientationProviderMock.mm:
     61        (-[WebDeviceOrientationProviderMock setController:]): Moved from an internal category to the
     62          main @implementation.
     63
     64        * WebView/WebDeviceOrientationProviderMockInternal.h: Declared that
     65          WebDeviceOrientationProviderMock conforms to WebDeviceOrientationProviderMock.
     66
     67        * WebView/WebDynamicScrollBarsView.mm:
     68        (-[WebDynamicScrollBarsView accessibilityIsIgnored]): Suppressed warning about this implementation
     69          of a deprecated method.
     70
     71        * WebView/WebHTMLView.mm:
     72        (-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]): Suppressed the undeclared
     73          selector warning around action methods that are not declared anywhere in WebKit.
     74
     75        (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): Suppressed warning
     76          about implementing this deprecated method.
     77        (-[WebHTMLView draggingSourceOperationMaskForLocal:]): Ditto.
     78        (-[WebHTMLView draggedImage:endedAt:operation:]): Ditto.
     79        (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
     80        (-[WebHTMLView accessibilityAttributeValue:]): Ditto.
     81        (-[WebHTMLView characterIndexForPoint:]): Ditto.
     82        (-[WebHTMLView firstRectForCharacterRange:]): Ditto.
     83        (-[WebHTMLView attributedSubstringFromRange:]): Ditto.
     84        (-[WebHTMLView setMarkedText:selectedRange:]): Ditto.
     85        (-[WebHTMLView doCommandBySelector:]): Ditto.
     86        (-[WebHTMLView insertText:]): Ditto.
     87
     88        * WebView/WebHTMLViewInternal.h: Declared an internal method that’s used from another file.
     89
     90        * WebView/WebJSPDFDoc.mm: Imported a header that declares delegate methods we call from here.
     91
     92        * WebView/WebPDFView.h: Removed previewView ivar.
     93
     94        * WebView/WebPDFView.mm:
     95          Removed declaration of FileInternal category and merged its implementation with the main
     96          implementation.
     97        (-[WebPDFView dealloc]): Removed previewView ivar.
     98        (-[WebPDFView initWithFrame:]): Removed code to deal with PDFPreviewView, which doesn’t
     99          exist in macOS versions we support.
     100        (+[WebPDFView _PDFPreviewViewClass]): Deleted. PDFPreviewView doesn’t exist anymore.
     101        (-[WebPDFView _canLookUpInDictionary]): Suppressed undeclared selector warning around use of
     102          action methods internal to PDFKit.
     103        (-[WebPDFView _lookUpInDictionaryFromMenu:]): Ditto.
     104        (-[WebPDFView _menuItemsFromPDFKitForEvent:]): Ditto.
     105
     106        * WebView/WebUIDelegatePrivate.h: Restored declarations of the delegate methods we actually
     107          call on macOS, even though in r86988 we started calling different methods on iOS.
     108
     109        * WebView/WebView.mm:
     110        - Imported headers that declare delegate methods that we call.
     111        - Removed declaration of WebFileInternal category and merged its implementation with the
     112          main implementation.
     113        - Many internal methods were inexplicibly implemented as part of the WebViewEditingInMail
     114          category, which made them impossible to call from the main implementation. Moved those
     115          into the main implementation. One of those had to be declared in a class extension,
     116          because it is called from a method implemented in the WebPrivate category, and that
     117          category’s implementation appears first in the file.
     118
     119        (-[WebView _cacheHistoryDelegateImplementations]): Suppressed undeclared selector warning
     120          around use of obsolete delegate method for binary compatibility.
     121
     122        * WebView/WebViewInternal.h: Declared an internal method that’s used from another file.
     123
    11242018-10-04  YUHAN WU  <yuhan_wu@apple.com>
    2125

  • trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig

    r235412 r236846  
    3838CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
    3939CLANG_WARN_BOOL_CONVERSION = YES;
     40CLANG_WARN_COMMA = YES;
    4041CLANG_WARN_CONSTANT_CONVERSION = YES;
    4142CLANG_WARN_CXX0X_EXTENSIONS = NO;
    … …  
    5253CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
    5354GCC_WARN_UNDECLARED_SELECTOR = YES;
     55CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
    5456COMBINE_HIDPI_IMAGES = NO;
    5557DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
    … …  
    7779GCC_WARN_ABOUT_RETURN_TYPE = YES;
    7880GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
     81CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    7982GCC_WARN_SIGN_COMPARE = YES;
    80 GCC_WARN_UNDECLARED_SELECTOR = NO;
    8183GCC_WARN_UNINITIALIZED_AUTOS = YES;
    8284GCC_WARN_UNUSED_FUNCTION = YES;
    … …  
    8486CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
    8587OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
     88CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
    8689PREBINDING = NO;
    8790WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;

  • trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm

    r222896 r236846  
    3636#import "WebFrameInternal.h"
    3737#import "WebFrameView.h"
    38 #import "WebHTMLViewPrivate.h"
     38#import "WebHTMLViewInternal.h"
    3939#import "WebLocalizableStringsInternal.h"
    4040#import "WebNSPasteboardExtras.h"

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

    r235585 r236846  
    182182}
    183183
     184IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    184185- (id)initWithRequest:(NSURLRequest *)request delegate:(id<NSURLDownloadDelegate>)delegate
     186IGNORE_WARNINGS_END
    185187{
    186188    [self _setRealDelegate:delegate];
    … …  
    188190}
    189191
     192IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    190193- (id)_initWithLoadingConnection:(NSURLConnection *)connection
    191194                         request:(NSURLRequest *)request
    … …  
    193196                        delegate:(id)delegate
    194197                           proxy:(NSURLConnectionDelegateProxy *)proxy
     198IGNORE_WARNINGS_END
    195199{
    196200    [self _setRealDelegate:delegate];
    … …  
    198202}
    199203
     204IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    200205- (id)_initWithRequest:(NSURLRequest *)request
    201206              delegate:(id)delegate
    202207             directory:(NSString *)directory
     208IGNORE_WARNINGS_END
    203209{
    204210    [self _setRealDelegate:delegate];

  • trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm

    r228218 r236846  
    9292    0xFC, 0x80, 0x00, 0x00, 0x27, 0x10, 0x00, 0x0A, 0xFC, 0x80, 0x00, 0x00, 0x27, 0x10 };
    9393
     94IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    9495@implementation WebIconDatabase
     96IGNORE_WARNINGS_END
    9597
    9698+ (void)initialize

  • trunk/Source/WebKitLegacy/mac/Misc/WebNSObjectExtras.mm

    r165676 r236846  
    3636    id exception;
    3737}
     38@end
     39
     40@interface NSInvocation (WebMainThreadInvoker)
     41- (void)_webkit_invokeAndHandleException:(WebMainThreadInvoker *)exceptionHandler;
    3842@end
    3943

  • trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm

    r235935 r236846  
    614614}
    615615
     616IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    616617- (void)renewGState
     618IGNORE_WARNINGS_END
    617619{
    618620    [super renewGState];

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm

    r235935 r236846  
    680680            return;
    681681
     682IGNORE_WARNINGS_BEGIN("undeclared-selector")
    682683        Method methodToPatch = class_getInstanceMethod(TSUpdateCheck, @selector(alertDidEnd:returnCode:contextInfo:));
     684IGNORE_WARNINGS_END
    683685        if (!methodToPatch)
    684686            return;

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

    r234685 r236846  
    3535#import "WebFrameViewInternal.h"
    3636#import "WebHTMLRepresentation.h"
    37 #import "WebHTMLView.h"
     37#import "WebHTMLViewInternal.h"
    3838#import "WebKitLogging.h"
    3939#import "WebNSFileManagerExtras.h"

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm

    r235935 r236846  
    2323#import "WebDelegateImplementationCaching.h"
    2424#import "WebFrameInternal.h"
     25#import "WebUIDelegatePrivate.h"
    2526#import <WebCore/IntRect.h>
    2627#import <WebCore/AXObjectCache.h>

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h

    r165676 r236846  
    2727 */
    2828
     29#import "WebHTMLViewInternal.h"
    2930#import <WebCore/CachedFramePlatformData.h>
    3031#import <wtf/ObjcRuntimeExtras.h>

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h

    r235489 r236846  
    161161    String generateReplacementFile(const String& path) final;
    162162
     163#if !PLATFORM(IOS)
    163164    void elementDidFocus(WebCore::Element&) override;
    164165    void elementDidBlur(WebCore::Element&) override;
     166#endif
    165167
    166168    bool shouldPaintEntireContents() const final;

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm

    r235489 r236846  
    3939#import "WebDelegateImplementationCaching.h"
    4040#import "WebElementDictionary.h"
     41#import "WebFormDelegate.h"
    4142#import "WebFrameInternal.h"
    4243#import "WebFrameView.h"
    … …  
    877878}
    878879
     880#if !PLATFORM(IOS)
    879881void WebChromeClient::elementDidFocus(WebCore::Element& element)
    880882{
    … …  
    886888    CallUIDelegate(m_webView, @selector(webView:formDidBlurNode:), kit(&element));
    887889}
     890#endif
    888891
    889892bool WebChromeClient::selectItemWritingDirectionIsNatural()

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm

    r235775 r236846  
    844844    if (key == "Down")
    845845        return @selector(moveDown:);
     846IGNORE_WARNINGS_BEGIN("undeclared-selector")
    846847    if (key == "U+001B")
    847848        return @selector(cancel:);
    … …  
    853854    if (key == "Enter")
    854855        return @selector(insertNewline:);
     856IGNORE_WARNINGS_END
    855857    return 0;
    856858}

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r235935 r236846  
    4545#import "WebFormDelegate.h"
    4646#import "WebFrameInternal.h"
    47 #import "WebFrameLoadDelegate.h"
     47#import "WebFrameLoadDelegatePrivate.h"
    4848#import "WebFrameNetworkingContext.h"
    4949#import "WebFrameViewInternal.h"
    5050#import "WebHTMLRepresentationPrivate.h"
    5151#import "WebHTMLViewInternal.h"
     52#import "WebHistoryDelegate.h"
    5253#import "WebHistoryInternal.h"
    5354#import "WebHistoryItemInternal.h"
    … …  
    6869#import "WebPreferences.h"
    6970#import "WebResourceLoadDelegate.h"
     71#import "WebResourceLoadDelegatePrivate.h"
    7072#import "WebScriptWorldInternal.h"
    7173#import "WebSecurityOriginInternal.h"
    … …  
    13661368        if (implementations->setTitleFunc)
    13671369            CallHistoryDelegate(implementations->setTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:inFrame:), (NSString *)title.string, (NSString *)url, m_webFrame.get());
    1368         else if (implementations->deprecatedSetTitleFunc)
     1370        else if (implementations->deprecatedSetTitleFunc) {
     1371IGNORE_WARNINGS_BEGIN("undeclared-selector")
    13691372            CallHistoryDelegate(implementations->deprecatedSetTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:), (NSString *)title.string, (NSString *)url);
     1373IGNORE_WARNINGS_END
     1374        }
    13701375        return;
    13711376    }
    … …  
    17501755            nil];
    17511756        LOG(Plugins, "arguments:\n%@", arguments);
     1757IGNORE_WARNINGS_BEGIN("undeclared-selector")
    17521758    } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
     1759IGNORE_WARNINGS_END
    17531760        arguments = [NSDictionary dictionaryWithObjectsAndKeys:
    17541761            baseURL, WebPluginBaseURLKey,

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm

    r222664 r236846  
    2828#import "WebDelegateImplementationCaching.h"
    2929#import "WebFrameInternal.h"
     30#import "WebHistoryDelegate.h"
    3031#import "WebHistoryInternal.h"
    3132#import "WebViewInternal.h"

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

    r216816 r236846  
    2626#import "WebDeviceOrientation.h"
    2727
     28#import "WebDeviceOrientationProvider.h"
     29#import <WebCore/DeviceOrientationClientMock.h>
    2830#import <WebCore/DeviceOrientationData.h>
    2931#import <wtf/RefPtr.h>
    … …  
    4446
    4547WebCore::DeviceOrientationData* core(WebDeviceOrientation*);
     48
     49@protocol WebDeviceOrientationProviderMock <WebDeviceOrientationProvider>
     50- (void)setController:(WebCore::DeviceOrientationController*)controller;
     51@end

  • trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.mm

    r199960 r236846  
    6868@end
    6969
    70 @implementation WebDeviceOrientationProviderMock (Internal)
    71 
    72 - (void)setController:(WebCore::DeviceOrientationController*)controller
    73 {
    74    [m_internal setController:controller];
    75 }
    76 
    77 @end
    78 
    7970@implementation WebDeviceOrientationProviderMock
    8071
    … …  
    120111}
    121112
     113- (void)setController:(WebCore::DeviceOrientationController*)controller
     114{
     115   [m_internal setController:controller];
     116}
     117
    122118@end

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

    r183172 r236846  
    2424 */
    2525
     26#import "WebDeviceOrientationInternal.h"
    2627#import "WebDeviceOrientationProviderMock.h"
    2728#import <WebCore/DeviceOrientationClientMock.h>
    … …  
    4243@end
    4344
    44 @interface WebDeviceOrientationProviderMock (Internal)
    45 - (void)setController:(WebCore::DeviceOrientationController*)controller;
     45@interface WebDeviceOrientationProviderMock () <WebDeviceOrientationProviderMock>
    4646@end

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

    r168047 r236846  
    2828
    2929#import <WebKitLegacy/WebDocument.h>
     30#import <WebKitLegacy/WebFrame.h>
    3031#import <WebKitLegacy/WebHTMLView.h>
    3132
    … …  
    103104*/
    104105+ (NSArray *)supportedMIMETypes;
     106+ (Class)_representationClassForWebFrame:(WebFrame *)webFrame;
    105107@end
    106108

  • trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm

    r226008 r236846  
    581581
    582582// This object will be the parent of the web area in WK1, so it should not be ignored.
    583 - (BOOL)accessibilityIsIgnored
     583IGNORE_WARNINGS_BEGIN("deprecated-implementations")
     584- (BOOL)accessibilityIsIgnored
     585IGNORE_WARNINGS_END
    584586{
    585587    return NO;

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

    r236445 r236846  
    29012901        }
    29022902    }
    2903 
    29042903    if (action == @selector(changeSpelling:)
     2904IGNORE_WARNINGS_BEGIN("undeclared-selector")
    29052905            || action == @selector(_changeSpellingFromMenu:)
     2906IGNORE_WARNINGS_END
    29062907            || action == @selector(checkSpelling:)
    29072908            || action == @selector(complete:)
    … …  
    29792980        return [[self _webView] isEditable] && [self _canEditRichly];
    29802981
     2982IGNORE_WARNINGS_BEGIN("undeclared-selector")
    29812983    if (action == @selector(_ignoreSpellingFromMenu:)
    29822984            || action == @selector(_learnSpellingFromMenu:)
     2985IGNORE_WARNINGS_END
    29832986            || action == @selector(takeFindStringFromSelection:))
    29842987        return [self _hasSelection];
    … …  
    42524255
    42534256#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
     4257IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    42544258- (void)dragImage:(NSImage *)dragImage
    42554259               at:(NSPoint)at
    … …  
    42594263           source:(id)source
    42604264        slideBack:(BOOL)slideBack
     4265IGNORE_WARNINGS_END
    42614266{
    42624267    ASSERT(self == [self _topHTMLView]);
    … …  
    42914296}
    42924297
     4298IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    42934299- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
     4300IGNORE_WARNINGS_END
    42944301{
    42954302    ASSERT(![self _webView] || [self _isTopHTMLView]);
    … …  
    43024309}
    43034310
     4311IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    43044312- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
     4313IGNORE_WARNINGS_END
    43054314{
    43064315    ASSERT(![self _webView] || [self _isTopHTMLView]);
    … …  
    43394348}
    43404349
     4350IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    43414351- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
     4352IGNORE_WARNINGS_END
    43424353{
    43434354    NSFileWrapper *wrapper = nil;
    … …  
    49975008}
    49985009
     5010IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    49995011- (id)accessibilityAttributeValue:(NSString*)attributeName
     5012IGNORE_WARNINGS_END
    50005013{
    50015014    if ([attributeName isEqualToString: NSAccessibilityChildrenAttribute]) {
    … …  
    56685681
    56695682#endif
     5683
     5684#if PLATFORM(IOS)
     5685- (void)markedTextUpdate:(NSNotification *)notification
     5686{
     5687    NSString *text = [notification object];
     5688    NSRange range = NSMakeRange(0, [text length]);
     5689    [self setMarkedText:text selectedRange:range];
     5690}
     5691#endif
     5692
     5693IGNORE_WARNINGS_BEGIN("deprecated-implementations")
     5694- (void)setMarkedText:(id)string selectedRange:(NSRange)newSelRange
     5695IGNORE_WARNINGS_END
     5696{
     5697    [self _executeSavedKeypressCommands];
     5698
     5699#if PLATFORM(MAC)
     5700    BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
     5701    ASSERT(isAttributedString || [string isKindOfClass:[NSString class]]);
     5702
     5703    LOG(TextInput, "setMarkedText:\"%@\" selectedRange:(%u, %u)", isAttributedString ? [string string] : string, newSelRange.location, newSelRange.length);
     5704#endif
     5705
     5706    // Use pointer to get parameters passed to us by the caller of interpretKeyEvents.
     5707    auto* parameters = _private->interpretKeyEventsParameters;
     5708
     5709    if (parameters) {
     5710        parameters->eventInterpretationHadSideEffects = true;
     5711        parameters->consumedByIM = false;
     5712    }
     5713   
     5714    Frame* coreFrame = core([self _frame]);
     5715    if (!coreFrame)
     5716        return;
     5717
     5718    if (![self _isEditable])
     5719        return;
     5720
     5721    Vector<CompositionUnderline> underlines;
     5722    NSString *text;
     5723    NSRange replacementRange = { NSNotFound, 0 };
     5724
     5725#if PLATFORM(MAC)
     5726    if (isAttributedString) {
     5727        // FIXME: We ignore most attributes from the string, so an input method cannot specify e.g. a font or a glyph variation.
     5728        text = [string string];
     5729        NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:0 inRange:NSMakeRange(0, [text length])];
     5730        LOG(TextInput, "    ReplacementRange: %@", rangeString);
     5731        // The AppKit adds a 'secret' property to the string that contains the replacement range.
     5732        // The replacement range is the range of the text that should be replaced with the new string.
     5733        if (rangeString)
     5734            replacementRange = NSRangeFromString(rangeString);
     5735
     5736        extractUnderlines(string, underlines);
     5737    } else {
     5738        text = string;
     5739        underlines.append(CompositionUnderline(0, [text length], CompositionUnderlineColor::TextColor, Color::black, false));
     5740    }
     5741#else
     5742    text = string;
     5743#endif
     5744
     5745    if (replacementRange.location != NSNotFound)
     5746        [[self _frame] _selectNSRange:replacementRange];
     5747
     5748    coreFrame->editor().setComposition(text, underlines, newSelRange.location, NSMaxRange(newSelRange));
     5749}
    56705750
    56715751@end
    … …  
    62436323#if PLATFORM(MAC)
    62446324
     6325IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    62456326- (NSArray *)validAttributesForMarkedText
     6327IGNORE_WARNINGS_END
    62466328{
    62476329    static NSArray *validAttributes = [[NSArray alloc] initWithObjects:
    … …  
    62846366#endif // PLATFORM(MAC)
    62856367
     6368IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    62866369- (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
     6370IGNORE_WARNINGS_END
    62876371{
    62886372    [self _executeSavedKeypressCommands];
    … …  
    63086392}
    63096393
     6394IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    63106395- (NSRect)firstRectForCharacterRange:(NSRange)theRange
     6396IGNORE_WARNINGS_END
    63116397{
    63126398    [self _executeSavedKeypressCommands];
    … …  
    63406426}
    63416427
     6428IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    63426429- (NSRange)selectedRange
     6430IGNORE_WARNINGS_END
    63436431{
    63446432    [self _executeSavedKeypressCommands];
    … …  
    63546442}
    63556443
     6444IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    63566445- (NSRange)markedRange
     6446IGNORE_WARNINGS_END
    63576447{
    63586448    [self _executeSavedKeypressCommands];
    … …  
    63706460#if PLATFORM(MAC)
    63716461
     6462IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    63726463- (NSAttributedString *)attributedSubstringFromRange:(NSRange)nsRange
     6464IGNORE_WARNINGS_END
    63736465{
    63746466    [self _executeSavedKeypressCommands];
    … …  
    64026494#endif
    64036495
     6496IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    64046497- (NSInteger)conversationIdentifier
     6498IGNORE_WARNINGS_END
    64056499{
    64066500    return (NSInteger)self;
    … …  
    64226516}
    64236517
     6518IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    64246519- (void)unmarkText
     6520IGNORE_WARNINGS_END
    64256521{
    64266522    [self _executeSavedKeypressCommands];
    … …  
    64676563#endif
    64686564
    6469 - (void)setMarkedText:(id)string selectedRange:(NSRange)newSelRange
    6470 {
    6471     [self _executeSavedKeypressCommands];
    6472 
    6473 #if PLATFORM(MAC)
    6474     BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
    6475     ASSERT(isAttributedString || [string isKindOfClass:[NSString class]]);
    6476 
    6477     LOG(TextInput, "setMarkedText:\"%@\" selectedRange:(%u, %u)", isAttributedString ? [string string] : string, newSelRange.location, newSelRange.length);
    6478 #endif
    6479 
    6480     // Use pointer to get parameters passed to us by the caller of interpretKeyEvents.
    6481     auto* parameters = _private->interpretKeyEventsParameters;
    6482 
    6483     if (parameters) {
    6484         parameters->eventInterpretationHadSideEffects = true;
    6485         parameters->consumedByIM = false;
    6486     }
    6487    
    6488     Frame* coreFrame = core([self _frame]);
    6489     if (!coreFrame)
    6490         return;
    6491 
    6492     if (![self _isEditable])
    6493         return;
    6494 
    6495     Vector<CompositionUnderline> underlines;
    6496     NSString *text;
    6497     NSRange replacementRange = { NSNotFound, 0 };
    6498 
    6499 #if PLATFORM(MAC)
    6500     if (isAttributedString) {
    6501         // FIXME: We ignore most attributes from the string, so an input method cannot specify e.g. a font or a glyph variation.
    6502         text = [string string];
    6503         NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:0 inRange:NSMakeRange(0, [text length])];
    6504         LOG(TextInput, "    ReplacementRange: %@", rangeString);
    6505         // The AppKit adds a 'secret' property to the string that contains the replacement range.
    6506         // The replacement range is the range of the text that should be replaced with the new string.
    6507         if (rangeString)
    6508             replacementRange = NSRangeFromString(rangeString);
    6509 
    6510         extractUnderlines(string, underlines);
    6511     } else {
    6512         text = string;
    6513         underlines.append(CompositionUnderline(0, [text length], CompositionUnderlineColor::TextColor, Color::black, false));
    6514     }
    6515 #else
    6516     text = string;
    6517 #endif
    6518 
    6519     if (replacementRange.location != NSNotFound)
    6520         [[self _frame] _selectNSRange:replacementRange];
    6521 
    6522     coreFrame->editor().setComposition(text, underlines, newSelRange.location, NSMaxRange(newSelRange));
    6523 }
    6524 
    6525 #if PLATFORM(IOS)
    6526 - (void)markedTextUpdate:(NSNotification *)notification
    6527 {
    6528     NSString *text = [notification object];
    6529     NSRange range = NSMakeRange(0, [text length]);
    6530     [self setMarkedText:text selectedRange:range];
    6531 }
    6532 #endif
    6533 
     6565IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    65346566- (void)doCommandBySelector:(SEL)selector
     6567IGNORE_WARNINGS_END
    65356568{
    65366569    LOG(TextInput, "doCommandBySelector:\"%s\"", sel_getName(selector));
    … …  
    65906623}
    65916624
     6625IGNORE_WARNINGS_BEGIN("deprecated-implementations")
    65926626- (void)insertText:(id)string
     6627IGNORE_WARNINGS_END
    65936628{
    65946629#if PLATFORM(MAC)

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

    r221559 r236846  
    5858
    5959- (WebFrame *)_frame;
     60- (void)closeIfNotCurrentView;
    6061
    6162#if PLATFORM(MAC)
    … …  
    99100- (WebPluginController *)_pluginController;
    100101
     102- (void)_executeSavedKeypressCommands;
     103
    101104@end
    102105

  • trunk/Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm

    r234685 r236846  
    2929#import "WebDelegateImplementationCaching.h"
    3030#import "WebFrame.h"
     31#import "WebUIDelegate.h"
    3132#import "WebView.h"
    3233#import <JavaScriptCore/JSObjectRef.h>

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

    r232239 r236846  
    4141@interface WebPDFView : NSView <PDFViewDelegate, WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
    4242{
    43     NSView *previewView;
    4443    PDFView *PDFSubview;
    4544    NSString *path;

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm

    r235935 r236846  
    8585extern "C" NSString *_NSPathForSystemFramework(NSString *framework);
    8686
    87 @interface WebPDFView (FileInternal)
    88 + (Class)_PDFPreviewViewClass;
    89 + (Class)_PDFViewClass;
    90 - (void)_applyPDFDefaults;
    91 - (BOOL)_canLookUpInDictionary;
    92 - (NSClipView *)_clipViewForPDFDocumentView;
    93 - (NSEvent *)_fakeKeyEventWithFunctionKey:(unichar)functionKey;
    94 - (NSMutableArray *)_menuItemsFromPDFKitForEvent:(NSEvent *)theEvent;
    95 - (PDFSelection *)_nextMatchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag fromSelection:(PDFSelection *)initialSelection startInSelection:(BOOL)startInSelection;
    96 - (void)_openWithFinder:(id)sender;
    97 - (NSString *)_path;
    98 - (void)_PDFDocumentViewMightHaveScrolled:(NSNotification *)notification;
    99 - (BOOL)_pointIsInSelection:(NSPoint)point;
    100 - (NSAttributedString *)_scaledAttributedString:(NSAttributedString *)unscaledAttributedString;
    101 - (void)_setTextMatches:(NSArray *)array;
    102 - (NSString *)_temporaryPDFDirectoryPath;
    103 - (void)_trackFirstResponder;
    104 - (void)_updatePreferencesSoon;
    105 - (NSSet *)_visiblePDFPages;
    106 @end;
    107 
    10887@interface NSView ()
    10988- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
    … …  
    212191{
    213192    [dataSource release];
    214     [previewView release];
    215193    [PDFSubview setDelegate:nil];
    216194    [PDFSubview release];
    … …  
    328306        [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
    329307       
    330         Class previewViewClass = [[self class] _PDFPreviewViewClass];
    331        
    332         // We might not have found a previewViewClass, but if we did find it
    333         // then we should be able to create an instance.
    334         if (previewViewClass) {
    335             previewView = [[previewViewClass alloc] initWithFrame:frame];
    336             ASSERT(previewView);
    337         }
    338        
    339         NSView *topLevelPDFKitView = nil;
    340         if (previewView) {
    341             // We'll retain the PDFSubview here so that it is equally retained in all
    342             // code paths. That way we don't need to worry about conditionally releasing
    343             // it later.
    344             PDFSubview = [[previewView performSelector:@selector(pdfView)] retain];
    345             topLevelPDFKitView = previewView;
    346         } else {
    347             PDFSubview = [[[[self class] _PDFViewClass] alloc] initWithFrame:frame];
    348             topLevelPDFKitView = PDFSubview;
    349         }
    350        
     308        PDFSubview = [[[[self class] _PDFViewClass] alloc] initWithFrame:frame];
     309
    351310        ASSERT(PDFSubview);
    352311       
    353         [topLevelPDFKitView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
    354         [self addSubview:topLevelPDFKitView];
     312        [PDFSubview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     313        [self addSubview:PDFSubview];
    355314       
    356315        [PDFSubview setDelegate:self];
    … …  
    10611020}
    10621021
    1063 @end
    1064 
    1065 @implementation WebPDFView (FileInternal)
    1066 
    1067 + (Class)_PDFPreviewViewClass
    1068 {
    1069     static Class PDFPreviewViewClass = nil;
    1070     static BOOL checkedForPDFPreviewViewClass = NO;
    1071    
    1072     if (!checkedForPDFPreviewViewClass) {
    1073         checkedForPDFPreviewViewClass = YES;
    1074         PDFPreviewViewClass = [[WebPDFView PDFKitBundle] classNamed:@"PDFPreviewView"];
    1075     }
    1076    
    1077     // This class might not be available; callers need to deal with a nil return here.
    1078     return PDFPreviewViewClass;
    1079 }
    1080 
    10811022+ (Class)_PDFViewClass
    10821023{
    … …  
    11171058- (BOOL)_canLookUpInDictionary
    11181059{
     1060IGNORE_WARNINGS_BEGIN("undeclared-selector")
    11191061    return [PDFSubview respondsToSelector:@selector(_searchInDictionary:)];
     1062IGNORE_WARNINGS_END
    11201063}
    11211064
    … …  
    11531096    // PDFView uses. Since the PDFView method isn't API, and isn't available on all versions
    11541097    // of PDFKit, we use performSelector after a respondsToSelector check, rather than calling it directly.
     1098IGNORE_WARNINGS_BEGIN("undeclared-selector")
    11551099    if ([self _canLookUpInDictionary])
    11561100        [PDFSubview performSelector:@selector(_searchInDictionary:) withObject:sender];
     1101IGNORE_WARNINGS_END
    11571102}
    11581103
    … …  
    11861131    NSMutableArray *copiedItems = [NSMutableArray array];
    11871132    NSDictionary *actionsToTags = [[NSDictionary alloc] initWithObjectsAndKeys:
     1133IGNORE_WARNINGS_BEGIN("undeclared-selector")
    11881134        [NSNumber numberWithInt:WebMenuItemPDFActualSize], NSStringFromSelector(@selector(_setActualSize:)),
    11891135        [NSNumber numberWithInt:WebMenuItemPDFZoomIn], NSStringFromSelector(@selector(zoomIn:)),
    … …  
    11971143        [NSNumber numberWithInt:WebMenuItemPDFNextPage], NSStringFromSelector(@selector(goToNextPage:)),
    11981144        [NSNumber numberWithInt:WebMenuItemPDFPreviousPage], NSStringFromSelector(@selector(goToPreviousPage:)),
     1145IGNORE_WARNINGS_END
    11991146        nil];
    12001147   
    … …  
    12031150    // "Look Up in Dictionary" via the implementation of -[WebPDFView _lookUpInDictionaryFromMenu:].
    12041151    NSSet *unwantedActions = [[NSSet alloc] initWithObjects:
     1152IGNORE_WARNINGS_BEGIN("undeclared-selector")
    12051153                              NSStringFromSelector(@selector(_searchInSpotlight:)),
    12061154                              NSStringFromSelector(@selector(_searchInGoogle:)),
    12071155                              NSStringFromSelector(@selector(_searchInDictionary:)),
     1156IGNORE_WARNINGS_END
    12081157                              NSStringFromSelector(@selector(copy:)),
    12091158                              nil];

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

    r231024 r236846  
    266266- (void)webView:(WebView *)webView checkPolicyForUserMediaRequestFromOrigin:(WebSecurityOrigin *)origin listener:(id<WebAllowDenyPolicyListener>)listener;
    267267
     268#if !TARGET_OS_IPHONE
     269- (void)webView:(WebView *)sender formDidFocusNode:(DOMNode *)node;
     270- (void)webView:(WebView *)sender formDidBlurNode:(DOMNode *)node;
     271#else
    268272- (void)webView:(WebView *)sender elementDidFocusNode:(DOMNode *)node;
    269273- (void)webView:(WebView *)sender elementDidBlurNode:(DOMNode *)node;
     274#endif
    270275
    271276/*!
    … …  
    279284
    280285#if ENABLE_FULLSCREEN_API
    281 - (BOOL)webView:(WebView *)sender supportsFullScreenForElement:(DOMElement *)element;
    282 - (void)webView:(WebView *)sender enterFullScreenForElement:(DOMElement *)element;
    283 - (void)webView:(WebView *)sender exitFullScreenForElement:(DOMElement *)element;
     286- (BOOL)webView:(WebView *)sender supportsFullScreenForElement:(DOMElement *)element withKeyboard:(BOOL)withKeyboard;
     287- (void)webView:(WebView *)sender enterFullScreenForElement:(DOMElement *)element listener:(id <WebKitFullScreenListener>)listener;
     288- (void)webView:(WebView *)sender exitFullScreenForElement:(DOMElement *)element listener:(id <WebKitFullScreenListener>)listener;
     289- (void)webView:(WebView *)sender closeFullScreenWithListener:(id <WebKitFullScreenListener>)listener;
    284290#endif
    285291

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

    r236840 r236846  
    6565#import "WebFormDelegatePrivate.h"
    6666#import "WebFrameInternal.h"
     67#import "WebFrameLoadDelegatePrivate.h"
    6768#import "WebFrameLoaderClient.h"
    6869#import "WebFrameNetworkingContext.h"
    … …  
    7273#import "WebHTMLRepresentation.h"
    7374#import "WebHTMLViewInternal.h"
     75#import "WebHistoryDelegate.h"
    7476#import "WebHistoryItemInternal.h"
    7577#import "WebIconDatabase.h"
    … …  
    100102#import "WebPreferencesPrivate.h"
    101103#import "WebProgressTrackerClient.h"
     104#import "WebResourceLoadDelegate.h"
     105#import "WebResourceLoadDelegatePrivate.h"
    102106#import "WebResourceLoadScheduler.h"
    103107#import "WebScriptDebugDelegate.h"
    … …  
    393397macro(centerSelectionInVisibleArea) \
    394398macro(changeAttributes) \
     399_Pragma("clang diagnostic push") \
     400_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
    395401macro(changeBaseWritingDirection) \
    396402macro(changeBaseWritingDirectionToLTR) \
    397403macro(changeBaseWritingDirectionToRTL) \
     404_Pragma("clang diagnostic pop") \
    398405macro(changeColor) \
    399406macro(changeDocumentBackgroundColor) \
    … …  
    504511macro(superscript) \
    505512macro(swapWithMark) \
     513_Pragma("clang diagnostic push") \
     514_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
    506515macro(takeFindStringFromSelection) \
     516_Pragma("clang diagnostic pop") \
    507517macro(toggleBaseWritingDirection) \
    508518macro(transpose) \
    … …  
    511521macro(uppercaseWord) \
    512522macro(yank) \
     523_Pragma("clang diagnostic push") \
     524_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
    513525macro(yankAndSelect) \
     526_Pragma("clang diagnostic pop") \
    514527
    515528#define WebKitOriginalTopPrintingMarginKey @"WebKitOriginalTopMargin"
    … …  
    727740@end
    728741#endif // ENABLE(DATA_INTERACTION)
    729 
    730 @interface WebView (WebFileInternal)
    731 #if !PLATFORM(IOS)
    732 - (float)_deviceScaleFactor;
    733 #endif
    734 - (BOOL)_isLoading;
    735 - (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point;
    736 - (WebFrame *)_focusedFrame;
    737 + (void)_preflightSpellChecker;
    738 - (BOOL)_continuousCheckingAllowed;
    739 - (NSResponder *)_responderForResponderOperations;
    740 @end
    741742
    742743NSString *WebElementDOMNodeKey =            @"WebElementDOMNode";
    … …  
    10971098
    10981099#endif // HAVE(TOUCH_BAR)
     1100
     1101@interface WebView ()
     1102#if PLATFORM(IOS)
     1103- (void)_wakWindowScreenScaleChanged:(NSNotification *)notification;
     1104- (void)_wakWindowVisibilityChanged:(NSNotification *)notification;
     1105#else
     1106- (float)_deviceScaleFactor;
     1107#endif
     1108@end
    10991109
    11001110@implementation WebView (AllWebViews)
    … …  
    33403350    cache->clientRedirectFunc = getMethod(delegate, @selector(webView:didPerformClientRedirectFromURL:toURL:inFrame:));
    33413351    cache->serverRedirectFunc = getMethod(delegate, @selector(webView:didPerformServerRedirectFromURL:toURL:inFrame:));
     3352IGNORE_WARNINGS_BEGIN("undeclared-selector")
    33423353    cache->deprecatedSetTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:));
     3354IGNORE_WARNINGS_END
    33433355    cache->setTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:inFrame:));
    33443356    cache->populateVisitedLinksFunc = getMethod(delegate, @selector(populateVisitedLinksForWebView:));
    … …  
    33963408        _private->editingDelegateForwarder = [[_WebSafeForwarder alloc] initWithTarget:_private->editingDelegate defaultTarget:[WebDefaultEditingDelegate sharedEditingDelegate]];
    33973409    return _private->editingDelegateForwarder;
    3398 }
    3399 
    3400 - (void)_closeWindow
    3401 {
    3402     [[self _UIDelegateForwarder] webViewClose:self];
    34033410}
    34043411
    … …  
    73447351
    73457352#endif // HAVE(TOUCH_BAR)
     7353
     7354static WebFrameView *containingFrameView(NSView *view)
     7355{
     7356    while (view && ![view isKindOfClass:[WebFrameView class]])
     7357        view = [view superview];
     7358    return (WebFrameView *)view;
     7359}
     7360
     7361#if !PLATFORM(IOS)
     7362- (float)_deviceScaleFactor
     7363{
     7364    if (_private->customDeviceScaleFactor != 0)
     7365        return _private->customDeviceScaleFactor;
     7366
     7367    NSWindow *window = [self window];
     7368    NSWindow *hostWindow = [self hostWindow];
     7369    if (window)
     7370        return [window backingScaleFactor];
     7371    if (hostWindow)
     7372        return [hostWindow backingScaleFactor];
     7373    return [[NSScreen mainScreen] backingScaleFactor];
     7374}
     7375#endif
     7376
     7377+ (BOOL)_didSetCacheModel
     7378{
     7379    return s_didSetCacheModel;
     7380}
     7381
     7382+ (WebCacheModel)_maxCacheModelInAnyInstance
     7383{
     7384    WebCacheModel cacheModel = WebCacheModelDocumentViewer;
     7385    NSEnumerator *enumerator = [(NSMutableSet *)allWebViewsSet objectEnumerator];
     7386    while (WebPreferences *preferences = [[enumerator nextObject] preferences])
     7387        cacheModel = std::max(cacheModel, [preferences cacheModel]);
     7388    return cacheModel;
     7389}
     7390
     7391+ (void)_cacheModelChangedNotification:(NSNotification *)notification
     7392{
     7393#if PLATFORM(IOS)
     7394    // This needs to happen on the Web Thread
     7395    WebThreadRun(^{
     7396#endif
     7397    WebPreferences *preferences = (WebPreferences *)[notification object];
     7398    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
     7399
     7400    WebCacheModel cacheModel = [preferences cacheModel];
     7401    if (![self _didSetCacheModel] || cacheModel > [self _cacheModel])
     7402        [self _setCacheModel:cacheModel];
     7403    else if (cacheModel < [self _cacheModel])
     7404        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
     7405#if PLATFORM(IOS)
     7406    });
     7407#endif
     7408}
     7409
     7410+ (void)_preferencesRemovedNotification:(NSNotification *)notification
     7411{
     7412    WebPreferences *preferences = (WebPreferences *)[notification object];
     7413    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
     7414
     7415    if ([preferences cacheModel] == [self _cacheModel])
     7416        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
     7417}
     7418
     7419- (WebFrame *)_focusedFrame
     7420{
     7421    NSResponder *resp = [[self window] firstResponder];
     7422    if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:[[self mainFrame] frameView]]) {
     7423        WebFrameView *frameView = containingFrameView((NSView *)resp);
     7424        ASSERT(frameView != nil);
     7425        return [frameView webFrame];
     7426    }
     7427
     7428    return nil;
     7429}
     7430
     7431- (BOOL)_isLoading
     7432{
     7433    WebFrame *mainFrame = [self mainFrame];
     7434    return [[mainFrame _dataSource] isLoading]
     7435        || [[mainFrame provisionalDataSource] isLoading];
     7436}
     7437
     7438- (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point
     7439{
     7440    if (_private->closed)
     7441        return nil;
     7442#if !PLATFORM(IOS)
     7443    NSView *view = [self hitTest:[[self superview] convertPoint:point fromView:nil]];
     7444#else
     7445    //[WebView superview] on iOS is nil, don't do a convertPoint
     7446    NSView *view = [self hitTest:point];
     7447#endif
     7448    if (![view isDescendantOf:[[self mainFrame] frameView]])
     7449        return nil;
     7450    WebFrameView *frameView = containingFrameView(view);
     7451    ASSERT(frameView);
     7452    return frameView;
     7453}
     7454
     7455+ (void)_preflightSpellCheckerNow:(id)sender
     7456{
     7457#if !PLATFORM(IOS)
     7458    [[NSSpellChecker sharedSpellChecker] _preflightChosenSpellServer];
     7459#endif
     7460}
     7461
     7462+ (void)_preflightSpellChecker
     7463{
     7464#if !PLATFORM(IOS)
     7465    // As AppKit does, we wish to delay tickling the shared spellchecker into existence on application launch.
     7466    if ([NSSpellChecker sharedSpellCheckerExists]) {
     7467        [self _preflightSpellCheckerNow:self];
     7468    } else {
     7469        [self performSelector:@selector(_preflightSpellCheckerNow:) withObject:self afterDelay:2.0];
     7470    }
     7471#endif
     7472}
     7473
     7474- (BOOL)_continuousCheckingAllowed
     7475{
     7476    static BOOL allowContinuousSpellChecking = YES;
     7477    static BOOL readAllowContinuousSpellCheckingDefault = NO;
     7478    if (!readAllowContinuousSpellCheckingDefault) {
     7479        if ([[NSUserDefaults standardUserDefaults] objectForKey:@"NSAllowContinuousSpellChecking"]) {
     7480            allowContinuousSpellChecking = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSAllowContinuousSpellChecking"];
     7481        }
     7482        readAllowContinuousSpellCheckingDefault = YES;
     7483    }
     7484    return allowContinuousSpellChecking;
     7485}
     7486
     7487- (NSResponder *)_responderForResponderOperations
     7488{
     7489    NSResponder *responder = [[self window] firstResponder];
     7490    WebFrameView *mainFrameView = [[self mainFrame] frameView];
     7491
     7492    // If the current responder is outside of the webview, use our main frameView or its
     7493    // document view. We also do this for subviews of self that are siblings of the main
     7494    // frameView since clients might insert non-webview-related views there (see 4552713).
     7495    if (responder != self && ![mainFrameView _web_firstResponderIsSelfOrDescendantView]) {
     7496        responder = [mainFrameView documentView];
     7497        if (!responder)
     7498            responder = mainFrameView;
     7499    }
     7500    return responder;
     7501}
    73467502
    73477503@end
    … …  
    86778833}
    86788834
    8679 @end
    8680 
    8681 static WebFrameView *containingFrameView(NSView *view)
    8682 {
    8683     while (view && ![view isKindOfClass:[WebFrameView class]])
    8684         view = [view superview];
    8685     return (WebFrameView *)view;   
    8686 }
    8687 
    8688 @implementation WebView (WebFileInternal)
    8689 
    8690 #if !PLATFORM(IOS)
    8691 - (float)_deviceScaleFactor
    8692 {
    8693     if (_private->customDeviceScaleFactor != 0)
    8694         return _private->customDeviceScaleFactor;
    8695 
    8696     NSWindow *window = [self window];
    8697     NSWindow *hostWindow = [self hostWindow];
    8698     if (window)
    8699         return [window backingScaleFactor];
    8700     if (hostWindow)
    8701         return [hostWindow backingScaleFactor];
    8702     return [[NSScreen mainScreen] backingScaleFactor];
    8703 }
    8704 #endif
    8705 
    87068835+ (void)_setCacheModel:(WebCacheModel)cacheModel
    87078836{
    … …  
    89309059{
    89319060    return s_cacheModel;
    8932 }
    8933 
    8934 + (BOOL)_didSetCacheModel
    8935 {
    8936     return s_didSetCacheModel;
    8937 }
    8938 
    8939 + (WebCacheModel)_maxCacheModelInAnyInstance
    8940 {
    8941     WebCacheModel cacheModel = WebCacheModelDocumentViewer;
    8942     NSEnumerator *enumerator = [(NSMutableSet *)allWebViewsSet objectEnumerator];
    8943     while (WebPreferences *preferences = [[enumerator nextObject] preferences])
    8944         cacheModel = std::max(cacheModel, [preferences cacheModel]);
    8945     return cacheModel;
    8946 }
    8947 
    8948 + (void)_cacheModelChangedNotification:(NSNotification *)notification
    8949 {
    8950 #if PLATFORM(IOS)
    8951     // This needs to happen on the Web Thread
    8952     WebThreadRun(^{
    8953 #endif   
    8954     WebPreferences *preferences = (WebPreferences *)[notification object];
    8955     ASSERT([preferences isKindOfClass:[WebPreferences class]]);
    8956 
    8957     WebCacheModel cacheModel = [preferences cacheModel];
    8958     if (![self _didSetCacheModel] || cacheModel > [self _cacheModel])
    8959         [self _setCacheModel:cacheModel];
    8960     else if (cacheModel < [self _cacheModel])
    8961         [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
    8962 #if PLATFORM(IOS)
    8963     });
    8964 #endif
    8965 }
    8966 
    8967 + (void)_preferencesRemovedNotification:(NSNotification *)notification
    8968 {
    8969     WebPreferences *preferences = (WebPreferences *)[notification object];
    8970     ASSERT([preferences isKindOfClass:[WebPreferences class]]);
    8971 
    8972     if ([preferences cacheModel] == [self _cacheModel])
    8973         [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
    8974 }
    8975 
    8976 - (WebFrame *)_focusedFrame
    8977 {
    8978     NSResponder *resp = [[self window] firstResponder];
    8979     if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:[[self mainFrame] frameView]]) {
    8980         WebFrameView *frameView = containingFrameView((NSView *)resp);
    8981         ASSERT(frameView != nil);
    8982         return [frameView webFrame];
    8983     }
    8984    
    8985     return nil;
    8986 }
    8987 
    8988 - (BOOL)_isLoading
    8989 {
    8990     WebFrame *mainFrame = [self mainFrame];
    8991     return [[mainFrame _dataSource] isLoading]
    8992         || [[mainFrame provisionalDataSource] isLoading];
    8993 }
    8994 
    8995 - (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point
    8996 {
    8997     if (_private->closed)
    8998         return nil;
    8999 #if !PLATFORM(IOS)
    9000     NSView *view = [self hitTest:[[self superview] convertPoint:point fromView:nil]];
    9001 #else
    9002     //[WebView superview] on iOS is nil, don't do a convertPoint
    9003     NSView *view = [self hitTest:point];   
    9004 #endif
    9005     if (![view isDescendantOf:[[self mainFrame] frameView]])
    9006         return nil;
    9007     WebFrameView *frameView = containingFrameView(view);
    9008     ASSERT(frameView);
    9009     return frameView;
    9010 }
    9011 
    9012 + (void)_preflightSpellCheckerNow:(id)sender
    9013 {
    9014 #if !PLATFORM(IOS)
    9015     [[NSSpellChecker sharedSpellChecker] _preflightChosenSpellServer];
    9016 #endif
    9017 }
    9018 
    9019 + (void)_preflightSpellChecker
    9020 {
    9021 #if !PLATFORM(IOS)
    9022     // As AppKit does, we wish to delay tickling the shared spellchecker into existence on application launch.
    9023     if ([NSSpellChecker sharedSpellCheckerExists]) {
    9024         [self _preflightSpellCheckerNow:self];
    9025     } else {
    9026         [self performSelector:@selector(_preflightSpellCheckerNow:) withObject:self afterDelay:2.0];
    9027     }
    9028 #endif
    9029 }
    9030 
    9031 - (BOOL)_continuousCheckingAllowed
    9032 {
    9033     static BOOL allowContinuousSpellChecking = YES;
    9034     static BOOL readAllowContinuousSpellCheckingDefault = NO;
    9035     if (!readAllowContinuousSpellCheckingDefault) {
    9036         if ([[NSUserDefaults standardUserDefaults] objectForKey:@"NSAllowContinuousSpellChecking"]) {
    9037             allowContinuousSpellChecking = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSAllowContinuousSpellChecking"];
    9038         }
    9039         readAllowContinuousSpellCheckingDefault = YES;
    9040     }
    9041     return allowContinuousSpellChecking;
    9042 }
    9043 
    9044 - (NSResponder *)_responderForResponderOperations
    9045 {
    9046     NSResponder *responder = [[self window] firstResponder];
    9047     WebFrameView *mainFrameView = [[self mainFrame] frameView];
    9048    
    9049     // If the current responder is outside of the webview, use our main frameView or its
    9050     // document view. We also do this for subviews of self that are siblings of the main
    9051     // frameView since clients might insert non-webview-related views there (see 4552713).
    9052     if (responder != self && ![mainFrameView _web_firstResponderIsSelfOrDescendantView]) {
    9053         responder = [mainFrameView documentView];
    9054         if (!responder)
    9055             responder = mainFrameView;
    9056     }
    9057     return responder;
    90589061}
    90599062
    … …  
    1006410067}
    1006510068
     10069- (void)_closeWindow
     10070{
     10071    [[self _UIDelegateForwarder] webViewClose:self];
     10072}
     10073
    1006610074@end
    1006710075

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

    r234685 r236846  
    149149- (void)_windowVisibilityChanged:(NSNotification *)notification;
    150150
     151- (void)_closeWindow;
     152
    151153@end
    152154

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

    r231201 r236846  
    10861086- (void)webView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones;
    10871087
     1088#if TARGET_OS_IPHONE
     1089- (void)webThreadWebView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones;
     1090#endif
     1091
    10881092// For implementing the WebInspector's test harness
    10891093- (void)webView:(WebView *)webView didClearInspectorWindowObject:(WebScriptObject *)windowObject forFrame:(WebFrame *)frame;
Note: See TracChangeset for help on using the changeset viewer.