Remove some code only needed for versions of Safari that are no longer supported
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Jul 2014 17:33:32 +0000 (17:33 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Jul 2014 17:33:32 +0000 (17:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=134537

Reviewed by Anders Carlsson.

Source/WebCore:
* bindings/objc/DOMHTML.mm:
(-[DOMHTMLInputElement _rectOnScreen]): Deleted.
(-[DOMHTMLInputElement _replaceCharactersInRange:withString:selectingFromIndex:]): Deleted.
(-[DOMHTMLInputElement _selectedRange]): Deleted.
* bindings/objc/DOMPrivate.h:
* editing/EditorCommand.cpp:
(WebCore::createCommandMap):

Source/WebKit/mac:
* History/WebHistoryItem.mm:
* Misc/WebKitVersionChecks.h:
* WebCoreSupport/WebSecurityOrigin.mm:
(-[WebSecurityOrigin domain]): Deleted.
* WebInspector/WebInspector.mm:
(-[WebInspector showTimeline:]): Deleted.
(+[WebInspector webInspector]): Deleted.
(-[WebInspector setWebFrame:]): Deleted.
(-[WebInspector window]): Deleted.
(-[WebInspector showWindow:]): Deleted.
* WebView/WebFrame.mm:
(-[WebFrame reload]):
* WebView/WebPDFView.mm:
(-[WebPDFView menuForEvent:]):
(-[WebPDFView _anyPDFTagsFoundInMenu:]): Deleted.
* WebView/WebView.mm:
(-[WebView _initWithFrame:frameName:groupName:]):
(-[WebView _preferencesChanged:]):
(-[WebView initWithFrame:frameName:groupName:]):
(-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]): Deleted.
(+[WebView _setAlwaysUseATSU:]): Deleted.
(-[WebView _needsUnrestrictedGetMatchedCSSRules]): Deleted.
* WebView/WebViewPrivate.h:

Source/WTF:
* wtf/Assertions.cpp:
* wtf/Assertions.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/Assertions.cpp
Source/WTF/wtf/Assertions.h
Source/WebCore/ChangeLog
Source/WebCore/bindings/objc/DOMHTML.mm
Source/WebCore/bindings/objc/DOMPrivate.h
Source/WebCore/editing/EditorCommand.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/History/WebHistoryItem.mm
Source/WebKit/mac/Misc/WebKitVersionChecks.h
Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
Source/WebKit/mac/WebInspector/WebInspector.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebPDFView.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewPrivate.h

index 6b0df6c..acb7584 100644 (file)
@@ -1,3 +1,13 @@
+2014-07-02  Dan Bernstein  <mitz@apple.com>
+
+        Remove some code only needed for versions of Safari that are no longer supported
+        https://bugs.webkit.org/show_bug.cgi?id=134537
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/Assertions.cpp:
+        * wtf/Assertions.h:
+
 2014-07-01  Alex Christensen  <achristensen@webkit.org>
 
         Reduce dynamic memory allocation in css jit.
index 1f205ce..341bd01 100644 (file)
@@ -320,10 +320,6 @@ void WTFSetCrashHook(WTFCrashHookFunction function)
     globalHook = function;
 }
 
-void WTFInvokeCrashHook()
-{
-}
-
 void WTFCrash()
 {
     if (globalHook)
index a9bfd12..7f3fc67 100644 (file)
@@ -145,8 +145,6 @@ typedef void (*WTFCrashHookFunction)();
 WTF_EXPORT_PRIVATE void WTFSetCrashHook(WTFCrashHookFunction);
 WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook();
 
-// Exist for binary compatibility with older Safari. Do not use.
-WTF_EXPORT_PRIVATE void WTFInvokeCrashHook();
 #ifdef __cplusplus
 }
 #endif
index a3fc8fd..c285ced 100644 (file)
@@ -1,3 +1,18 @@
+2014-07-02  Dan Bernstein  <mitz@apple.com>
+
+        Remove some code only needed for versions of Safari that are no longer supported
+        https://bugs.webkit.org/show_bug.cgi?id=134537
+
+        Reviewed by Anders Carlsson.
+
+        * bindings/objc/DOMHTML.mm:
+        (-[DOMHTMLInputElement _rectOnScreen]): Deleted.
+        (-[DOMHTMLInputElement _replaceCharactersInRange:withString:selectingFromIndex:]): Deleted.
+        (-[DOMHTMLInputElement _selectedRange]): Deleted.
+        * bindings/objc/DOMPrivate.h:
+        * editing/EditorCommand.cpp:
+        (WebCore::createCommandMap):
+
 2014-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GStreamer] MediaPlayerPrivateGStreamer.cpp fails to build when VIDEO_TRACK is enabled and using GSTREAMER_MPEGTS
