Changeset 147447 in webkit


Ignore:
Timestamp:
Apr 2, 2013, 10:35:33 AM (12 years ago)
Author:
rniwa@webkit.org
Message:

WebKit/mac shouldn't have code for Mac 10.5 and earlier
​https://bugs.webkit.org/show_bug.cgi?id=113746

Reviewed by Darin Adler.

Deleted the code for 10.5 and removed if-defs for 10.6.

  • Plugins/Hosted/WebHostedNetscapePluginView.mm:

(-[WebHostedNetscapePluginView createPlugin]):

  • Plugins/WebBaseNetscapePluginView.mm:

(-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):

  • Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView createPlugin]):
(-[WebNetscapePluginView getVariable:forURL:value:length:]):
(-[WebNetscapePluginView _workaroundSilverlightFullscreenBug:]):

  • WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::selectItemWritingDirectionIsNatural):
(WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):

  • WebCoreSupport/WebEditorClient.mm:

(core):
(WebEditorClient::checkTextOfParagraph):
(WebEditorClient::requestCheckingOfString):

  • WebView/WebDynamicScrollBarsView.mm:

(-[WebDynamicScrollBarsView reflectScrolledClipView:]):

  • WebView/WebFullScreenController.mm:

(-[WebFullScreenController _updateMenuAndDockForFullScreen]):

  • WebView/WebHTMLView.mm:

(-[WebHTMLView _documentFragmentFromPasteboard:inContext:allowPlainText:]):
(-[WebHTMLView _frameOrBoundsChanged]):
(+[WebHTMLView _insertablePasteboardTypes]):
(-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]):
(-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]):
(writingDirectionKeyBindingsEnabled):
(-[WebHTMLView _lookUpInDictionaryFromMenu:]):
(-[WebHTMLView attachRootLayer:]):

  • WebView/WebHTMLViewInternal.h:
  • WebView/WebPDFDocumentExtras.mm:
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

  • WebView/WebResourceInternal.h:
  • WebView/WebScriptDebugDelegate.h:
  • WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _preferencesChanged:]):
(+[WebView initialize]):
(clientNeedsWebViewInitThreadWorkaround):
(-[WebView validateUserInterfaceItemWithoutDelegate:]):
(-[WebView setGrammarCheckingEnabled:]):
(-[WebView isAutomaticQuoteSubstitutionEnabled]):
(-[WebView isAutomaticLinkDetectionEnabled]):
(-[WebView isAutomaticDashSubstitutionEnabled]):
(-[WebView isAutomaticTextReplacementEnabled]):
(-[WebView isAutomaticSpellingCorrectionEnabled]):
(-[WebView _searchWithSpotlightFromMenu:]):
(WebInstallMemoryPressureHandler):

  • WebView/WebViewPrivate.h:
Location:
trunk/Source/WebKit/mac
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/mac/ChangeLog

    r147363 r147447  
     12013-04-01  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        WebKit/mac shouldn't have code for Mac 10.5 and earlier
     4        https://bugs.webkit.org/show_bug.cgi?id=113746
     5
     6        Reviewed by Darin Adler.
     7
     8        Deleted the code for 10.5 and removed if-defs for 10.6.
     9
     10        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
     11        (-[WebHostedNetscapePluginView createPlugin]):
     12        * Plugins/WebBaseNetscapePluginView.mm:
     13        (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):
     14        * Plugins/WebNetscapePluginView.mm:
     15        (-[WebNetscapePluginView createPlugin]):
     16        (-[WebNetscapePluginView getVariable:forURL:value:length:]):
     17        (-[WebNetscapePluginView _workaroundSilverlightFullscreenBug:]):
     18        * WebCoreSupport/WebChromeClient.mm:
     19        (WebChromeClient::selectItemWritingDirectionIsNatural):
     20        (WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection):
     21        * WebCoreSupport/WebEditorClient.mm:
     22        (core):
     23        (WebEditorClient::checkTextOfParagraph):
     24        (WebEditorClient::requestCheckingOfString):
     25        * WebView/WebDynamicScrollBarsView.mm:
     26        (-[WebDynamicScrollBarsView reflectScrolledClipView:]):
     27        * WebView/WebFullScreenController.mm:
     28        (-[WebFullScreenController _updateMenuAndDockForFullScreen]):
     29        * WebView/WebHTMLView.mm:
     30        (-[WebHTMLView _documentFragmentFromPasteboard:inContext:allowPlainText:]):
     31        (-[WebHTMLView _frameOrBoundsChanged]):
     32        (+[WebHTMLView _insertablePasteboardTypes]):
     33        (-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]):
     34        (-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]):
     35        (writingDirectionKeyBindingsEnabled):
     36        (-[WebHTMLView _lookUpInDictionaryFromMenu:]):
     37        (-[WebHTMLView attachRootLayer:]):
     38        * WebView/WebHTMLViewInternal.h:
     39        * WebView/WebPDFDocumentExtras.mm:
     40        * WebView/WebPreferences.mm:
     41        (+[WebPreferences initialize]):
     42        * WebView/WebResourceInternal.h:
     43        * WebView/WebScriptDebugDelegate.h:
     44        * WebView/WebView.mm:
     45        (-[WebView _commonInitializationWithFrameName:groupName:]):
     46        (-[WebView _preferencesChanged:]):
     47        (+[WebView initialize]):
     48        (clientNeedsWebViewInitThreadWorkaround):
     49        (-[WebView validateUserInterfaceItemWithoutDelegate:]):
     50        (-[WebView setGrammarCheckingEnabled:]):
     51        (-[WebView isAutomaticQuoteSubstitutionEnabled]):
     52        (-[WebView isAutomaticLinkDetectionEnabled]):
     53        (-[WebView isAutomaticDashSubstitutionEnabled]):
     54        (-[WebView isAutomaticTextReplacementEnabled]):
     55        (-[WebView isAutomaticSpellingCorrectionEnabled]):
     56        (-[WebView _searchWithSpotlightFromMenu:]):
     57        (WebInstallMemoryPressureHandler):
     58        * WebView/WebViewPrivate.h:
     59
    1602013-04-01  Tim Horton  <timothy_horton@apple.com>
    261

  • trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r122400 r147447  
    126126        if (accleratedCompositingEnabled && _proxy->rendererType() == UseAcceleratedCompositing) {
    127127            // FIXME: This code can be shared between WebHostedNetscapePluginView and WebNetscapePluginView.
    128 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    129128            // Since this layer isn't going to be inserted into a view, we need to create another layer and flip its geometry
    130129            // in order to get the coordinate system right.
    … …  
    137136            realPluginLayer.get().autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
    138137            [_pluginLayer.get() addSublayer:realPluginLayer.get()];
    139 #endif
    140138           
    141139            // Eagerly enter compositing mode, since we know we'll need it. This avoids firing setNeedsStyleRecalc()

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

    r122400 r147447  
    102102    _baseURL.adoptNS([baseURL copy]);
    103103    _MIMEType.adoptNS([MIME copy]);
    104    
    105 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
     104
    106105    // Enable "kiosk mode" when instantiating the QT plug-in inside of Dashboard. See <rdar://problem/6878105>
    107106    if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.dashboard.client"] &&
    … …  
    114113        [self setAttributeKeys:mutableKeys.get() andValues:mutableValues.get()];
    115114    } else
    116 #endif
    117115         [self setAttributeKeys:keys andValues:values];
    118116

  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

    r145453 r147447  
    11001100            if (accleratedCompositingEnabled) {
    11011101                // FIXME: This code can be shared between WebHostedNetscapePluginView and WebNetscapePluginView.
    1102 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    11031102                // Since this layer isn't going to be inserted into a view, we need to create another layer and flip its geometry
    11041103                // in order to get the coordinate system right.
    … …  
    11111110                realPluginLayer.get().autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
    11121111                [_pluginLayer.get() addSublayer:realPluginLayer.get()];
    1113 #endif
     1112
    11141113                // Eagerly enter compositing mode, since we know we'll need it. This avoids firing setNeedsStyleRecalc()
    11151114                // for iframes that contain composited plugins at bad times. https://bugs.webkit.org/show_bug.cgi?id=39033
    … …  
    22322231        }
    22332232        case NPNURLVProxy: {
    2234 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    22352233            if (!value)
    22362234                break;
    … …  
    22502248           
    22512249            return NPERR_NO_ERROR;
    2252 #else
    2253             break;
    2254 #endif
    22552250        }
    22562251    }
    … …  
    23422337- (void)_workaroundSilverlightFullscreenBug:(BOOL)initializedPlugin
    23432338{
    2344 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    23452339    ASSERT(_isSilverlight);
    23462340    NPBool isFullscreenPerformanceIssueFixed = 0;
    … …  
    23652359            CGLReleasePixelFormat(pixelFormatObject);
    23662360    }
    2367 #endif
    23682361}
    23692362

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

    r145170 r147447  
    840840bool WebChromeClient::selectItemWritingDirectionIsNatural()
    841841{
    842 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    843842    return false;
    844 #else
     843}
     844
     845bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
     846{
    845847    return true;
    846 #endif
    847 }
    848 
    849 bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
    850 {
    851 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    852     return true;
    853 #else
    854     return false;
    855 #endif
    856848}
    857849

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

    r145849 r147447  
    793793}
    794794
    795 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    796795static Vector<TextCheckingResult> core(NSArray *incomingResults, TextCheckingTypeMask checkingTypes)
    797796{
    … …  
    872871    return results;
    873872}
    874 #endif
    875873
    876874void WebEditorClient::checkTextOfParagraph(const UChar* text, int length, TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results)
    877875{
    878 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    879876    NSString *textString = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(text) length:length freeWhenDone:NO];
    880877    NSArray *incomingResults = [[NSSpellChecker sharedSpellChecker] checkString:textString range:NSMakeRange(0, [textString length]) types:(checkingTypes|NSTextCheckingTypeOrthography) options:nil inSpellDocumentWithTag:spellCheckerDocumentTag() orthography:NULL wordCount:NULL];
    881878    [textString release];
    882879    results = core(incomingResults, checkingTypes);
    883 #endif
    884880}
    885881
    … …  
    949945}
    950946
    951 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    952947@interface WebEditorSpellCheckResponder : NSObject
    953948{
    … …  
    978973
    979974@end
    980 #endif
    981975
    982976void WebEditorClient::didCheckSucceed(int sequence, NSArray* results)
    … …  
    989983void WebEditorClient::requestCheckingOfString(PassRefPtr<WebCore::TextCheckingRequest> request)
    990984{
    991 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    992985    ASSERT(!m_textCheckingRequest);
    993986    m_textCheckingRequest = request;
    … …  
    1002995                                argument:nil order:0 modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
    1003996        }];
    1004 #endif
    1005 }
     997}

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

    r133225 r147447  
    442442    // This call updates the initial position correctly.
    443443    [self adjustForScrollOriginChange];
    444 
    445 #if USE(ACCELERATED_COMPOSITING) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    446     NSView *documentView = [self documentView];
    447     if ([documentView isKindOfClass:[WebHTMLView class]]) {
    448         WebHTMLView *htmlView = (WebHTMLView *)documentView;
    449         if ([htmlView _isUsingAcceleratedCompositing])
    450             [htmlView _updateLayerHostingViewPosition];
    451     }
    452 #endif
    453444}
    454445

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

    r145414 r147447  
    424424- (void)_updateMenuAndDockForFullScreen
    425425{
    426     // NSApplicationPresentationOptions is available on > 10.6 only:
    427 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    428426    NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
    429427    NSScreen* fullscreenScreen = [[self window] screen];
    … …  
    445443        [NSApp setPresentationOptions:options];
    446444    else
    447 #endif
    448445        SetSystemUIMode(_isFullScreen ? kUIModeAllHidden : kUIModeNormal, 0);
    449446}

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

    r146961 r147447  
    289289- (void)_propagateDirtyRectsToOpaqueAncestors;
    290290- (void)_windowChangedKeyState;
    291 #if USE(ACCELERATED_COMPOSITING) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    292 - (void)_updateLayerGeometryFromView;
    293 #endif
    294291@end
    295292
    … …  
    415412@end
    416413
    417 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    418 
    419414@interface WebHTMLView (WebHTMLViewTextCheckingInternal)
    420415- (void)orderFrontSubstitutionsPanel:(id)sender;
    … …  
    439434@end
    440435
    441 #endif
    442 
    443436@interface WebHTMLView (WebForwardDeclaration) // FIXME: Put this in a normal category and stop doing the forward declaration trick.
    444437- (void)_setPrinting:(BOOL)printing minimumPageLogicalWidth:(float)minPageWidth logicalHeight:(float)minPageHeight originalPageWidth:(float)pageLogicalWidth originalPageHeight:(float)pageLogicalHeight maximumShrinkRatio:(float)maximumShrinkRatio adjustViewSize:(BOOL)adjustViewSize paginateScreenContent:(BOOL)paginateScreenContent;
    … …  
    798791        return fragment;
    799792
    800 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    801     if ([types containsObject:NSPICTPboardType] &&
    802         (fragment = [self _documentFragmentFromPasteboard:pasteboard
    803                                                   forType:NSPICTPboardType
    804                                                 inContext:context
    805                                              subresources:0]))
    806         return fragment;
    807 #endif
    808 
    809     // Only 10.5 and higher support setting and retrieving pasteboard types with UTIs, but we don't believe
    810     // that any applications on Tiger put types for which we only have a UTI, like PNG, on the pasteboard.
    811793    if ([types containsObject:(NSString*)kUTTypePNG] &&
    812794        (fragment = [self _documentFragmentFromPasteboard:pasteboard
    … …  
    12351217    }
    12361218    _private->lastScrollPosition = origin;
    1237 
    1238 #if USE(ACCELERATED_COMPOSITING) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    1239     [self _updateLayerHostingViewPosition];
    1240 #endif
    12411219}
    12421220
    … …  
    16621640    if (!types) {
    16631641        types = [[NSArray alloc] initWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
    1664 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    1665             NSPICTPboardType,
    1666 #endif
    16671642            NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil];
    16681643        CFRetain(types);
    … …  
    20512026        return fragment;
    20522027    }
    2053 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    2054     if (pboardType == NSPICTPboardType) {
    2055         WebResource *resource = [[WebResource alloc] initWithData:[pasteboard dataForType:NSPICTPboardType]
    2056                                                               URL:uniqueURLWithRelativePart(@"image.pict")
    2057                                                          MIMEType:@"image/pict"
    2058                                                  textEncodingName:nil
    2059                                                         frameName:nil];
    2060         DOMDocumentFragment *fragment = [[self _dataSource] _documentFragmentWithImageResource:resource];
    2061         [resource release];
    2062         return fragment;
    2063     }
    2064 #endif
    2065     // Only 10.5 and higher support setting and retrieving pasteboard types with UTIs, but we don't believe
    2066     // that any applications on Tiger put types for which we only have a UTI, like PNG, on the pasteboard.
     2028
    20672029    if ([pboardType isEqualToString:(NSString*)kUTTypePNG]) {
    20682030        WebResource *resource = [[WebResource alloc] initWithData:[pasteboard dataForType:(NSString*)kUTTypePNG]
    … …  
    27042666    }
    27052667
    2706 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    27072668    if (action == @selector(orderFrontSubstitutionsPanel:)) {
    27082669        NSMenuItem *menuItem = (NSMenuItem *)item;
    … …  
    27542715        return [self _canEdit];
    27552716    }
    2756 #endif
    2757    
     2717
    27582718    Editor::Command command = [self coreCommandBySelector:action];
    27592719    if (command.isSupported()) {
    … …  
    49024862static BOOL writingDirectionKeyBindingsEnabled()
    49034863{
    4904 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    49054864    return YES;
    4906 #else
    4907     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    4908     return [defaults boolForKey:@"NSAllowsBaseWritingDirectionKeyBindings"] || [defaults boolForKey:@"AppleTextDirection"];
    4909 #endif
    49104865}
    49114866
    … …  
    49394894    [self _changeBaseWritingDirectionTo:NSWritingDirectionRightToLeft];
    49404895}
    4941 
    4942 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    4943 - (void)changeBaseWritingDirectionToLTR:(id)sender
    4944 {
    4945     [self makeBaseWritingDirectionLeftToRight:sender];
    4946 }
    4947 
    4948 - (void)changeBaseWritingDirectionToRTL:(id)sender
    4949 {
    4950     [self makeBaseWritingDirectionRightToLeft:sender];
    4951 }
    4952 #endif
    49534896
    49544897- (void)makeBaseWritingDirectionNatural:(id)sender
    … …  
    51395082}
    51405083
    5141 
    5142 static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
    5143 {
    5144     NSArray *screens = [NSScreen screens];
    5145    
    5146     if ([screens count] == 0) {
    5147         // You could theoretically get here if running with no monitor, in which case it doesn't matter
    5148         // much where the "on-screen" point is.
    5149         return CGPointMake(point.x, point.y);
    5150     }
    5151    
    5152     // Flip the y coordinate from the top of the menu bar screen -- see 4636390
    5153     return CGPointMake(point.x, NSMaxY([(NSScreen *)[screens objectAtIndex:0] frame]) - point.y);
    5154 }
    5155 
    5156 
    5157 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    5158 
    51595084- (void)orderFrontSubstitutionsPanel:(id)sender
    51605085{
    … …  
    52675192    [[self _webView] toggleAutomaticSpellingCorrection:sender];
    52685193}
    5269 
    5270 #endif
    52715194
    52725195- (void)_lookUpInDictionaryFromMenu:(id)sender
    … …  
    52905213        rect.origin.y += [font ascender];
    52915214
    5292 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    52935215    [self showDefinitionForAttributedString:attrString atPoint:rect.origin];
    5294     return;
    5295 #endif
    5296 
    5297     // We soft link to get the function that displays the dictionary (either pop-up window or app) to avoid the performance
    5298     // penalty of linking to another framework. This function changed signature as well as framework between Tiger and Leopard,
    5299     // so the two cases are handled separately.
    5300 
    5301     typedef void (*ServiceWindowShowFunction)(id unusedDictionaryRef, id inWordString, CFRange selectionRange, id unusedFont, CGPoint textOrigin, Boolean verticalText, id unusedTransform);
    5302     const char *frameworkPath = "/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/HIToolbox";
    5303     const char *functionName = "HIDictionaryWindowShow";
    5304 
    5305     static bool lookedForFunction = false;
    5306     static ServiceWindowShowFunction dictionaryServiceWindowShow = NULL;
    5307 
    5308     if (!lookedForFunction) {
    5309         void* langAnalysisFramework = dlopen(frameworkPath, RTLD_LAZY);
    5310         ASSERT(langAnalysisFramework);
    5311         if (langAnalysisFramework)
    5312             dictionaryServiceWindowShow = (ServiceWindowShowFunction)dlsym(langAnalysisFramework, functionName);
    5313         lookedForFunction = true;
    5314     }
    5315 
    5316     ASSERT(dictionaryServiceWindowShow);
    5317     if (!dictionaryServiceWindowShow) {
    5318         NSLog(@"Couldn't find the %s function in %s", functionName, frameworkPath);
    5319         return;
    5320     }
    5321 
    5322     // The HIDictionaryWindowShow function requires the origin, in CG screen coordinates, of the first character of text in the selection.
    5323     // FIXME 4945808: We approximate this in a way that works well when a single word is selected, and less well in some other cases
    5324     // (but no worse than we did in Tiger)
    5325     NSPoint windowPoint = [self convertPoint:rect.origin toView:nil];
    5326     NSPoint screenPoint = [[self window] convertBaseToScreen:windowPoint];
    5327 
    5328     dictionaryServiceWindowShow(nil, attrString, CFRangeMake(0, [attrString length]), nil,
    5329                                 coreGraphicsScreenPointForAppKitScreenPoint(screenPoint), false, nil);
    53305216}
    53315217
    … …  
    54805366    if (!_private->layerHostingView) {
    54815367        NSView* hostingView = [[WebLayerHostingFlippedView alloc] initWithFrame:[self bounds]];
    5482 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    54835368        [hostingView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
    5484 #endif
    54855369        [self addSubview:hostingView];
    54865370        [hostingView release];
    … …  
    54915375    // Make a container layer, which will get sized/positioned by AppKit and CA.
    54925376    CALayer* viewLayer = [WebRootLayer layer];
    5493 
    5494 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5495     // Turn off default animations.
    5496     NSNull *nullValue = [NSNull null];
    5497     NSDictionary *actions = [NSDictionary dictionaryWithObjectsAndKeys:
    5498                              nullValue, @"anchorPoint",
    5499                              nullValue, @"bounds",
    5500                              nullValue, @"contents",
    5501                              nullValue, @"contentsRect",
    5502                              nullValue, @"opacity",
    5503                              nullValue, @"position",
    5504                              nullValue, @"sublayerTransform",
    5505                              nullValue, @"sublayers",
    5506                              nullValue, @"transform",
    5507                              nil];
    5508     [viewLayer setStyle:[NSDictionary dictionaryWithObject:actions forKey:@"actions"]];
    5509 #endif
    55105377
    55115378    if ([self layer]) {
    … …  
    55255392    if ([[self _webView] _postsAcceleratedCompositingNotifications])
    55265393        [[NSNotificationCenter defaultCenter] postNotificationName:_WebViewDidStartAcceleratedCompositingNotification object:[self _webView] userInfo:nil];
    5527    
    5528 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5529     [viewLayer setSublayerTransform:CATransform3DMakeScale(1, -1, 1)]; // setGeometryFlipped: doesn't exist on Leopard.
    5530     [self _updateLayerHostingViewPosition];
    5531 #elif __MAC_OS_X_VERSION_MIN_REQUIRED <= 1070
     5394
     5395#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1070
    55325396    // Do geometry flipping here, which flips all the compositing layers so they are top-down.
    55335397    [viewLayer setGeometryFlipped:YES];
    … …  
    55475411    }
    55485412}
    5549 
    5550 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5551 // This method is necessary on Leopard to work around <rdar://problem/7067892>.
    5552 - (void)_updateLayerHostingViewPosition
    5553 {
    5554     if (!_private->layerHostingView)
    5555         return;
    5556    
    5557     const CGFloat maxHeight = 2048;
    5558     NSRect layerViewFrame = [self bounds];
    5559 
    5560     if (layerViewFrame.size.height > maxHeight) {
    5561         // Clamp the size of the view to <= maxHeight to avoid the bug.
    5562         layerViewFrame.size.height = maxHeight;
    5563         NSRect visibleRect = [[self enclosingScrollView] documentVisibleRect];
    5564        
    5565         // Place the top of the layer-hosting view at the top of the visibleRect.
    5566         CGFloat topOffset = NSMinY(visibleRect);
    5567         layerViewFrame.origin.y = topOffset;
    5568 
    5569         // Compensate for the moved view by adjusting the sublayer transform on the view's layer (using flipped coords).
    5570         CATransform3D flipTransform = CATransform3DMakeTranslation(0, topOffset, 0);
    5571         flipTransform = CATransform3DScale(flipTransform, 1, -1, 1);
    5572         [[_private->layerHostingView layer] setSublayerTransform:flipTransform];
    5573     }
    5574 
    5575     [_private->layerHostingView _updateLayerGeometryFromView];  // Workaround for <rdar://problem/7071636>
    5576     [_private->layerHostingView setFrame:layerViewFrame];
    5577 }
    5578 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    55795413
    55805414- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx

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

    r122400 r147447  
    6767#endif
    6868
    69 #if USE(ACCELERATED_COMPOSITING) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    70 - (void)_updateLayerHostingViewPosition;
    71 #endif
    72 
    7369@end

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

    r135882 r147447  
    3030#import <wtf/RetainPtr.h>
    3131#import <PDFKit/PDFDocument.h>
    32 
    33 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    34 @interface PDFDocument (Internal)
    35 - (CGPDFDocumentRef)documentRef;
    36 @end
    37 #endif
    3832
    3933static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)

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

    r146704 r147447  
    355355        @"0",                           WebKitUseSiteSpecificSpoofingPreferenceKey,
    356356        [NSNumber numberWithInt:WebKitEditableLinkDefaultBehavior], WebKitEditableLinkBehaviorPreferenceKey,
    357 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    358357        [NSNumber numberWithInt:WebTextDirectionSubmenuAutomaticallyIncluded],
    359 #else
    360         [NSNumber numberWithInt:WebTextDirectionSubmenuNeverIncluded],
    361 #endif
    362358                                        WebKitTextDirectionSubmenuInclusionBehaviorPreferenceKey,
    363359        [NSNumber numberWithBool:NO],   WebKitDOMPasteAllowedPreferenceKey,

  • trunk/Source/WebKit/mac/WebView/WebResourceInternal.h

    r122400 r147447  
    3030#import <wtf/PassRefPtr.h>
    3131
    32 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    33 #define MAIL_THREAD_WORKAROUND 1
    34 #endif
    35 
    3632namespace WebCore {
    3733    class ArchiveResource;
    … …  
    4238- (WebCore::ArchiveResource*)_coreResource;
    4339@end
    44 
    45 #ifdef MAIL_THREAD_WORKAROUND
    46 
    47 @interface WebResource (WebMailThreadWorkaround)
    48 + (BOOL)_needMailThreadWorkaroundIfCalledOffMainThread;
    49 @end
    50 
    51 inline bool needMailThreadWorkaround()
    52 {
    53     return !pthread_main_np() && [WebResource _needMailThreadWorkaroundIfCalledOffMainThread];
    54 }
    55 
    56 #endif

  • trunk/Source/WebKit/mac/WebView/WebScriptDebugDelegate.h

    r122400 r147447  
    2929#import <Foundation/Foundation.h>
    3030
    31 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    32 typedef int WebSourceId;
    33 #else
    3431typedef intptr_t WebSourceId;
    35 #endif
    3632
    3733@class WebView;

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

    r146907 r147447  
    441441@end
    442442
    443 static void patchMailRemoveAttributesMethod();
    444 
    445443NSString *WebElementDOMNodeKey =            @"WebElementDOMNode";
    446444NSString *WebElementFrameKey =              @"WebElementFrame";
    … …  
    503501static BOOL continuousSpellCheckingEnabled;
    504502static BOOL grammarCheckingEnabled;
    505 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    506503static BOOL automaticQuoteSubstitutionEnabled;
    507504static BOOL automaticLinkDetectionEnabled;
    … …  
    509506static BOOL automaticTextReplacementEnabled;
    510507static BOOL automaticSpellingCorrectionEnabled;
    511 #endif
    512508
    513509@implementation WebView (AllWebViews)
    … …  
    620616}
    621617
    622 static bool runningLeopardMail()
    623 {
    624 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    625     return applicationIsAppleMail();
    626 #endif
    627     return NO;
    628 }
    629 
    630 static bool coreVideoHas7228836Fix()
    631 {
    632 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    633     NSBundle* coreVideoFrameworkBundle = [NSBundle bundleWithPath:@"/System/Library/Frameworks/CoreVideo.framework"];
    634     double version = [[coreVideoFrameworkBundle objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey] doubleValue];
    635     return (version >= 48);
    636 #endif
    637     return true;
    638 }
    639 
    640618static bool shouldEnableLoadDeferring()
    641619{
    … …  
    666644#endif
    667645
    668 static NSString *leakMailQuirksUserScriptContents()
    669 {
    670     NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"MailQuirksUserScript" ofType:@"js"];
    671     NSStringEncoding encoding;
    672     return [[NSString alloc] initWithContentsOfFile:scriptPath usedEncoding:&encoding error:0];
    673 }
    674 
    675 - (void)_injectMailQuirksScript
    676 {
    677     static NSString *mailQuirksScriptContents = leakMailQuirksUserScriptContents();
    678     core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
    679         mailQuirksScriptContents, KURL(), Vector<String>(), Vector<String>(), InjectAtDocumentEnd, InjectInAllFrames);
    680 }
    681 
    682646static bool needsOutlookQuirksScript()
    683647{
    … …  
    748712        WebKitInitializeStorageIfNecessary();
    749713        WebKitInitializeApplicationCachePathIfNecessary();
    750         patchMailRemoveAttributesMethod();
    751714       
    752715        Settings::setDefaultMinDOMTimerInterval(0.004);
    … …  
    840803    [self _scheduleGlibContextIterations];
    841804#endif
    842 
    843     if (runningLeopardMail())
    844         [self _injectMailQuirksScript];
    845805}
    846806
    … …  
    15101470    settings->setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
    15111471    settings->setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
    1512     settings->setNeedsLeopardMailQuirks(runningLeopardMail());
    15131472    settings->setNeedsSiteSpecificQuirks(_private->useSiteSpecificSpoofing);
    15141473    settings->setWebArchiveDebugModeEnabled([preferences webArchiveDebugModeEnabled]);
    … …  
    15221481    // FIXME: Enabling accelerated compositing when WebGL is enabled causes tests to fail on Leopard which expect HW compositing to be disabled.
    15231482    // Until we fix that, I will comment out the test (CFM)
    1524     settings->setAcceleratedCompositingEnabled((coreVideoHas7228836Fix() || [preferences webGLEnabled] ||
    1525         [preferences accelerated2dCanvasEnabled]) && [preferences acceleratedCompositingEnabled]);
     1483    settings->setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
    15261484    settings->setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
    15271485    settings->setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);   
    … …  
    15471505    settings->setFullScreenEnabled([preferences fullScreenEnabled]);
    15481506#endif
    1549 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    1550     // Asynchronous spell checking API is available for 10.6 or later.
    15511507    settings->setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
    1552 #endif
    15531508    settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
    15541509    settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
    … …  
    31853140    Font::setDefaultTypesettingFeatures([defaults boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey] ? Kerning | Ligatures : 0);
    31863141
    3187 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    31883142    automaticQuoteSubstitutionEnabled = [defaults boolForKey:WebAutomaticQuoteSubstitutionEnabled];
    31893143    automaticLinkDetectionEnabled = [defaults boolForKey:WebAutomaticLinkDetectionEnabled];
    … …  
    31913145    automaticTextReplacementEnabled = [defaults boolForKey:WebAutomaticTextReplacementEnabled];
    31923146    automaticSpellingCorrectionEnabled = [defaults boolForKey:WebAutomaticSpellingCorrectionEnabled];
    3193 #endif
    31943147
    31953148#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
    … …  
    33993352    if ([bundleIdentifier _webkit_hasCaseInsensitivePrefix:@"com.apple.Automator."])
    34003353        return true;
    3401 
    3402 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    3403     // Mail.
    3404     if ([bundleIdentifier _webkit_isCaseInsensitiveEqualToString:@"com.apple.Mail"])
    3405         return true;
    3406 #endif
    34073354
    34083355    return false;
    … …  
    47274674        }
    47284675        return YES;
    4729 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    47304676    } else if (action == @selector(toggleAutomaticQuoteSubstitution:)) {
    47314677        BOOL checkMark = [self isAutomaticQuoteSubstitutionEnabled];
    … …  
    47634709        }
    47644710        return YES;
    4765 #endif
    47664711    }
    47674712    FOR_EACH_RESPONDER_SELECTOR(VALIDATE)
    … …  
    55635508    grammarCheckingEnabled = flag;
    55645509    [[NSUserDefaults standardUserDefaults] setBool:grammarCheckingEnabled forKey:WebGrammarCheckingEnabled];   
    5565    
    5566 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    55675510    [[NSSpellChecker sharedSpellChecker] updatePanels];
    5568 #else
    5569     NSSpellChecker *spellChecker = [NSSpellChecker sharedSpellChecker];
    5570     if ([spellChecker respondsToSelector:@selector(_updateGrammar)])
    5571         [spellChecker performSelector:@selector(_updateGrammar)];
    5572 #endif
    5573    
     5511
    55745512    // We call _preflightSpellChecker when turning continuous spell checking on, but we don't need to do that here
    55755513    // because grammar checking only occurs on code paths that already preflight spell checking appropriately.
    … …  
    55915529- (BOOL)isAutomaticQuoteSubstitutionEnabled
    55925530{
    5593 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5594     return NO;
    5595 #else
    55965531    return automaticQuoteSubstitutionEnabled;
    5597 #endif
    55985532}
    55995533
    56005534- (BOOL)isAutomaticLinkDetectionEnabled
    56015535{
    5602 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5603     return NO;
    5604 #else
    56055536    return automaticLinkDetectionEnabled;
    5606 #endif
    56075537}
    56085538
    56095539- (BOOL)isAutomaticDashSubstitutionEnabled
    56105540{
    5611 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5612     return NO;
    5613 #else
    56145541    return automaticDashSubstitutionEnabled;
    5615 #endif
    56165542}
    56175543
    56185544- (BOOL)isAutomaticTextReplacementEnabled
    56195545{
    5620 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5621     return NO;
    5622 #else
    56235546    return automaticTextReplacementEnabled;
    5624 #endif
    56255547}
    56265548
    56275549- (BOOL)isAutomaticSpellingCorrectionEnabled
    56285550{
    5629 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    5630     return NO;
    5631 #else
    56325551    return automaticSpellingCorrectionEnabled;
    5633 #endif
    5634 }
    5635 
    5636 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
     5552}
    56375553
    56385554- (void)setAutomaticQuoteSubstitutionEnabled:(BOOL)flag
    … …  
    57055621    [self setAutomaticSpellingCorrectionEnabled:![self isAutomaticSpellingCorrectionEnabled]];
    57065622}
    5707 
    5708 #endif
    57095623
    57105624@end
    … …  
    62216135        return;
    62226136
    6223 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    62246137    [[NSWorkspace sharedWorkspace] showSearchResultsForQueryString:selectedString];
    6225 #else
    6226     (void)HISearchWindowShow((CFStringRef)selectedString, kNilOptions);
    6227 #endif
    62286138}
    62296139
    … …  
    67406650    memoryPressureHandler().install();
    67416651}
    6742 
    6743 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    6744 
    6745 static IMP originalRecursivelyRemoveMailAttributesImp;
    6746 
    6747 static id objectElementDataAttribute(DOMHTMLObjectElement *self, SEL)
    6748 {
    6749     return [self getAttribute:@"data"];
    6750 }
    6751 
    6752 static void recursivelyRemoveMailAttributes(DOMNode *self, SEL selector, BOOL a, BOOL b, BOOL c)
    6753 {
    6754     // While inside this Mail function, change the behavior of -[DOMHTMLObjectElement data] back to what it used to be
    6755     // before we fixed a bug in it (see http://trac.webkit.org/changeset/30044 for that change).
    6756 
    6757     // It's a little bit strange to patch a method defined by WebKit, but it helps keep this workaround self-contained.
    6758 
    6759     Method methodToPatch = class_getInstanceMethod(objc_getRequiredClass("DOMHTMLObjectElement"), @selector(data));
    6760     IMP originalDataImp = method_setImplementation(methodToPatch, reinterpret_cast<IMP>(objectElementDataAttribute));
    6761     originalRecursivelyRemoveMailAttributesImp(self, selector, a, b, c);
    6762     method_setImplementation(methodToPatch, originalDataImp);
    6763 }
    6764 
    6765 #endif
    6766 
    6767 static void patchMailRemoveAttributesMethod()
    6768 {
    6769 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    6770     if (!WKAppVersionCheckLessThan(@"com.apple.mail", -1, 4.0))
    6771         return;
    6772     Method methodToPatch = class_getInstanceMethod(objc_getRequiredClass("DOMNode"), @selector(recursivelyRemoveMailAttributes:convertObjectsToImages:convertEditableElements:));
    6773     if (!methodToPatch)
    6774         return;
    6775     originalRecursivelyRemoveMailAttributesImp = method_setImplementation(methodToPatch, reinterpret_cast<IMP>(recursivelyRemoveMailAttributes));
    6776 #endif
    6777 }

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

    r144547 r147447  
    680680- (BOOL)isAutomaticTextReplacementEnabled;
    681681- (BOOL)isAutomaticSpellingCorrectionEnabled;
    682 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    683682- (void)setAutomaticQuoteSubstitutionEnabled:(BOOL)flag;
    684683- (void)toggleAutomaticQuoteSubstitution:(id)sender;
    … …  
    691690- (void)setAutomaticSpellingCorrectionEnabled:(BOOL)flag;
    692691- (void)toggleAutomaticSpellingCorrection:(id)sender;
    693 #endif
    694692@end
    695693
Note: See TracChangeset for help on using the changeset viewer.