Changeset 149922 in webkit


Ignore:
Timestamp:
May 10, 2013, 6:59:15 PM (12 years ago)
Author:
Laszlo Gombos
Message:

Remove Mac OS X Leopard (10.5) support
​https://bugs.webkit.org/show_bug.cgi?id=107964

Reviewed by Ryosuke Niwa.

Removed the code for 10.5 and removed if-def for 10.6.

Source/WebCore:

No new tests, covered by existing tests.

  • platform/LocalizedStrings.cpp:

(WebCore::contextMenuItemTagLookUpInDictionary):

  • platform/graphics/cg/GraphicsContextCG.cpp:
  • platform/mac/EmptyProtocolDefinitions.h:
  • platform/mac/NSScrollerImpDetails.h:
  • platform/mac/WebCoreSystemInterface.h:
  • platform/text/mac/HyphenationMac.mm:

Source/WebKit/mac:

  • DefaultDelegates/WebDefaultContextMenuDelegate.mm:
  • Misc/WebKitErrors.m:

(-[NSError _initWithPluginErrorCode:contentURL:pluginPageURL:pluginName:MIMEType:]):

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

  • WebView/WebClipView.mm:

(-[WebClipView _immediateScrollToPoint:]):

  • WebView/WebFrameView.mm:

(-[WebFrameView initWithFrame:]):

  • WebView/WebView.mm:

Tools:

  • DumpRenderTree/cf/WebArchiveDumpSupport.cpp:

(convertMIMEType):
(createXMLStringFromWebArchiveData):

  • DumpRenderTree/mac/TestRunnerMac.mm:

(TestRunner::authenticateSession):
(TestRunner::setTextDirection):

  • WebKitTestRunner/cf/WebArchiveDumpSupport.cpp:

(convertMIMEType):
(createXMLStringFromWebArchiveData):

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149921 r149922  
     12013-05-10  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        Remove Mac OS X Leopard (10.5) support
     4        https://bugs.webkit.org/show_bug.cgi?id=107964
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Removed the code for 10.5 and removed if-def for 10.6.
     9
     10        No new tests, covered by existing tests.
     11
     12        * platform/LocalizedStrings.cpp:
     13        (WebCore::contextMenuItemTagLookUpInDictionary):
     14        * platform/graphics/cg/GraphicsContextCG.cpp:
     15        * platform/mac/EmptyProtocolDefinitions.h:
     16        * platform/mac/NSScrollerImpDetails.h:
     17        * platform/mac/WebCoreSystemInterface.h:
     18        * platform/text/mac/HyphenationMac.mm:
     19
    1202013-05-10  Laszlo Gombos  <l.gombos@samsung.com>
    221

  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r149255 r149922  
    255255String contextMenuItemTagLookUpInDictionary(const String& selectedString)
    256256{
    257 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     257#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    258258    UNUSED_PARAM(selectedString);
    259259    return WEB_UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item");

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r149566 r149922  
    5454#endif
    5555
    56 #if PLATFORM(MAC)
    57 
    58 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
    59 // Building on 10.6 or later: kCGInterpolationMedium is defined in the CGInterpolationQuality enum.
    60 #define HAVE_CG_INTERPOLATION_MEDIUM 1
    61 #endif
    62 
    63 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    64 // Targeting 10.6 or later: use kCGInterpolationMedium.
    65 #define WTF_USE_CG_INTERPOLATION_MEDIUM 1
    66 #endif
    67 
    68 #endif
    69 
    7056extern "C" {
    7157    CG_EXTERN void CGContextSetCTM(CGContextRef, CGAffineTransform);
    … …  
    13381324        quality = kCGInterpolationLow;
    13391325        break;
    1340 
    1341     // Fall through to InterpolationHigh if kCGInterpolationMedium is not usable.
    13421326    case InterpolationMedium:
    1343 #if USE(CG_INTERPOLATION_MEDIUM)
    13441327        quality = kCGInterpolationMedium;
    13451328        break;
    1346 #endif
    13471329    case InterpolationHigh:
    13481330        quality = kCGInterpolationHigh;
    … …  
    13651347    case kCGInterpolationLow:
    13661348        return InterpolationLow;
    1367 #if HAVE(CG_INTERPOLATION_MEDIUM)
    1368     // kCGInterpolationMedium is known to be present in the CGInterpolationQuality enum.
    13691349    case kCGInterpolationMedium:
    1370 #if USE(CG_INTERPOLATION_MEDIUM)
    1371         // Only map to InterpolationMedium if targeting a system that understands it.
    13721350        return InterpolationMedium;
    1373 #else
    1374         return InterpolationDefault;
    1375 #endif  // USE(CG_INTERPOLATION_MEDIUM)
    1376 #endif  // HAVE(CG_INTERPOLATION_MEDIUM)
    13771351    case kCGInterpolationHigh:
    13781352        return InterpolationHigh;

  • trunk/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h

    r147710 r149922  
    3030@end
    3131
    32 #if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
     32#if __MAC_OS_X_VERSION_MAX_ALLOWED == 1060
    3333
    3434EMPTY_PROTOCOL(NSURLConnectionDelegate)

  • trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h

    r147860 r149922  
    3030
    3131// Public APIs not available on versions of Mac on which we build
    32 #if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
     32#if __MAC_OS_X_VERSION_MAX_ALLOWED == 1060
    3333enum {
    3434    NSScrollerStyleLegacy       = 0,
    … …  
    4545#endif
    4646
    47 #if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
     47#if __MAC_OS_X_VERSION_MAX_ALLOWED == 1060
    4848@interface NSScroller(NSObject)
    4949+ (NSScrollerStyle)preferredScrollerStyle;

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r149342 r149922  
    292292extern AXUIElementRef (*wkCreateAXUIElementRef)(id element);
    293293
    294 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     294#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    295295typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
    296296#else

  • trunk/Source/WebCore/platform/text/mac/HyphenationMac.mm

    r149255 r149922  
    2727#import "Hyphenation.h"
    2828
    29 #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     29#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    3030
    3131#import "AtomicStringKeyedMRUCache.h"
    … …  
    6868} // namespace WebCore
    6969
    70 #endif // !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     70#endif // !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1060

  • trunk/Source/WebKit/mac/ChangeLog

    r149713 r149922  
     12013-05-10  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        Remove Mac OS X Leopard (10.5) support
     4        https://bugs.webkit.org/show_bug.cgi?id=107964
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Removed the code for 10.5 and removed if-def for 10.6.
     9
     10        * DefaultDelegates/WebDefaultContextMenuDelegate.mm:
     11        * Misc/WebKitErrors.m:
     12        (-[NSError _initWithPluginErrorCode:contentURL:pluginPageURL:pluginName:MIMEType:]):
     13        * WebCoreSupport/WebSystemInterface.mm:
     14        (InitWebCoreSystemInterface):
     15        * WebView/WebClipView.mm:
     16        (-[WebClipView _immediateScrollToPoint:]):
     17        * WebView/WebFrameView.mm:
     18        (-[WebFrameView initWithFrame:]):
     19        * WebView/WebView.mm:
     20
    1212013-05-07  Mark Rowe  <mrowe@apple.com>
    222

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

    r149255 r149922  
    137137}
    138138
    139 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     139#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    140140#define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 1
    141141#else

  • trunk/Source/WebKit/mac/Misc/WebKitErrors.m

    r122400 r149922  
    117117    if (contentURL) {
    118118        [userInfo setObject:contentURL forKey:@"NSErrorFailingURLKey"];
    119 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    120         [userInfo setObject:[contentURL _web_userVisibleString] forKey:NSErrorFailingURLStringKey];
    121 #else
    122119        [userInfo setObject:[contentURL _web_userVisibleString] forKey:NSURLErrorFailingURLStringErrorKey];
    123 #endif
    124120    }
    125121    if (pluginPageURL) {

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

    r149342 r149922  
    127127    INIT(GetVerticalGlyphsForCharacters);
    128128
    129 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     129#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    130130    INIT(GetHyphenationLocationBeforeIndex);
    131131    INIT(GetNSEventMomentumPhase);

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

    r122400 r149922  
    5353@end
    5454
    55 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    5655@interface NSWindow (WebNSWindowDetails)
    5756- (void)_disableDelayedWindowDisplay;
    5857- (void)_enableDelayedWindowDisplay;
    5958@end
    60 #endif
    6159
    6260@implementation WebClipView
    … …  
    106104    _isScrolling = YES;
    107105
    108 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    109106    [[self window] _disableDelayedWindowDisplay];
    110 #endif
    111107
    112108    [super _immediateScrollToPoint:newOrigin];
    113109
    114 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    115110    [[self window] _enableDelayedWindowDisplay];
    116 #endif
    117111
    118112    _isScrolling = NO;

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

    r122400 r149922  
    323323// FIXME: Remove the NSAppKitVersionNumberWithDeferredWindowDisplaySupport check once
    324324// once AppKit's Deferred Window Display support is available.
    325 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050 || !defined(NSAppKitVersionNumberWithDeferredWindowDisplaySupport)
     325#if !defined(NSAppKitVersionNumberWithDeferredWindowDisplaySupport)
    326326        // CoreGraphics deferred updates are disabled if WebKitEnableCoalescedUpdatesPreferenceKey is NO
    327327        // or has no value. For compatibility with Mac OS X 10.5 and lower, deferred updates are off by default.

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

    r149576 r149922  
    638638}
    639639
    640 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     640#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    641641// This method should be removed once we no longer want to keep Safari 5.0.x working with nightly builds.
    642642- (BOOL)_usesDocumentViews

  • trunk/Tools/ChangeLog

    r149916 r149922  
     12013-05-10  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        Remove Mac OS X Leopard (10.5) support
     4        https://bugs.webkit.org/show_bug.cgi?id=107964
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Removed the code for 10.5 and removed if-def for 10.6.
     9
     10        * DumpRenderTree/cf/WebArchiveDumpSupport.cpp:
     11        (convertMIMEType):
     12        (createXMLStringFromWebArchiveData):
     13        * DumpRenderTree/mac/TestRunnerMac.mm:
     14        (TestRunner::authenticateSession):
     15        (TestRunner::setTextDirection):
     16        * WebKitTestRunner/cf/WebArchiveDumpSupport.cpp:
     17        (convertMIMEType):
     18        (createXMLStringFromWebArchiveData):
     19
    1202013-05-10  Brent Fulgham  <bfulgham@apple.com>
    221

  • trunk/Tools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp

    r149716 r149922  
    4545static void convertMIMEType(CFMutableStringRef mimeType)
    4646{
    47 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    48     // Workaround for <rdar://problem/5539824> on Leopard
    49     if (CFStringCompare(mimeType, CFSTR("text/xml"), kCFCompareAnchored | kCFCompareCaseInsensitive) == kCFCompareEqualTo)
    50         CFStringReplaceAll(mimeType, CFSTR("application/xml"));
    51 #endif
    5247    // Workaround for <rdar://problem/6234318> with Dashcode 2.0
    5348    if (CFStringCompare(mimeType, CFSTR("application/x-javascript"), kCFCompareAnchored | kCFCompareCaseInsensitive) == kCFCompareEqualTo)
    … …  
    158153    CFErrorRef error = 0;
    159154    CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0;
    160 
    161 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    162     CFIndex bytesCount = CFDataGetLength(webArchiveData);
    163     RetainPtr<CFReadStreamRef> readStream = adoptCF(CFReadStreamCreateWithBytesNoCopy(kCFAllocatorDefault, CFDataGetBytePtr(webArchiveData), bytesCount, kCFAllocatorNull));
    164     CFReadStreamOpen(readStream.get());
    165     RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF((CFMutableDictionaryRef)CFPropertyListCreateFromStream(kCFAllocatorDefault, readStream.get(), bytesCount, kCFPropertyListMutableContainersAndLeaves, &format, 0));
    166     CFReadStreamClose(readStream.get());
    167 #else
    168155    RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF((CFMutableDictionaryRef)CFPropertyListCreateWithData(kCFAllocatorDefault, webArchiveData, kCFPropertyListMutableContainersAndLeaves, &format, &error));
    169 #endif
    170156
    171157    if (!propertyList) {
    … …  
    208194
    209195    error = 0;
    210 
    211 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    212     RetainPtr<CFDataRef> xmlData = adoptCF(CFPropertyListCreateXMLData(kCFAllocatorDefault, propertyList.get()));
    213 #else
    214196    RetainPtr<CFDataRef> xmlData = adoptCF(CFPropertyListCreateData(kCFAllocatorDefault, propertyList.get(), kCFPropertyListXMLFormat_v1_0, 0, &error));
    215 #endif
    216197
    217198    if (!xmlData) {

  • trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm

    r149716 r149922  
    921921static NSString *SynchronousLoaderRunLoopMode = @"DumpRenderTreeSynchronousLoaderRunLoopMode";
    922922
    923 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
     923#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
    924924@protocol NSURLConnectionDelegate <NSObject>
    925925@end
    … …  
    997997{
    998998    // See <rdar://problem/7880699>.
    999 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    1000999    RetainPtr<CFStringRef> urlStringCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, url));
    10011000    RetainPtr<CFStringRef> usernameCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, username));
    … …  
    10051004
    10061005    [SynchronousLoader makeRequest:request.get() withUsername:(NSString *)usernameCF.get() password:(NSString *)passwordCF.get()];
    1007 #endif
    10081006}
    10091007
    … …  
    10201018void TestRunner::setTextDirection(JSStringRef directionName)
    10211019{
    1022 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    10231020    if (JSStringIsEqualToUTF8CString(directionName, "ltr"))
    10241021        [[mainFrame webView] makeBaseWritingDirectionLeftToRight:0];
    … …  
    10271024    else
    10281025        ASSERT_NOT_REACHED();
    1029 #endif
    10301026}
    10311027

  • trunk/Tools/WebKitTestRunner/cf/WebArchiveDumpSupport.cpp

    r149725 r149922  
    4545static void convertMIMEType(CFMutableStringRef mimeType)
    4646{
    47 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    48     // Workaround for <rdar://problem/5539824> on Leopard
    49     if (CFStringCompare(mimeType, CFSTR("text/xml"), kCFCompareAnchored | kCFCompareCaseInsensitive) == kCFCompareEqualTo)
    50         CFStringReplaceAll(mimeType, CFSTR("application/xml"));
    51 #endif
    5247    // Workaround for <rdar://problem/6234318> with Dashcode 2.0
    5348    if (CFStringCompare(mimeType, CFSTR("application/x-javascript"), kCFCompareAnchored | kCFCompareCaseInsensitive) == kCFCompareEqualTo)
    … …  
    158153    CFErrorRef error = 0;
    159154    CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0;
    160 
    161 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    162     CFIndex bytesCount = CFDataGetLength(webArchiveData);
    163     RetainPtr<CFReadStreamRef> readStream = adoptCF(CFReadStreamCreateWithBytesNoCopy(kCFAllocatorDefault, CFDataGetBytePtr(webArchiveData), bytesCount, kCFAllocatorNull));
    164     CFReadStreamOpen(readStream.get());
    165     RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF((CFMutableDictionaryRef)CFPropertyListCreateFromStream(kCFAllocatorDefault, readStream.get(), bytesCount, kCFPropertyListMutableContainersAndLeaves, &format, 0));
    166     CFReadStreamClose(readStream.get());
    167 #else
    168155    RetainPtr<CFMutableDictionaryRef> propertyList = adoptCF((CFMutableDictionaryRef)CFPropertyListCreateWithData(kCFAllocatorDefault, webArchiveData, kCFPropertyListMutableContainersAndLeaves, &format, &error));
    169 #endif
    170156
    171157    if (!propertyList) {
    … …  
    209195    error = 0;
    210196
    211 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
    212     RetainPtr<CFDataRef> xmlData = adoptCF(CFPropertyListCreateXMLData(kCFAllocatorDefault, propertyList.get()));
    213 #else
    214197    RetainPtr<CFDataRef> xmlData = adoptCF(CFPropertyListCreateData(kCFAllocatorDefault, propertyList.get(), kCFPropertyListXMLFormat_v1_0, 0, &error));
    215 #endif
    216198
    217199    if (!xmlData) {
Note: See TracChangeset for help on using the changeset viewer.