index 64339cd..0129184 100644 (file)
@@ -175,7 +175,6 @@ using namespace WebCore;
 
 @end
 
-
 @implementation DOMHTMLInputElement (FormAutoFillTransition)
 
 - (BOOL)_isTextField
@@ -183,46 +182,7 @@ using namespace WebCore;
     return core(self)->isTextField();
 }
 
-#if !PLATFORM(IOS)
-- (NSRect)_rectOnScreen
-{
-    // Returns bounding rect of text field, in screen coordinates.
-    NSRect result = [self boundingBox];
-    if (!core(self)->document().view())
-        return result;
-
-    NSView* view = core(self)->document().view()->documentView();
-    result = [view convertRect:result toView:nil];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    result.origin = [[view window] convertBaseToScreen:result.origin];
-#pragma clang diagnostic pop
-    return result;
-}
-#endif
-
-- (void)_replaceCharactersInRange:(NSRange)targetRange withString:(NSString *)replacementString selectingFromIndex:(int)index
-{
-    WebCore::HTMLInputElement* inputElement = core(self);
-    if (inputElement) {
-        WTF::String newValue = inputElement->value();
-        newValue.replace(targetRange.location, targetRange.length, replacementString);
-        inputElement->setValue(newValue);
-        inputElement->setSelectionRange(index, newValue.length());
-    }
-}
-
-- (NSRange)_selectedRange
-{
-    WebCore::HTMLInputElement* inputElement = core(self);
-    if (inputElement) {
-        int start = inputElement->selectionStart();
-        int end = inputElement->selectionEnd();
-        return NSMakeRange(start, end - start); 
-    }
-    return NSMakeRange(NSNotFound, 0);
-}
-
+#if PLATFORM(IOS)
 - (BOOL)_isAutofilled
 {
     return core(self)->isAutofilled();
@@ -235,6 +195,7 @@ using namespace WebCore;
     // changes the background color.
     core(self)->setAutofilled(filled);
 }
+#endif // PLATFORM(IOS)
 
 @end
 
@@ -258,6 +219,8 @@ using namespace WebCore;
 
 @end
 
+#if PLATFORM(IOS)
+
 @implementation DOMHTMLInputElement (FormPromptAdditions)
 
 - (BOOL)_isEdited
@@ -276,7 +239,6 @@ using namespace WebCore;
 
 @end
 
-#if PLATFORM(IOS)
 @implementation DOMHTMLInputElement (AutocapitalizeAdditions)
 
 - (WebAutocapitalizeType)_autocapitalizeType
index e0dbc5c..ad9b449 100644 (file)
 // Each one should eventually be replaced by public DOM API, and when that happens Safari will switch to implementations 
 // using that public API, and these will be deleted.
 @interface DOMHTMLInputElement (FormAutoFillTransition)
-- (BOOL)_isAutofilled;
 - (BOOL)_isTextField;
-#if !TARGET_OS_IPHONE
-- (NSRect)_rectOnScreen; // bounding box of the text field, in screen coordinates
-#endif
-- (void)_replaceCharactersInRange:(NSRange)targetRange withString:(NSString *)replacementString selectingFromIndex:(int)index;
-- (NSRange)_selectedRange;
+#if TARGET_OS_IPHONE
+- (BOOL)_isAutofilled;
 - (void)_setAutofilled:(BOOL)filled;
+#endif
 @end
 
+#if TARGET_OS_IPHONE
 // These changes are necessary to detect whether a form input was modified by a user
 // or javascript
 @interface DOMHTMLInputElement (FormPromptAdditions)
 @interface DOMHTMLTextAreaElement (FormPromptAdditions)
 - (BOOL)_isEdited;
 @end
+#endif // TARGET_OS_IPHONE
 
 // All the methods in this category are used by Safari forms autofill and should not be used for any other purpose.
 // They are stopgap measures until we finish transitioning form controls to not use NSView. Each one should become
