Changeset 121529 in webkit
- Timestamp:
- Jun 29, 2012 1:28:15 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r121524 r121529 1 2012-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 1 13 2012-06-29 Eric Seidel <eric@webkit.org> 2 14 -
trunk/Source/WTF/wtf/FastMalloc.cpp
r120256 r121529 4658 4658 , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher. 4659 4659 #endif 4660 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) || OS(IOS)4660 #if !defined(BUILDING_ON_SNOW_LEOPARD) || OS(IOS) 4661 4661 , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher. 4662 4662 #endif -
trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp
r111778 r121529 62 62 #if OS(DARWIN) && USE(CF) 63 63 // 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) 65 65 RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent()); 66 66 CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier); -
trunk/Source/WebCore/ChangeLog
r121528 r121529 1 2012-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 1 39 2012-06-27 Vsevolod Vlasov <vsevik@chromium.org> 2 40 -
trunk/Source/WebCore/platform/LocalizedStrings.cpp
r121524 r121529 73 73 } 74 74 75 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)75 #if !defined(BUILDING_ON_SNOW_LEOPARD) 76 76 static String truncatedStringForLookupMenuItem(const String& original) 77 77 { -
trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp
r111600 r121529 237 237 void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius) 238 238 { 239 #if PLATFORM(MAC) && (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))239 #if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) 240 240 bool equalWidths = (topLeftRadius.width() == topRightRadius.width() && topRightRadius.width() == bottomLeftRadius.width() && bottomLeftRadius.width() == bottomRightRadius.width()); 241 241 bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height()); -
trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
r120156 r121529 60 60 loadFont(nsFont, size, m_font, cgFont); 61 61 62 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)62 #if !defined(BUILDING_ON_SNOW_LEOPARD) 63 63 // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might 64 64 // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont(). … … 151 151 152 152 m_cgFont.adoptCF(cgFont); 153 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)153 #if !defined(BUILDING_ON_SNOW_LEOPARD) 154 154 { 155 155 CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font)); -
trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
r120122 r121529 40 40 #endif 41 41 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 #endif50 51 42 @interface WebCascadeList : NSArray { 52 43 @private … … 219 210 static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); 220 211 221 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)212 #if !defined(BUILDING_ON_SNOW_LEOPARD) 222 213 ProviderInfo info = { cp, length, stringAttributes.get() }; 223 214 RetainPtr<CTTypesetterRef> typesetter(AdoptCF, wkCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions)); -
trunk/Source/WebCore/platform/graphics/mac/FontMac.mm
r107012 r121529 120 120 CGContextShowGlyphsWithAdvances(context, glyphs, advances, count); 121 121 } 122 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)122 #if !defined(BUILDING_ON_SNOW_LEOPARD) 123 123 else { 124 124 if (!count) -
trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
r112816 r121529 83 83 84 84 #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) 86 86 static NSString* pathFromFont(NSFont*) 87 87 { -
trunk/Source/WebCore/platform/mac/CursorMac.mm
r96777 r121529 86 86 87 87 case Cursor::Hand: 88 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)88 #if !defined(BUILDING_ON_SNOW_LEOPARD) 89 89 m_platformCursor = [NSCursor pointingHandCursor]; 90 90 #else … … 100 100 101 101 case Cursor::Wait: 102 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)102 #if !defined(BUILDING_ON_SNOW_LEOPARD) 103 103 m_platformCursor = wkCursor("BusyButClickable"); 104 104 #else … … 108 108 109 109 case Cursor::Help: 110 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)110 #if !defined(BUILDING_ON_SNOW_LEOPARD) 111 111 m_platformCursor = wkCursor("Help"); 112 112 if (m_platformCursor) … … 118 118 case Cursor::Move: 119 119 case Cursor::MiddlePanning: 120 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)120 #if !defined(BUILDING_ON_SNOW_LEOPARD) 121 121 m_platformCursor = wkCursor("Move"); 122 122 #else … … 127 127 case Cursor::EastResize: 128 128 case Cursor::EastPanning: 129 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)129 #if !defined(BUILDING_ON_SNOW_LEOPARD) 130 130 m_platformCursor = wkCursor("ResizeEast"); 131 131 #else … … 136 136 case Cursor::NorthResize: 137 137 case Cursor::NorthPanning: 138 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)138 #if !defined(BUILDING_ON_SNOW_LEOPARD) 139 139 m_platformCursor = wkCursor("ResizeNorth"); 140 140 #else … … 145 145 case Cursor::NorthEastResize: 146 146 case Cursor::NorthEastPanning: 147 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)147 #if !defined(BUILDING_ON_SNOW_LEOPARD) 148 148 m_platformCursor = wkCursor("ResizeNortheast"); 149 149 #else … … 154 154 case Cursor::NorthWestResize: 155 155 case Cursor::NorthWestPanning: 156 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)156 #if !defined(BUILDING_ON_SNOW_LEOPARD) 157 157 m_platformCursor = wkCursor("ResizeNorthwest"); 158 158 #else … … 163 163 case Cursor::SouthResize: 164 164 case Cursor::SouthPanning: 165 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)165 #if !defined(BUILDING_ON_SNOW_LEOPARD) 166 166 m_platformCursor = wkCursor("ResizeSouth"); 167 167 #else … … 172 172 case Cursor::SouthEastResize: 173 173 case Cursor::SouthEastPanning: 174 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)174 #if !defined(BUILDING_ON_SNOW_LEOPARD) 175 175 m_platformCursor = wkCursor("ResizeSoutheast"); 176 176 #else … … 181 181 case Cursor::SouthWestResize: 182 182 case Cursor::SouthWestPanning: 183 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)183 #if !defined(BUILDING_ON_SNOW_LEOPARD) 184 184 m_platformCursor = wkCursor("ResizeSouthwest"); 185 185 #else … … 189 189 190 190 case Cursor::WestResize: 191 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)191 #if !defined(BUILDING_ON_SNOW_LEOPARD) 192 192 m_platformCursor = wkCursor("ResizeWest"); 193 193 #else … … 197 197 198 198 case Cursor::NorthSouthResize: 199 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)199 #if !defined(BUILDING_ON_SNOW_LEOPARD) 200 200 m_platformCursor = wkCursor("ResizeNorthSouth"); 201 201 #else … … 206 206 case Cursor::EastWestResize: 207 207 case Cursor::WestPanning: 208 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)208 #if !defined(BUILDING_ON_SNOW_LEOPARD) 209 209 m_platformCursor = wkCursor("ResizeEastWest"); 210 210 #else … … 214 214 215 215 case Cursor::NorthEastSouthWestResize: 216 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)216 #if !defined(BUILDING_ON_SNOW_LEOPARD) 217 217 m_platformCursor = wkCursor("ResizeNortheastSouthwest"); 218 218 #else … … 222 222 223 223 case Cursor::NorthWestSouthEastResize: 224 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)224 #if !defined(BUILDING_ON_SNOW_LEOPARD) 225 225 m_platformCursor = wkCursor("ResizeNorthwestSoutheast"); 226 226 #else … … 238 238 239 239 case Cursor::VerticalText: 240 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)240 #if !defined(BUILDING_ON_SNOW_LEOPARD) 241 241 m_platformCursor = [NSCursor IBeamCursorForVerticalLayout]; 242 242 #else … … 246 246 247 247 case Cursor::Cell: 248 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)248 #if !defined(BUILDING_ON_SNOW_LEOPARD) 249 249 m_platformCursor = wkCursor("Cell"); 250 250 if (m_platformCursor) … … 263 263 264 264 case Cursor::Alias: 265 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)265 #if !defined(BUILDING_ON_SNOW_LEOPARD) 266 266 m_platformCursor = wkCursor("MakeAlias"); 267 267 #else … … 271 271 272 272 case Cursor::Progress: 273 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)273 #if !defined(BUILDING_ON_SNOW_LEOPARD) 274 274 m_platformCursor = wkCursor("BusyButClickable"); 275 275 #else … … 307 307 308 308 case Cursor::ZoomIn: 309 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)309 #if !defined(BUILDING_ON_SNOW_LEOPARD) 310 310 m_platformCursor = wkCursor("ZoomIn"); 311 311 if (m_platformCursor) … … 316 316 317 317 case Cursor::ZoomOut: 318 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)318 #if !defined(BUILDING_ON_SNOW_LEOPARD) 319 319 m_platformCursor = wkCursor("ZoomOut"); 320 320 if (m_platformCursor) -
trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
r119546 r121529 34 34 #import <wtf/FastMalloc.h> 35 35 36 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(IOS)36 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(IOS) 37 37 #import "WebCoreSystemInterface.h" 38 38 #import <notify.h> … … 43 43 namespace WebCore { 44 44 45 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)45 #if !defined(BUILDING_ON_SNOW_LEOPARD) 46 46 47 47 #if !PLATFORM(IOS) -
trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
r106422 r121529 157 157 uint32_t phase = PlatformWheelEventPhaseNone; 158 158 159 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)159 #if !defined(BUILDING_ON_SNOW_LEOPARD) 160 160 if ([event momentumPhase] & NSEventPhaseBegan) 161 161 phase |= PlatformWheelEventPhaseBegan; … … 190 190 static PlatformWheelEventPhase phaseForEvent(NSEvent *event) 191 191 { 192 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)192 #if !defined(BUILDING_ON_SNOW_LEOPARD) 193 193 uint32_t phase = PlatformWheelEventPhaseNone; 194 194 if ([event phase] & NSEventPhaseBegan) -
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h
r117129 r121529 110 110 111 111 extern void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *); 112 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)112 #if !defined(BUILDING_ON_SNOW_LEOPARD) 113 113 extern void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef, void (^block)(CGRect rect)); 114 114 #endif … … 216 216 extern BOOL (*wkUseSharedMediaUI)(); 217 217 218 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)218 #if !defined(BUILDING_ON_SNOW_LEOPARD) 219 219 extern void* wkGetHyphenationLocationBeforeIndex; 220 220 #else … … 233 233 extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*); 234 234 235 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)235 #if !defined(BUILDING_ON_SNOW_LEOPARD) 236 236 237 237 extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); … … 297 297 extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path); 298 298 299 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)299 #if !defined(BUILDING_ON_SNOW_LEOPARD) 300 300 #import <dispatch/dispatch.h> 301 301 … … 309 309 #endif 310 310 311 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)311 #if !defined(BUILDING_ON_SNOW_LEOPARD) 312 312 extern void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight); 313 313 #endif -
trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
r117129 r121529 29 29 30 30 void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *); 31 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)31 #if !defined(BUILDING_ON_SNOW_LEOPARD) 32 32 void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect)); 33 33 #endif … … 126 126 bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t); 127 127 128 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)128 #if !defined(BUILDING_ON_SNOW_LEOPARD) 129 129 void* wkGetHyphenationLocationBeforeIndex; 130 130 #else … … 134 134 135 135 CTLineRef (*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) 137 137 CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); 138 138 … … 179 179 void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path); 180 180 181 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)181 #if !defined(BUILDING_ON_SNOW_LEOPARD) 182 182 dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void); 183 183 #endif … … 188 188 #endif 189 189 190 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)190 #if !defined(BUILDING_ON_SNOW_LEOPARD) 191 191 void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight); 192 192 #endif -
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
r120339 r121529 513 513 ASSERT(challenge.nsURLAuthenticationChallenge()); 514 514 515 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOWLEOPARD)515 #if !defined(BUILDING_ON_SNOWLEOPARD) 516 516 // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels 517 517 // 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 83 83 m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies]; 84 84 85 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)85 #if !defined(BUILDING_ON_SNOW_LEOPARD) 86 86 if (ResourceRequest::httpPipeliningEnabled()) 87 87 m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority([m_nsRequest.get() _CFURLRequest])); … … 130 130 131 131 132 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)132 #if !defined(BUILDING_ON_SNOW_LEOPARD) 133 133 if (ResourceRequest::httpPipeliningEnabled()) 134 134 wkSetHTTPPipeliningPriority([nsRequest _CFURLRequest], toHTTPPipeliningPriority(m_priority)); -
trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp
r95901 r121529 27 27 #include "Hyphenation.h" 28 28 29 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)29 #if !defined(BUILDING_ON_SNOW_LEOPARD) 30 30 31 31 #include "AtomicStringKeyedMRUCache.h" … … 77 77 } // namespace WebCore 78 78 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 2112 2112 bool RenderThemeMac::shouldShowPlaceholderWhenFocused() const 2113 2113 { 2114 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)2114 #if !defined(BUILDING_ON_SNOW_LEOPARD) 2115 2115 return true; 2116 2116 #else -
trunk/Source/WebKit/mac/ChangeLog
r121381 r121529 1 2012-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 1 31 2012-06-25 Mark Hahnenberg <mhahnenberg@apple.com> 2 32 -
trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
r86793 r121529 90 90 break; 91 91 case WebMenuItemTagSearchWeb: { 92 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)92 #if !defined(BUILDING_ON_SNOW_LEOPARD) 93 93 RetainPtr<CFStringRef> searchProviderName(AdoptCF, WKCopyDefaultSearchProviderDisplayName()); 94 94 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 47 47 48 48 CGFloat backingScaleFactor; 49 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)49 #if !defined(BUILDING_ON_SNOW_LEOPARD) 50 50 backingScaleFactor = [window backingScaleFactor]; 51 51 #else -
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
r119687 r121529 75 75 using namespace HTMLNames; 76 76 77 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)77 #if !defined(BUILDING_ON_SNOW_LEOPARD) 78 78 @interface NSSpellChecker (WebNSSpellCheckerDetails) 79 79 - (NSString *)languageForWordRange:(NSRange)range inString:(NSString *)string orthography:(NSOrthography *)orthography; … … 699 699 { 700 700 // 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) 702 702 return type != TextCheckingTypeSpelling; 703 703 #else … … 896 896 void WebEditorClient::getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) { 897 897 guesses.clear(); 898 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)898 #if !defined(BUILDING_ON_SNOW_LEOPARD) 899 899 NSString* language = nil; 900 900 NSOrthography* orthography = nil; -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r119543 r121529 669 669 if ([getWebView(m_webFrame.get()) drawsBackground]) 670 670 [scrollView setDrawsBackground:YES]; 671 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)671 #if !defined(BUILDING_ON_SNOW_LEOPARD) 672 672 [scrollView setVerticalScrollElasticity:NSScrollElasticityAutomatic]; 673 673 [scrollView setHorizontalScrollElasticity:NSScrollElasticityAutomatic]; … … 1088 1088 WebDynamicScrollBarsView *scrollView = [m_webFrame->_private->webFrameView _scrollView]; 1089 1089 [scrollView setDrawsBackground:NO]; 1090 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)1090 #if !defined(BUILDING_ON_SNOW_LEOPARD) 1091 1091 [scrollView setVerticalScrollElasticity:NSScrollElasticityNone]; 1092 1092 [scrollView setHorizontalScrollElasticity:NSScrollElasticityNone]; -
trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
r117129 r121529 44 44 45 45 INIT(AdvanceDefaultButtonPulseAnimation); 46 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)46 #if !defined(BUILDING_ON_SNOW_LEOPARD) 47 47 INIT(CALayerEnumerateRectsBeingDrawnWithBlock); 48 48 #endif … … 127 127 INIT(CreateCTLineWithUniCharProvider); 128 128 129 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)129 #if !defined(BUILDING_ON_SNOW_LEOPARD) 130 130 INIT(IOSurfaceContextCreate); 131 131 INIT(IOSurfaceContextCreateImage); … … 175 175 // FIXME: We should stop using this file in Chromium. 176 176 177 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)177 #if !defined(BUILDING_ON_SNOW_LEOPARD) 178 178 INIT(CreateVMPressureDispatchOnMainQueue); 179 179 #endif … … 184 184 #endif 185 185 186 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)186 #if !defined(BUILDING_ON_SNOW_LEOPARD) 187 187 INIT(CGPathAddRoundedRect); 188 188 #endif -
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
r104331 r121529 523 523 WKGetWheelEventDeltas(event, &deltaX, &deltaY, &isContinuous); 524 524 525 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)525 #if !defined(BUILDING_ON_SNOW_LEOPARD) 526 526 NSEventPhase momentumPhase = [event momentumPhase]; 527 527 BOOL isLatchingEvent = momentumPhase & NSEventPhaseBegan || momentumPhase & NSEventPhaseStationary; -
trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm
r116173 r121529 274 274 275 275 NSWindow *webWindow = [_webViewPlaceholder.get() window]; 276 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)276 #if !defined(BUILDING_ON_SNOW_LEOPARD) 277 277 // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that 278 278 // behavior here, making sure to reset the animation behavior afterward. … … 281 281 #endif 282 282 [webWindow orderOut:self]; 283 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)283 #if !defined(BUILDING_ON_SNOW_LEOPARD) 284 284 [webWindow setAnimationBehavior:animationBehavior]; 285 285 #endif … … 324 324 325 325 NSWindow* webWindow = [_webViewPlaceholder.get() window]; 326 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)326 #if !defined(BUILDING_ON_SNOW_LEOPARD) 327 327 // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that 328 328 // behavior here, making sure to reset the animation behavior afterward. … … 339 339 } else 340 340 [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) 342 342 [webWindow setAnimationBehavior:animationBehavior]; 343 343 #endif -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r120357 r121529 876 876 Frame* coreFrame = core([self _frame]); 877 877 878 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)878 #if !defined(BUILDING_ON_SNOW_LEOPARD) 879 879 DOMDocumentFragment *fragment = [self _documentFragmentFromPasteboard:pasteboard inContext:range allowPlainText:allowPlainText]; 880 880 if (fragment && [self _shouldInsertFragment:fragment replacingDOMRange:range givenAction:WebViewInsertActionPasted]) -
trunk/Source/WebKit/mac/WebView/WebView.mm
r121381 r121529 3056 3056 #endif 3057 3057 3058 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)3058 #if !defined(BUILDING_ON_SNOW_LEOPARD) 3059 3059 if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticTextReplacementEnabled]) 3060 3060 automaticTextReplacementEnabled = [NSSpellChecker isAutomaticTextReplacementEnabled]; … … 5700 5700 NSWindow *window = [self window]; 5701 5701 NSWindow *hostWindow = [self hostWindow]; 5702 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)5702 #if !defined(BUILDING_ON_SNOW_LEOPARD) 5703 5703 if (window) 5704 5704 return [window backingScaleFactor]; -
trunk/Source/WebKit2/ChangeLog
r121518 r121529 1 2012-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 1 15 2012-06-28 MORITA Hajime <morrita@google.com> 2 16 -
trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
r120376 r121529 296 296 297 297 NSWindow *webWindow = [_webViewPlaceholder.get() window]; 298 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)298 #if !defined(BUILDING_ON_SNOW_LEOPARD) 299 299 // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that 300 300 // behavior here, making sure to reset the animation behavior afterward. … … 303 303 #endif 304 304 [webWindow orderOut:self]; 305 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)305 #if !defined(BUILDING_ON_SNOW_LEOPARD) 306 306 [webWindow setAnimationBehavior:animationBehavior]; 307 307 #endif … … 353 353 354 354 NSWindow* webWindow = [_webViewPlaceholder.get() window]; 355 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)355 #if !defined(BUILDING_ON_SNOW_LEOPARD) 356 356 // In Lion, NSWindow will animate into and out of orderOut operations. Suppress that 357 357 // behavior here, making sure to reset the animation behavior afterward. … … 369 369 [webWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]]; 370 370 371 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)371 #if !defined(BUILDING_ON_SNOW_LEOPARD) 372 372 [webWindow setAnimationBehavior:animationBehavior]; 373 373 #endif -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.mm
r117212 r121529 29 29 #if ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS) 30 30 31 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)31 #if !defined(BUILDING_ON_SNOW_LEOPARD) 32 32 33 33 #import "PluginProcess.h" … … 191 191 } 192 192 193 #endif // !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)193 #endif // !defined(BUILDING_ON_SNOW_LEOPARD) 194 194 195 195 #endif // ENABLE(NETSCAPE_PLUGIN_API) && ENABLE(PLUGIN_PROCESS) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
r119347 r121529 166 166 #endif 167 167 168 #if !defined(BUILDING_ON_ LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)168 #if !defined(BUILDING_ON_SNOW_LEOPARD) 169 169 INIT(CGPathAddRoundedRect); 170 170 #endif
Note: See TracChangeset
for help on using the changeset viewer.