Changeset 121529 in webkit


Ignore:
Timestamp:
Jun 29, 2012 1:28:15 AM (12 years ago)
Author:
eric@webkit.org
Message:

Remove more BUILDING_ON_LEOPARD branches now that no port builds on Leopard
​https://bugs.webkit.org/show_bug.cgi?id=90252

Reviewed by Ryosuke Niwa.

Source/WebCore:

  • platform/LocalizedStrings.cpp:

(WebCore):

  • platform/graphics/cg/PathCG.cpp:

(WebCore::Path::platformAddPathForRoundedRect):

  • platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::setFont):

  • platform/graphics/mac/ComplexTextControllerCoreText.mm:

(WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):

  • platform/graphics/mac/FontMac.mm:

(WebCore::showGlyphsWithAdvances):

  • platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore):

  • platform/mac/CursorMac.mm:

(WebCore::Cursor::ensurePlatformCursor):

  • platform/mac/MemoryPressureHandlerMac.mm:

(WebCore):

  • platform/mac/PlatformEventFactoryMac.mm:

(WebCore::momentumPhaseForEvent):
(WebCore::phaseForEvent):

  • platform/mac/WebCoreSystemInterface.h:
  • platform/mac/WebCoreSystemInterface.mm:
  • platform/network/mac/ResourceHandleMac.mm:

(WebCore::ResourceHandle::didReceiveAuthenticationChallenge):

  • platform/network/mac/ResourceRequestMac.mm:

(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdatePlatformRequest):

  • platform/text/cf/HyphenationCF.cpp:
  • rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::shouldShowPlaceholderWhenFocused):

Source/WebKit/mac:

  • DefaultDelegates/WebDefaultContextMenuDelegate.mm:

(-[WebDefaultUIDelegate menuItemWithTag:target:representedObject:]):

  • Misc/WebNSControlExtras.m:

(-[NSControl sizeToFitAndAdjustWindowHeight]):

  • WebCoreSupport/WebEditorClient.mm:

(WebEditorClient::shouldEraseMarkersAfterChangeSelection):
(WebEditorClient::getGuessesForWord):

  • WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::dispatchDidFirstLayout):
(WebFrameLoaderClient::provisionalLoadStarted):

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

  • WebView/WebDynamicScrollBarsView.mm:

(-[WebDynamicScrollBarsView scrollWheel:]):

  • WebView/WebFullScreenController.mm:

(-[WebFullScreenController finishedEnterFullScreenAnimation:]):
(-[WebFullScreenController exitFullScreen]):

  • WebView/WebHTMLView.mm:

(-[WebHTMLView _pasteWithPasteboard:allowPlainText:]):

  • WebView/WebView.mm:

(+[WebView initialize]):
(-[WebView _deviceScaleFactor]):

Source/WebKit2:

  • UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:WebCore::finalFrame:WebCore::]):

  • WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm:
  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Source/WTF:

  • wtf/FastMalloc.cpp:

(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):

  • wtf/unicode/icu/CollatorICU.cpp:

(WTF::Collator::userDefault):