index 2fa8b82..3aa4522 100644 (file)
@@ -1491,7 +1491,6 @@ static const CommandMap& createCommandMap()
         { "AlignLeft", { executeJustifyLeft, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "AlignRight", { executeJustifyRight, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "BackColor", { executeBackColor, supported, enabledInRichlyEditableText, stateNone, valueBackColor, notTextInsertion, doNotAllowExecutionWhenDisabled } },
-        { "BackwardDelete", { executeDeleteBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, // FIXME: remove BackwardDelete when Safari for Windows stops using it.
         { "Bold", { executeToggleBold, supported, enabledInRichlyEditableText, stateBold, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "Copy", { executeCopy, supportedCopyCut, enabledCopy, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
         { "CreateLink", { executeCreateLink, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
index 47d8f85..edccc6a 100644 (file)
@@ -1,3 +1,34 @@
+2014-07-02  Dan Bernstein  <mitz@apple.com>
+
+        Remove some code only needed for versions of Safari that are no longer supported
+        https://bugs.webkit.org/show_bug.cgi?id=134537
+
+        Reviewed by Anders Carlsson.
+
+        * History/WebHistoryItem.mm:
+        * Misc/WebKitVersionChecks.h:
+        * WebCoreSupport/WebSecurityOrigin.mm:
+        (-[WebSecurityOrigin domain]): Deleted.
+        * WebInspector/WebInspector.mm:
+        (-[WebInspector showTimeline:]): Deleted.
+        (+[WebInspector webInspector]): Deleted.
+        (-[WebInspector setWebFrame:]): Deleted.
+        (-[WebInspector window]): Deleted.
+        (-[WebInspector showWindow:]): Deleted.
+        * WebView/WebFrame.mm:
+        (-[WebFrame reload]):
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView menuForEvent:]):
+        (-[WebPDFView _anyPDFTagsFoundInMenu:]): Deleted.
+        * WebView/WebView.mm:
+        (-[WebView _initWithFrame:frameName:groupName:]):
+        (-[WebView _preferencesChanged:]):
+        (-[WebView initWithFrame:frameName:groupName:]):
+        (-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]): Deleted.
+        (+[WebView _setAlwaysUseATSU:]): Deleted.
+        (-[WebView _needsUnrestrictedGetMatchedCSSRules]): Deleted.
+        * WebView/WebViewPrivate.h:
+
 2014-07-01  Dan Bernstein  <mitz@apple.com>
 
         Remove WebChromeClient code that was only needed for Safari versions earlier than 3.1
index 35cbd01..900aaa4 100644 (file)
@@ -547,11 +547,6 @@ WebHistoryItem *kit(HistoryItem* item)
     return result;
 }
 
-- (void)setAlwaysAttemptToUsePageCache:(BOOL)flag
-{
-    // Safari 2.0 uses this for SnapBack, so we stub it out to avoid a crash.
-}
-
 - (NSURL *)URL
 {
     ASSERT_MAIN_THREAD();
index 91e9192..436c584 100644 (file)
 #define WEBKIT_FIRST_VERSION_WITH_IE_COMPATIBLE_KEYBOARD_EVENT_DISPATCH 0x020D0100 // 525.1.0
 #define WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES 0x020E0000 // 526.0.0
 #define WEBKIT_FIRST_VERSION_WITH_MORE_STRICT_LOCAL_RESOURCE_SECURITY_RESTRICTION 0x02100200 // 528.2.0
-#define WEBKIT_FIRST_VERSION_WITH_RELOAD_FROM_ORIGIN 0x02100700 // 528.7.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_WEBVIEW_INIT_THREAD_WORKAROUND 0x02100700 // 528.7.0
 #define WEBKIT_FIRST_VERSION_WITH_ROUND_TWO_MAIN_THREAD_EXCEPTIONS 0x02120400 // 530.4.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_BUMPERCAR_BACK_FORWARD_QUIRK 0x02120700 // 530.7.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS 0x02120A00 // 530.10.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK 0x02130200 // 531.2.0
 #define WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER 0x02160900 // 534.9.0
-#define WEBKIT_FIRST_VERSION_WITH_GET_MATCHED_CSS_RULES_RESTRICTIONS 0x02160B00 // 534.11.0
 #define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 0x02170D00 // 535.13.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 0x02190100 // 537.1.0
 #else
index 4d4467f..f6dfcbf 100644 (file)
@@ -78,12 +78,6 @@ using namespace WebCore;
     return reinterpret_cast<SecurityOrigin*>(_private)->toString();
 }
 
-// Deprecated. Use host instead. This needs to stay here until we ship a new Safari.
-- (NSString *)domain
-{
-    return [self host];
-}
-
 - (unsigned short)port
 {
     return reinterpret_cast<SecurityOrigin*>(_private)->port();
index b1cd816..f1ecc62 100644 (file)
@@ -80,11 +80,6 @@ NSString *WebInspectorDidStopSearchingForNode = @"WebInspectorDidStopSearchingFo
     [_frontend showConsole];
 }
 
-- (void)showTimeline:(id)sender
-{
-    // Not used anymore. Remove when a release of Safari non-longer calls this.
-}
-
 - (BOOL)isDebuggingJavaScript
 {
     return _frontend && [_frontend isDebuggingEnabled];
@@ -199,55 +194,3 @@ NSString *WebInspectorDidStopSearchingForNode = @"WebInspectorDidStopSearchingFo
     _frontend = 0;
 }
 @end
-
-@implementation WebInspector (Obsolete)
-+ (WebInspector *)webInspector
-{
-    // Safari 3.0 calls this method
-    static BOOL logged = NO;
-    if (!logged) {
-        NSLog(@"+[WebInspector webInspector]: this method is obsolete.");
-        logged = YES;
-    }
-
-    return [[[WebInspector alloc] init] autorelease];
-}
-
-- (void)setWebFrame:(WebFrame *)frame
-{
-    // Safari 3.0 calls this method
-    static BOOL logged = NO;
-    if (!logged) {
-        NSLog(@"-[WebInspector setWebFrame:]: this method is obsolete.");
-        logged = YES;
-    }
-
-    _webView = [frame webView];
-}
-
-#if !PLATFORM(IOS)
-- (NSWindow *)window
-{
-    // Shiira calls this internal method, return nil since we can't easily return the window
-    static BOOL logged = NO;
-    if (!logged) {
-        NSLog(@"-[WebInspector window]: this method is obsolete and now returns nil.");
-        logged = YES;
-    }
-
-    return nil;
-}
-#endif
-
-- (void)showWindow:(id)sender
-{
-    // Safari 3.0 calls this method
-    static BOOL logged = NO;
-    if (!logged) {
-        NSLog(@"-[WebInspector showWindow:]: this method is obsolete.");
-        logged = YES;
-    }
-
-    [self showWindow];
-}
-@end
index de7fed6..b781caa 100644 (file)
@@ -2587,12 +2587,7 @@ static NSURL *createUniqueWebDataURL()
 
 - (void)reload
 {
-#if !PLATFORM(IOS)
-    if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_RELOAD_FROM_ORIGIN) && applicationIsSafari())
-        _private->coreFrame->loader().reload(GetCurrentKeyModifiers() & shiftKey);
-    else
-#endif
-        _private->coreFrame->loader().reload(false);
+    _private->coreFrame->loader().reload(false);
 }
 
 - (void)reloadFromOrigin
index b1b23ed..02fb161 100644 (file)
@@ -94,7 +94,6 @@ extern "C" NSString *_NSPathForSystemFramework(NSString *framework);
 @interface WebPDFView (FileInternal)
 + (Class)_PDFPreviewViewClass;
 + (Class)_PDFViewClass;
-- (BOOL)_anyPDFTagsFoundInMenu:(NSMenu *)menu;
 - (void)_applyPDFDefaults;
 - (BOOL)_canLookUpInDictionary;
 - (NSClipView *)_clipViewForPDFDocumentView;
@@ -450,33 +449,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
     // pass the items off to the WebKit context menu mechanism
     WebView *webView = [[dataSource webFrame] webView];
     ASSERT(webView);
-    NSMenu *menu = [webView _menuForElement:[self elementAtPoint:[self convertPoint:[theEvent locationInWindow] fromView:nil]] defaultItems:items];
-    
-    // The delegate has now had the opportunity to add items to the standard PDF-related items, or to
-    // remove or modify some of the PDF-related items. In 10.4, the PDF context menu did not go through 
-    // the standard WebKit delegate path, and so the standard PDF-related items always appeared. For
-    // clients that create their own context menu by hand-picking specific items from the default list, such as
-    // Safari, none of the PDF-related items will appear until the client is rewritten to explicitly
-    // include these items. For backwards compatibility of tip-of-tree WebKit with the 10.4 version of Safari
-    // (the configuration that people building open source WebKit use), we'll use the entire set of PDFKit-supplied
-    // menu items. This backward-compatibility hack won't work with any non-Safari clients, but this seems OK since
-    // (1) the symptom is fairly minor, and (2) we suspect that non-Safari clients are probably using the entire
-    // set of default items, rather than manually choosing from them. We can remove this code entirely when we
-    // ship a version of Safari that includes the fix for radar 3796579.
-    if (![self _anyPDFTagsFoundInMenu:menu] && applicationIsSafari()) {
-        [menu addItem:[NSMenuItem separatorItem]];
-        NSEnumerator *e = [items objectEnumerator];
-        NSMenuItem *menuItem;
-        while ((menuItem = [e nextObject]) != nil) {
-            // copy menuItem since a given menuItem can be in only one menu at a time, and we don't
-            // want to mess with the menu returned from PDFKit.
-            NSMenuItem *menuItemCopy = [menuItem copy];
-            [menu addItem:menuItemCopy];
-            [menuItemCopy release];
-        }
-    }
-    
-    return menu;
+    return [webView _menuForElement:[self elementAtPoint:[self convertPoint:[theEvent locationInWindow] fromView:nil]] defaultItems:items];
 }
 
 - (void)setNextKeyView:(NSView *)aView
@@ -1115,30 +1088,6 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
     return PDFViewClass;
 }
 
-- (BOOL)_anyPDFTagsFoundInMenu:(NSMenu *)menu
-{
-    NSEnumerator *e = [[menu itemArray] objectEnumerator];
-    NSMenuItem *item;
-    while ((item = [e nextObject]) != nil) {
-        switch ([item tag]) {
-            case WebMenuItemTagOpenWithDefaultApplication:
-            case WebMenuItemPDFActualSize:
-            case WebMenuItemPDFZoomIn:
-            case WebMenuItemPDFZoomOut:
-            case WebMenuItemPDFAutoSize:
-            case WebMenuItemPDFSinglePage:
-            case WebMenuItemPDFSinglePageScrolling:
-            case WebMenuItemPDFFacingPages:
-            case WebMenuItemPDFFacingPagesScrolling:
-            case WebMenuItemPDFContinuous:
-            case WebMenuItemPDFNextPage:
-            case WebMenuItemPDFPreviousPage:
-                return YES;
-        }
-    }
-    return NO;
-}
-
 - (void)_applyPDFDefaults
 {
     // Set up default viewing params
index 35282d9..1e50472 100644 (file)
@@ -1056,12 +1056,8 @@ static void WebKitInitializeGamepadProviderIfNecessary()
 #endif
 }
 
-- (id)_initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews
+- (id)_initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName
 {
-    // FIXME: Remove the usesDocumentViews parameter; it's only here for compatibility with WebKit nightly builds
-    // running against Safari 5 on Leopard.
-    ASSERT(usesDocumentViews);
-
     self = [super initWithFrame:f];
     if (!self)
         return nil;
@@ -1466,13 +1462,6 @@ static NSMutableSet *knownPluginMIMETypes()
     return NO;
 }
 
-#if !PLATFORM(IOS)
-+ (void)_setAlwaysUseATSU:(BOOL)f
-{
-    [self _setAlwaysUsesComplexTextCodePath:f];
-}
-#endif
-
 + (void)_setAlwaysUsesComplexTextCodePath:(BOOL)f
 {
     Font::setCodePath(f ? Font::Complex : Font::Auto);
@@ -2136,17 +2125,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
 #endif
 }
 
-- (BOOL)_needsUnrestrictedGetMatchedCSSRules
-{
-#if !PLATFORM(IOS)
-    static bool needsUnrestrictedGetMatchedCSSRules = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_GET_MATCHED_CSS_RULES_RESTRICTIONS) && applicationIsSafari();
-    return needsUnrestrictedGetMatchedCSSRules;
-#else
-    // FIXME: <rdar://problem/8963684> Implement linked-on-or-after check for needsUnrestrictedGetMatchedCSSRules
-    return NO;
-#endif
-}
-
 - (void)_preferencesChangedNotification:(NSNotification *)notification
 {
 #if PLATFORM(IOS)
@@ -2291,7 +2269,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings.setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
     settings.setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
     settings.setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
-    settings.setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
     settings.setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
     settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
 
@@ -5013,7 +4990,7 @@ static bool needsWebViewInitThreadWorkaround()
 #endif
 
     WebCoreThreadViolationCheckRoundTwo();
-    return [self _initWithFrame:f frameName:frameName groupName:groupName usesDocumentViews:YES];
+    return [self _initWithFrame:f frameName:frameName groupName:groupName];
 }
 
 #if !PLATFORM(IOS)
index ace6c9d..a8fc8ba 100644 (file)
@@ -509,10 +509,6 @@ Could be worth adding to the API.
 + (NSString *)_decodeData:(NSData *)data;
 
 + (void)_setAlwaysUsesComplexTextCodePath:(BOOL)f;
-#if !TARGET_OS_IPHONE
-// This is the old name of the above method. Needed for Safari versions that call it.
-+ (void)_setAlwaysUseATSU:(BOOL)f;
-#endif
 
 + (void)_setAllowsRoundingHacks:(BOOL)allowsRoundingHacks;
 + (BOOL)_allowsRoundingHacks;