Location:
trunk/Source
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r121524 r121529  
     12012-06-29  Eric Seidel  <eric@webkit.org>
     2
     3        Remove more BUILDING_ON_LEOPARD branches now that no port builds on Leopard
     4        https://bugs.webkit.org/show_bug.cgi?id=90252
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * wtf/FastMalloc.cpp:
     9        (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
     10        * wtf/unicode/icu/CollatorICU.cpp:
     11        (WTF::Collator::userDefault):
     12
    1132012-06-29  Eric Seidel  <eric@webkit.org>
    214

  • trunk/Source/WTF/wtf/FastMalloc.cpp

    r120256 r121529  
    46584658    , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
    46594659#endif
    4660 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) || OS(IOS)
     4660#if !defined(BUILDING_ON_SNOW_LEOPARD) || OS(IOS)
    46614661    , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
    46624662#endif

  • trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp

    r111778 r121529  
    6262#if OS(DARWIN) && USE(CF)
    6363    // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
    64 #if !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
     64#if !OS(IOS)
    6565    RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
    6666    CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);

  • trunk/Source/WebCore/ChangeLog

    r121528 r121529  
     12012-06-29  Eric Seidel  <eric@webkit.org>
     2
     3        Remove more BUILDING_ON_LEOPARD branches now that no port builds on Leopard
     4        https://bugs.webkit.org/show_bug.cgi?id=90252
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * platform/LocalizedStrings.cpp:
     9        (WebCore):
     10        * platform/graphics/cg/PathCG.cpp:
     11        (WebCore::Path::platformAddPathForRoundedRect):
     12        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     13        (WebCore::FontPlatformData::FontPlatformData):
     14        (WebCore::FontPlatformData::setFont):
     15        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
     16        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):
     17        * platform/graphics/mac/FontMac.mm:
     18        (WebCore::showGlyphsWithAdvances):
     19        * platform/graphics/mac/SimpleFontDataMac.mm:
     20        (WebCore):
     21        * platform/mac/CursorMac.mm:
     22        (WebCore::Cursor::ensurePlatformCursor):
     23        * platform/mac/MemoryPressureHandlerMac.mm:
     24        (WebCore):
     25        * platform/mac/PlatformEventFactoryMac.mm:
     26        (WebCore::momentumPhaseForEvent):
     27        (WebCore::phaseForEvent):
     28        * platform/mac/WebCoreSystemInterface.h:
     29        * platform/mac/WebCoreSystemInterface.mm:
     30        * platform/network/mac/ResourceHandleMac.mm:
     31        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
     32        * platform/network/mac/ResourceRequestMac.mm:
     33        (WebCore::ResourceRequest::doUpdateResourceRequest):
     34        (WebCore::ResourceRequest::doUpdatePlatformRequest):
     35        * platform/text/cf/HyphenationCF.cpp:
     36        * rendering/RenderThemeMac.mm:
     37        (WebCore::RenderThemeMac::shouldShowPlaceholderWhenFocused):
     38
    1392012-06-27  Vsevolod Vlasov  <vsevik@chromium.org>
    240

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

    r121524 r121529  
    7373}
    7474
    75 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     75#if !defined(BUILDING_ON_SNOW_LEOPARD)
    7676static String truncatedStringForLookupMenuItem(const String& original)
    7777{

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

    r111600 r121529  
    237237void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
    238238{
    239 #if PLATFORM(MAC) && (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
     239#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
    240240    bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width());
    241241    bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());

  • trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

    r120156 r121529  
    6060    loadFont(nsFont, size, m_font, cgFont);
    6161   
    62 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     62#if !defined(BUILDING_ON_SNOW_LEOPARD)
    6363    // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might
    6464    // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont().
    … …  
    151151   
    152152    m_cgFont.adoptCF(cgFont);
    153 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     153#if !defined(BUILDING_ON_SNOW_LEOPARD)
    154154    {
    155155        CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));

  • trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

    r120122 r121529  
    4040#endif
    4141
    42 #if defined(BUILDING_ON_LEOPARD)
    43 // The following symbols are SPI in 10.5.
    44 extern "C" {
    45 void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]);
    46 const CGSize* CTRunGetAdvancesPtr(CTRunRef run);
    47 extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
    48 }
    49 #endif
    50 
    5142@interface WebCascadeList : NSArray {
    5243    @private
    … …  
    219210        static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
    220211
    221 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     212#if !defined(BUILDING_ON_SNOW_LEOPARD)
    222213        ProviderInfo info = { cp, length, stringAttributes.get() };
    223214        RetainPtr<CTTypesetterRef> typesetter(AdoptCF, wkCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));

  • trunk/Source/WebCore/platform/graphics/mac/FontMac.mm

    r107012 r121529  
    120120            CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
    121121    }
    122 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     122#if !defined(BUILDING_ON_SNOW_LEOPARD)
    123123    else {
    124124        if (!count)

  • trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

    r112816 r121529  
    8383
    8484#if !ERROR_DISABLED
    85 #if defined(__LP64__) || (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
     85#if defined(__LP64__) || !defined(BUILDING_ON_SNOW_LEOPARD)
    8686static NSString* pathFromFont(NSFont*)
    8787{

  • trunk/Source/WebCore/platform/mac/CursorMac.mm

    r96777 r121529  
    8686
    8787    case Cursor::Hand:
    88 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     88#if !defined(BUILDING_ON_SNOW_LEOPARD)
    8989        m_platformCursor = [NSCursor pointingHandCursor];
    9090#else
    … …  
    100100
    101101    case Cursor::Wait:
    102 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     102#if !defined(BUILDING_ON_SNOW_LEOPARD)
    103103        m_platformCursor = wkCursor("BusyButClickable");
    104104#else
    … …  
    108108
    109109    case Cursor::Help:
    110 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     110#if !defined(BUILDING_ON_SNOW_LEOPARD)
    111111        m_platformCursor = wkCursor("Help");
    112112        if (m_platformCursor)
    … …  
    118118    case Cursor::Move:
    119119    case Cursor::MiddlePanning:
    120 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     120#if !defined(BUILDING_ON_SNOW_LEOPARD)
    121121        m_platformCursor = wkCursor("Move");
    122122#else
    … …  
    127127    case Cursor::EastResize:
    128128    case Cursor::EastPanning:
    129 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     129#if !defined(BUILDING_ON_SNOW_LEOPARD)
    130130        m_platformCursor = wkCursor("ResizeEast");
    131131#else
    … …  
    136136    case Cursor::NorthResize:
    137137    case Cursor::NorthPanning:
    138 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     138#if !defined(BUILDING_ON_SNOW_LEOPARD)
    139139        m_platformCursor = wkCursor("ResizeNorth");
    140140#else
    … …  
    145145    case Cursor::NorthEastResize:
    146146    case Cursor::NorthEastPanning:
    147 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     147#if !defined(BUILDING_ON_SNOW_LEOPARD)
    148148        m_platformCursor = wkCursor("ResizeNortheast");
    149149#else
    … …  
    154154    case Cursor::NorthWestResize:
    155155    case Cursor::NorthWestPanning:
    156 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     156#if !defined(BUILDING_ON_SNOW_LEOPARD)
    157157        m_platformCursor = wkCursor("ResizeNorthwest");
    158158#else
    … …  
    163163    case Cursor::SouthResize:
    164164    case Cursor::SouthPanning:
    165 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     165#if !defined(BUILDING_ON_SNOW_LEOPARD)
    166166        m_platformCursor = wkCursor("ResizeSouth");
    167167#else
    … …  
    172172    case Cursor::SouthEastResize:
    173173    case Cursor::SouthEastPanning:
    174 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     174#if !defined(BUILDING_ON_SNOW_LEOPARD)
    175175        m_platformCursor = wkCursor("ResizeSoutheast");
    176176#else
    … …  
    181181    case Cursor::SouthWestResize:
    182182    case Cursor::SouthWestPanning:
    183 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     183#if !defined(BUILDING_ON_SNOW_LEOPARD)
    184184        m_platformCursor = wkCursor("ResizeSouthwest");
    185185#else
    … …  
    189189
    190190    case Cursor::WestResize:
    191 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     191#if !defined(BUILDING_ON_SNOW_LEOPARD)
    192192        m_platformCursor = wkCursor("ResizeWest");
    193193#else
    … …  
    197197
    198198    case Cursor::NorthSouthResize:
    199 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     199#if !defined(BUILDING_ON_SNOW_LEOPARD)
    200200        m_platformCursor = wkCursor("ResizeNorthSouth");
    201201#else
    … …  
    206206    case Cursor::EastWestResize:
    207207    case Cursor::WestPanning:
    208 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     208#if !defined(BUILDING_ON_SNOW_LEOPARD)
    209209        m_platformCursor = wkCursor("ResizeEastWest");
    210210#else
    … …  
    214214
    215215    case Cursor::NorthEastSouthWestResize:
    216 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     216#if !defined(BUILDING_ON_SNOW_LEOPARD)
    217217        m_platformCursor = wkCursor("ResizeNortheastSouthwest");
    218218#else
    … …  
    222222
    223223    case Cursor::NorthWestSouthEastResize:
    224 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     224#if !defined(BUILDING_ON_SNOW_LEOPARD)
    225225        m_platformCursor = wkCursor("ResizeNorthwestSoutheast");
    226226#else
    … …  
    238238
    239239    case Cursor::VerticalText:
    240 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     240#if !defined(BUILDING_ON_SNOW_LEOPARD)
    241241        m_platformCursor = [NSCursor IBeamCursorForVerticalLayout];
    242242#else
    … …  
    246246
    247247    case Cursor::Cell:
    248 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     248#if !defined(BUILDING_ON_SNOW_LEOPARD)
    249249        m_platformCursor = wkCursor("Cell");
    250250        if (m_platformCursor)
    … …  
    263263
    264264    case Cursor::Alias:
    265 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     265#if !defined(BUILDING_ON_SNOW_LEOPARD)
    266266        m_platformCursor = wkCursor("MakeAlias");
    267267#else
    … …  
    271271
    272272    case Cursor::Progress:
    273 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     273#if !defined(BUILDING_ON_SNOW_LEOPARD)
    274274        m_platformCursor = wkCursor("BusyButClickable");
    275275#else
    … …  
    307307
    308308    case Cursor::ZoomIn:
    309 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     309#if !defined(BUILDING_ON_SNOW_LEOPARD)
    310310        m_platformCursor = wkCursor("ZoomIn");
    311311        if (m_platformCursor)
    … …  
    316316
    317317    case Cursor::ZoomOut:
    318 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     318#if !defined(BUILDING_ON_SNOW_LEOPARD)
    319319        m_platformCursor = wkCursor("ZoomOut");
    320320        if (m_platformCursor)

  • trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm

    r119546 r121529  
    3434#import <wtf/FastMalloc.h>
    3535
    36 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(IOS)
     36#if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(IOS)
    3737#import "WebCoreSystemInterface.h"
    3838#import <notify.h>
    … …  
    4343namespace WebCore {
    4444
    45 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     45#if !defined(BUILDING_ON_SNOW_LEOPARD)
    4646
    4747#if !PLATFORM(IOS)

  • trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm

    r106422 r121529  
    157157    uint32_t phase = PlatformWheelEventPhaseNone;
    158158
    159 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     159#if !defined(BUILDING_ON_SNOW_LEOPARD)
    160160    if ([event momentumPhase] & NSEventPhaseBegan)
    161161        phase |= PlatformWheelEventPhaseBegan;
    … …  
    190190static PlatformWheelEventPhase phaseForEvent(NSEvent *event)
    191191{
    192 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     192#if !defined(BUILDING_ON_SNOW_LEOPARD)
    193193    uint32_t phase = PlatformWheelEventPhaseNone;
    194194    if ([event phase] & NSEventPhaseBegan)

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

    r117129 r121529  
    110110
    111111extern void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *);
    112 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     112#if !defined(BUILDING_ON_SNOW_LEOPARD)
    113113extern void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef, void (^block)(CGRect rect));
    114114#endif
    … …  
    216216extern BOOL (*wkUseSharedMediaUI)();
    217217
    218 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     218#if !defined(BUILDING_ON_SNOW_LEOPARD)
    219219extern void* wkGetHyphenationLocationBeforeIndex;
    220220#else
    … …  
    233233extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
    234234
    235 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     235#if !defined(BUILDING_ON_SNOW_LEOPARD)
    236236
    237237extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
    … …  
    297297extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
    298298   
    299 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     299#if !defined(BUILDING_ON_SNOW_LEOPARD)
    300300#import <dispatch/dispatch.h>
    301301
    … …  
    309309#endif
    310310
    311 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     311#if !defined(BUILDING_ON_SNOW_LEOPARD)
    312312extern void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
    313313#endif

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

    r117129 r121529  
    2929
    3030void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *);
    31 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     31#if !defined(BUILDING_ON_SNOW_LEOPARD)
    3232void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
    3333#endif
    … …  
    126126bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t);
    127127
    128 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     128#if !defined(BUILDING_ON_SNOW_LEOPARD)
    129129void* wkGetHyphenationLocationBeforeIndex;
    130130#else
    … …  
    134134
    135135CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
    136 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     136#if !defined(BUILDING_ON_SNOW_LEOPARD)
    137137CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
    138138
    … …  
    179179void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
    180180
    181 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     181#if !defined(BUILDING_ON_SNOW_LEOPARD)
    182182dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
    183183#endif
    … …  
    188188#endif
    189189
    190 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     190#if !defined(BUILDING_ON_SNOW_LEOPARD)
    191191void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
    192192#endif

  • trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

    r120339 r121529  
    513513    ASSERT(challenge.nsURLAuthenticationChallenge());
    514514
    515 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOWLEOPARD)
     515#if !defined(BUILDING_ON_SNOWLEOPARD)
    516516    // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels
    517517    // CFNetwork authentication dialog, and we shouldn't ask the client to display another one in that case.

  • trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm

    r116473 r121529  
    8383    m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
    8484
    85 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     85#if !defined(BUILDING_ON_SNOW_LEOPARD)
    8686    if (ResourceRequest::httpPipeliningEnabled())
    8787        m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority([m_nsRequest.get() _CFURLRequest]));
    … …  
    130130
    131131
    132 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     132#if !defined(BUILDING_ON_SNOW_LEOPARD)
    133133    if (ResourceRequest::httpPipeliningEnabled())
    134134        wkSetHTTPPipeliningPriority([nsRequest _CFURLRequest], toHTTPPipeliningPriority(m_priority));

  • trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp

    r95901 r121529  
    2727#include "Hyphenation.h"
    2828
    29 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     29#if !defined(BUILDING_ON_SNOW_LEOPARD)
    3030
    3131#include "AtomicStringKeyedMRUCache.h"
    … …  
    7777} // namespace WebCore
    7878
    79 #endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     79#endif // !defined(BUILDING_ON_SNOW_LEOPARD)

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r120554 r121529  
    21122112bool RenderThemeMac::shouldShowPlaceholderWhenFocused() const
    21132113{
    2114 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     2114#if !defined(BUILDING_ON_SNOW_LEOPARD)
    21152115    return true;
    21162116#else

  • trunk/Source/WebKit/mac/ChangeLog

    r121381 r121529  
     12012-06-29  Eric Seidel  <eric@webkit.org>
     2
     3        Remove more BUILDING_ON_LEOPARD branches now that no port builds on Leopard
     4        https://bugs.webkit.org/show_bug.cgi?id=90252
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * DefaultDelegates/WebDefaultContextMenuDelegate.mm:
     9        (-[WebDefaultUIDelegate menuItemWithTag:target:representedObject:]):
     10        * Misc/WebNSControlExtras.m:
     11        (-[NSControl sizeToFitAndAdjustWindowHeight]):
     12        * WebCoreSupport/WebEditorClient.mm:
     13        (WebEditorClient::shouldEraseMarkersAfterChangeSelection):
     14        (WebEditorClient::getGuessesForWord):
     15        * WebCoreSupport/WebFrameLoaderClient.mm:
     16        (WebFrameLoaderClient::dispatchDidFirstLayout):
     17        (WebFrameLoaderClient::provisionalLoadStarted):
     18        * WebCoreSupport/WebSystemInterface.mm:
     19        (InitWebCoreSystemInterface):
     20        * WebView/WebDynamicScrollBarsView.mm:
     21        (-[WebDynamicScrollBarsView scrollWheel:]):
     22        * WebView/WebFullScreenController.mm:
     23        (-[WebFullScreenController finishedEnterFullScreenAnimation:]):
     24        (-[WebFullScreenController exitFullScreen]):
     25        * WebView/WebHTMLView.mm:
     26        (-[WebHTMLView _pasteWithPasteboard:allowPlainText:]):
     27        * WebView/WebView.mm:
     28        (+[WebView initialize]):
     29        (-[WebView _deviceScaleFactor]):
     30
    1312012-06-25  Mark Hahnenberg  <mhahnenberg@apple.com>
    232

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

    r86793 r121529  
    9090            break;
    9191        case WebMenuItemTagSearchWeb: {
    92 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     92#if !defined(BUILDING_ON_SNOW_LEOPARD)
    9393            RetainPtr<CFStringRef> searchProviderName(AdoptCF, WKCopyDefaultSearchProviderDisplayName());
    9494            title = [NSString stringWithFormat:UI_STRING_INTERNAL("Search with %@", "Search with search provider context menu item with provider name inserted"), searchProviderName.get()];

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

    r93040 r121529  
    4747
    4848    CGFloat backingScaleFactor;
    49 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     49#if !defined(BUILDING_ON_SNOW_LEOPARD)
    5050    backingScaleFactor = [window backingScaleFactor];
    5151#else

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

    r119687 r121529  
    7575using namespace HTMLNames;
    7676
    77 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     77#if !defined(BUILDING_ON_SNOW_LEOPARD)
    7878@interface NSSpellChecker (WebNSSpellCheckerDetails)
    7979- (NSString *)languageForWordRange:(NSRange)range inString:(NSString *)string orthography:(NSOrthography *)orthography;
    … …  
    699699{
    700700    // This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
    701 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     701#if !defined(BUILDING_ON_SNOW_LEOPARD)
    702702    return type != TextCheckingTypeSpelling;
    703703#else
    … …  
    896896void WebEditorClient::getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) {
    897897    guesses.clear();
    898 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     898#if !defined(BUILDING_ON_SNOW_LEOPARD)
    899899    NSString* language = nil;
    900900    NSOrthography* orthography = nil;

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

    r119543 r121529  
    669669    if ([getWebView(m_webFrame.get()) drawsBackground])
    670670        [scrollView setDrawsBackground:YES];
    671 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     671#if !defined(BUILDING_ON_SNOW_LEOPARD)
    672672    [scrollView setVerticalScrollElasticity:NSScrollElasticityAutomatic];
    673673    [scrollView setHorizontalScrollElasticity:NSScrollElasticityAutomatic];
    … …  
    10881088    WebDynamicScrollBarsView *scrollView = [m_webFrame->_private->webFrameView _scrollView];
    10891089    [scrollView setDrawsBackground:NO];
    1090 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     1090#if !defined(BUILDING_ON_SNOW_LEOPARD)
    10911091    [scrollView setVerticalScrollElasticity:NSScrollElasticityNone];
    10921092    [scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];

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

    r117129 r121529  
    4444
    4545    INIT(AdvanceDefaultButtonPulseAnimation);
    46 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     46#if !defined(BUILDING_ON_SNOW_LEOPARD)
    4747    INIT(CALayerEnumerateRectsBeingDrawnWithBlock);
    4848#endif
    … …  
    127127    INIT(CreateCTLineWithUniCharProvider);
    128128
    129 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     129#if !defined(BUILDING_ON_SNOW_LEOPARD)
    130130    INIT(IOSurfaceContextCreate);
    131131    INIT(IOSurfaceContextCreateImage);
    … …  
    175175    // FIXME: We should stop using this file in Chromium.
    176176
    177 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     177#if !defined(BUILDING_ON_SNOW_LEOPARD)
    178178    INIT(CreateVMPressureDispatchOnMainQueue);
    179179#endif
    … …  
    184184#endif
    185185
    186 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     186#if !defined(BUILDING_ON_SNOW_LEOPARD)
    187187    INIT(CGPathAddRoundedRect);
    188188#endif

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

    r104331 r121529  
    523523    WKGetWheelEventDeltas(event, &deltaX, &deltaY, &isContinuous);
    524524
    525 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     525#if !defined(BUILDING_ON_SNOW_LEOPARD)
    526526    NSEventPhase momentumPhase = [event momentumPhase];
    527527    BOOL isLatchingEvent = momentumPhase & NSEventPhaseBegan || momentumPhase & NSEventPhaseStationary;

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

    r116173 r121529  
    274274       
    275275        NSWindow *webWindow = [_webViewPlaceholder.get() window];
    276 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     276#if !defined(BUILDING_ON_SNOW_LEOPARD)
    277277        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
    278278        // behavior here, making sure to reset the animation behavior afterward.
    … …  
    281281#endif
    282282        [webWindow orderOut:self];
    283 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     283#if !defined(BUILDING_ON_SNOW_LEOPARD)
    284284        [webWindow setAnimationBehavior:animationBehavior];
    285285#endif
    … …  
    324324   
    325325    NSWindow* webWindow = [_webViewPlaceholder.get() window];
    326 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     326#if !defined(BUILDING_ON_SNOW_LEOPARD)
    327327    // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
    328328    // behavior here, making sure to reset the animation behavior afterward.
    … …  
    339339    } else
    340340        [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
    341 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     341#if !defined(BUILDING_ON_SNOW_LEOPARD)
    342342    [webWindow setAnimationBehavior:animationBehavior];
    343343#endif

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

    r120357 r121529  
    876876    Frame* coreFrame = core([self _frame]);
    877877   
    878 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     878#if !defined(BUILDING_ON_SNOW_LEOPARD)
    879879    DOMDocumentFragment *fragment = [self _documentFragmentFromPasteboard:pasteboard inContext:range allowPlainText:allowPlainText];
    880880    if (fragment && [self _shouldInsertFragment:fragment replacingDOMRange:range givenAction:WebViewInsertActionPasted])

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

    r121381 r121529  
    30563056#endif
    30573057
    3058 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     3058#if !defined(BUILDING_ON_SNOW_LEOPARD)
    30593059    if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticTextReplacementEnabled])
    30603060        automaticTextReplacementEnabled = [NSSpellChecker isAutomaticTextReplacementEnabled];
    … …  
    57005700    NSWindow *window = [self window];
    57015701    NSWindow *hostWindow = [self hostWindow];
    5702 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     5702#if !defined(BUILDING_ON_SNOW_LEOPARD)
    57035703    if (window)
    57045704        return [window backingScaleFactor];

  • trunk/Source/WebKit2/ChangeLog

    r121518 r121529  
     12012-06-29  Eric Seidel  <eric@webkit.org>
     2
     3        Remove more BUILDING_ON_LEOPARD branches now that no port builds on Leopard
     4        https://bugs.webkit.org/show_bug.cgi?id=90252
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * UIProcess/mac/WKFullScreenWindowController.mm:
     9        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
     10        (-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:WebCore::finalFrame:WebCore::]):
     11        * WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm:
     12        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     13        (InitWebCoreSystemInterface):
     14
    1152012-06-28  MORITA Hajime  <morrita@google.com>
    216

  • trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

    r120376 r121529  
    296296
    297297        NSWindow *webWindow = [_webViewPlaceholder.get() window];
    298 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     298#if !defined(BUILDING_ON_SNOW_LEOPARD)
    299299        // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
    300300        // behavior here, making sure to reset the animation behavior afterward.
    … …  
    303303#endif
    304304        [webWindow orderOut:self];
    305 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     305#if !defined(BUILDING_ON_SNOW_LEOPARD)
    306306        [webWindow setAnimationBehavior:animationBehavior];
    307307#endif
    … …  
    353353   
    354354    NSWindow* webWindow = [_webViewPlaceholder.get() window];
    355 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     355#if !defined(BUILDING_ON_SNOW_LEOPARD)
    356356    // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that
    357357    // behavior here, making sure to reset the animation behavior afterward.
    … …  
    369369        [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
    370370   
    371 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     371#if !defined(BUILDING_ON_SNOW_LEOPARD)
    372372    [webWindow setAnimationBehavior:animationBehavior];
    373373#endif

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm

    r117212 r121529  
    2929#if ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)
    3030
    31 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     31#if !defined(BUILDING_ON_SNOW_LEOPARD)
    3232
    3333#import "PluginProcess.h"
    … …  
    191191}
    192192
    193 #endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     193#endif // !defined(BUILDING_ON_SNOW_LEOPARD)
    194194
    195195#endif // ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS)

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r119347 r121529  
    166166#endif
    167167
    168 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     168#if !defined(BUILDING_ON_SNOW_LEOPARD)
    169169        INIT(CGPathAddRoundedRect);
    170170#endif
Note: See TracChangeset for help on using the changeset viewer.