Remove some dead code.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Apr 2011 09:21:38 +0000 (09:21 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Apr 2011 09:21:38 +0000 (09:21 +0000)
Rubber-stamped by Timothy Hatcher.

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

169 files changed:
Source/JavaScriptCore/API/JSContextRef.cpp
Source/JavaScriptCore/wtf/FastMalloc.cpp
Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
Source/JavaScriptCore/wtf/Platform.h
Source/JavaScriptCore/wtf/VMTags.h
Source/JavaScriptCore/wtf/mac/MainThreadMac.mm
Source/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
Source/WebCore/WebCore.exp.in
Source/WebCore/accessibility/AccessibilityList.h
Source/WebCore/accessibility/AccessibilityTable.h
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
Source/WebCore/bindings/objc/DOMHTML.mm
Source/WebCore/bindings/objc/DOMInternal.mm
Source/WebCore/bindings/objc/DOMObject.h
Source/WebCore/bindings/objc/WebScriptObject.mm
Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
Source/WebCore/bridge/objc/objc_instance.mm
Source/WebCore/config.h
Source/WebCore/css/CSSImportRule.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/editing/Editor.cpp
Source/WebCore/editing/SpellingCorrectionController.h
Source/WebCore/editing/TypingCommand.cpp
Source/WebCore/editing/mac/EditorMac.mm
Source/WebCore/html/HTMLLinkElement.cpp
Source/WebCore/loader/EmptyClients.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/mac/DocumentLoaderMac.cpp
Source/WebCore/page/ContextMenuController.cpp
Source/WebCore/page/EditorClient.h
Source/WebCore/page/mac/PageMac.cpp
Source/WebCore/platform/DefaultLocalizationStrategy.cpp
Source/WebCore/platform/SuddenTermination.h
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/Gradient.h
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
Source/WebCore/platform/graphics/cg/ImageCG.cpp
Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Source/WebCore/platform/graphics/mac/ComplexTextController.h
Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
Source/WebCore/platform/graphics/mac/FontCacheMac.mm
Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
Source/WebCore/platform/graphics/mac/FontMac.mm
Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm
Source/WebCore/platform/graphics/mac/IconMac.mm
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
Source/WebCore/platform/graphics/wx/FontPlatformData.h
Source/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp
Source/WebCore/platform/mac/ClipboardMac.mm
Source/WebCore/platform/mac/CookieJar.mm
Source/WebCore/platform/mac/DragDataMac.mm
Source/WebCore/platform/mac/EmptyProtocolDefinitions.h
Source/WebCore/platform/mac/FileSystemMac.mm
Source/WebCore/platform/mac/HTMLConverter.h
Source/WebCore/platform/mac/HTMLConverter.mm
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebCore/platform/mac/PopupMenuMac.mm
Source/WebCore/platform/mac/PurgeableBufferMac.cpp
Source/WebCore/platform/mac/SharedBufferMac.mm
Source/WebCore/platform/mac/SharedTimerMac.mm
Source/WebCore/platform/mac/SuddenTermination.mm
Source/WebCore/platform/mac/WebCoreObjCExtras.mm
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebCore/platform/mac/WebFontCache.mm
Source/WebCore/platform/mac/WidgetMac.mm
Source/WebCore/platform/network/Credential.h
Source/WebCore/platform/network/cf/DNSCFNet.cpp
Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebCore/platform/network/cf/SocketStreamHandle.h
Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
Source/WebCore/platform/network/mac/AuthenticationMac.mm
Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
Source/WebCore/platform/network/mac/ResourceHandleMac.mm
Source/WebCore/platform/network/mac/ResourceRequestMac.mm
Source/WebCore/platform/network/mac/ResourceResponseMac.mm
Source/WebCore/platform/text/TextBreakIteratorICU.cpp
Source/WebCore/platform/text/TextChecking.h
Source/WebCore/platform/text/TextEncodingDetectorICU.cpp
Source/WebCore/platform/text/cf/HyphenationCF.cpp
Source/WebCore/platform/text/cf/StringImplCF.cpp
Source/WebCore/platform/text/mac/HyphenationMac.mm
Source/WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm
Source/WebCore/rendering/RenderLayerBacking.cpp
Source/WebCore/rendering/RenderText.cpp
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebCore/rendering/break_lines.cpp
Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm
Source/WebKit/mac/Carbon/HIWebView.mm
Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
Source/WebKit/mac/History/WebBackForwardList.mm
Source/WebKit/mac/History/WebHistoryItem.mm
Source/WebKit/mac/MigrateHeaders.make
Source/WebKit/mac/Misc/WebElementDictionary.mm
Source/WebKit/mac/Misc/WebKitErrors.m
Source/WebKit/mac/Misc/WebKitNSStringExtras.mm
Source/WebKit/mac/Misc/WebNSFileManagerExtras.h
Source/WebKit/mac/Misc/WebNSFileManagerExtras.m
Source/WebKit/mac/Misc/WebTypesInternal.h
Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebBasePluginPackage.mm
Source/WebKit/mac/Plugins/WebNetscapePluginPackage.h
Source/WebKit/mac/Plugins/WebNetscapePluginView.h
Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
Source/WebKit/mac/WebCoreSupport/CorrectionPanel.h
Source/WebKit/mac/WebCoreSupport/CorrectionPanel.mm
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebCoreSupport/WebEditorClient.h
Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit/mac/WebView/WebArchive.mm
Source/WebKit/mac/WebView/WebClipView.mm
Source/WebKit/mac/WebView/WebDataSource.mm
Source/WebKit/mac/WebView/WebDocumentLoaderMac.mm
Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebFrameInternal.h
Source/WebKit/mac/WebView/WebFrameView.mm
Source/WebKit/mac/WebView/WebFullScreenController.mm
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit/mac/WebView/WebHTMLViewInternal.h
Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebResource.mm
Source/WebKit/mac/WebView/WebResourceInternal.h
Source/WebKit/mac/WebView/WebScriptDebugDelegate.h
Source/WebKit/mac/WebView/WebTextIterator.mm
Source/WebKit/mac/WebView/WebVideoFullscreenController.mm
Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h
Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewData.mm
Source/WebKit/mac/WebView/WebViewEventHandling.mm
Source/WebKit/mac/WebView/WebViewPrivate.h
Source/WebKit/mac/WebView/WebWindowAnimation.m
Source/WebKit2/Shared/mac/PasteboardTypes.mm
Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
Source/WebKit2/UIProcess/mac/WebContextMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h
Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
Tools/DumpRenderTree/cf/WebArchiveDumpSupport.cpp
Tools/DumpRenderTree/config.h
Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
Tools/DumpRenderTree/mac/CheckedMalloc.cpp
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
Tools/DumpRenderTree/mac/EventSendingController.mm
Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm
Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm
WebKitLibraries/WebKitSystemInterface.h

index 03d0622..a35e422 100644 (file)
@@ -66,7 +66,7 @@ JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 #if OS(DARWIN)
     // When running on Tiger or Leopard, or if the application was linked before JSGlobalContextCreate was changed
     // to use a unique JSGlobalData, we use a shared one for compatibility.
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
 #else
     {
index 5a9826f..83602ab 100644 (file)
 #endif
 
 // Use a background thread to periodically scavenge memory to release back to the system
-// https://bugs.webkit.org/show_bug.cgi?id=27900: don't turn this on for Tiger until we have figured out why it caused a crash.
-#if defined(BUILDING_ON_TIGER)
-#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0
-#else
 #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
-#endif
 
 #ifndef NDEBUG
 namespace WTF {
@@ -4584,10 +4579,10 @@ extern "C" {
 malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
     &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
 #endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
 #endif
 
index 5546cef..b623b96 100644 (file)
@@ -54,10 +54,8 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo
 
     int flags = MAP_PRIVATE | MAP_ANON;
 
-#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
+#if OS(DARWIN)
     int fd = usage;
-#else
-    int fd = -1;
 #endif
 
     void* result = 0;
index 7639b15..7b5c29f 100644 (file)
 
 /* FIXME: BUILDING_ON_.., and TARGETING... macros should be folded into the OS() system */
 #include <AvailabilityMacros.h>
-#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-#define BUILDING_ON_TIGER 1
-#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 #define BUILDING_ON_LEOPARD 1
 #elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 #define BUILDING_ON_SNOW_LEOPARD 1
 #endif
-#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-#define TARGETING_TIGER 1
-#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
 #define TARGETING_LEOPARD 1
 #elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
 #define TARGETING_SNOW_LEOPARD 1
 #endif
 
 #if PLATFORM(MAC) && !PLATFORM(IOS)
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER) && CPU(X86_64)
+#ifndef BUILDING_ON_LEOPARD
 #define WTF_USE_PLUGIN_HOST_PROCESS 1
 #endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #define ENABLE_GESTURE_EVENTS 1
 #define ENABLE_RUBBER_BANDING 1
 #define WTF_USE_WK_SCROLLBAR_PAINTER 1
 #define WTF_USE_CF 1
 #endif
 
-#if OS(DARWIN) && !defined(BUILDING_ON_TIGER) && !PLATFORM(GTK) && !PLATFORM(QT)
+#if OS(DARWIN) && !PLATFORM(GTK) && !PLATFORM(QT)
 #define ENABLE_PURGEABLE_MEMORY 1
 #endif
 
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
 #if OS(DARWIN)
 #define WTF_USE_CF 1
-#ifndef BUILDING_ON_TIGER
 #define WTF_USE_CORE_TEXT 1
 #define ENABLE_WEB_ARCHIVE 1
-#else
-#define WTF_USE_ATSUI 1
-#endif
 #endif
 #endif
 
 #define HAVE_SYS_TIMEB_H 1
 #define WTF_USE_ACCELERATE 1
 
-#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
+#ifndef TARGETING_LEOPARD
 
 #define HAVE_DISPATCH_H 1
 #define HAVE_HOSTED_CORE_ANIMATION 1
 
 #if PLATFORM(MAC)
 /* Complex text framework */
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 #define WTF_USE_ATSUI 0
 #define WTF_USE_CORE_TEXT 1
 #else
 #endif
 
 /* Accelerated compositing */
-#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO))
+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO))
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 
-#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
+#if (PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
 #define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
 #endif
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #define WTF_USE_AVFOUNDATION 1
 #endif
 
index 6600050..117bc37 100644 (file)
@@ -32,8 +32,6 @@
 
 #include <mach/vm_statistics.h>
 
-#if !defined(TARGETING_TIGER)
-
 #if defined(VM_MEMORY_TCMALLOC)
 #define VM_TAG_FOR_TCMALLOC_MEMORY VM_MAKE_TAG(VM_MEMORY_TCMALLOC)
 #else
 #define VM_TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(65)
 #endif // defined(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
 
-#else // !defined(TARGETING_TIGER)
-
-// mmap on Tiger fails with tags that work on Leopard, so fall
-// back to Tiger-compatible tags (that also work on Leopard)
-// when targeting Tiger.
-#define VM_TAG_FOR_TCMALLOC_MEMORY -1
-#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
-#define VM_TAG_FOR_REGISTERFILE_MEMORY -1
-
-#endif // !defined(TARGETING_TIGER)
-
-// Tags for vm_map and vm_allocate work on both Tiger and Leopard.
-
 #if defined(VM_MEMORY_JAVASCRIPT_CORE)
 #define VM_TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_CORE)
 #else
index 17363bc..82b9dce 100644 (file)
@@ -59,16 +59,12 @@ static NSThread* mainThreadNSThread;
 
 void initializeMainThreadPlatform()
 {
-#if !defined(BUILDING_ON_TIGER)
     ASSERT(!staticMainThreadCaller);
     staticMainThreadCaller = [[WTFMainThreadCaller alloc] init];
 
     mainThreadEstablishedAsPthreadMain = false;
     mainThreadPthread = pthread_self();
     mainThreadNSThread = [[NSThread currentThread] retain];
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
 void initializeMainThreadToProcessMainThreadPlatform()
@@ -117,12 +113,8 @@ void scheduleDispatchFunctionsOnMainThread()
         return;
     }
 
-#if !defined(BUILDING_ON_TIGER)
     ASSERT(mainThreadNSThread);
     [staticMainThreadCaller performSelector:@selector(call) onThread:mainThreadNSThread withObject:nil waitUntilDone:NO];
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
 bool isMainThread()
@@ -132,13 +124,8 @@ bool isMainThread()
         return pthread_main_np();
     }
 
-#if !defined(BUILDING_ON_TIGER)
     ASSERT(mainThreadPthread);
     return pthread_equal(pthread_self(), mainThreadPthread);
-#else
-    ASSERT_NOT_REACHED();
-    return false;
-#endif
 }
 
 } // namespace WTF
index ca27ba2..348693f 100644 (file)
@@ -61,7 +61,7 @@ PassOwnPtr<Collator> Collator::userDefault()
 {
 #if OS(DARWIN) && USE(CF)
     // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
+#if !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
     RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
     CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
 #else
index 70a7165..91f7b46 100644 (file)
@@ -1410,7 +1410,7 @@ __ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
 __ZN7WebCore20LogNotYetImplementedE
 #endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 _wkContentAreaDidHide
 _wkContentAreaDidShow
 _wkContentAreaResized
@@ -1779,21 +1779,6 @@ __ZNK7WebCore15ProtectionSpace20authenticationSchemeEv
 .objc_class_name_DOMSVGForeignObjectElement
 #endif
 
-#if defined(BUILDING_ON_TIGER)
-_wkClearGlyphVector
-_wkConvertCharToGlyphs
-_wkCopyFullFontName
-_wkGetATSStyleGroup
-_wkGetCGFontFromNSFont
-_wkGetFontMetrics
-_wkGetGlyphVectorFirstRecord
-_wkGetGlyphVectorNumGlyphs
-_wkGetGlyphVectorRecordSize
-_wkGetNSFontATSUFontId
-_wkInitializeGlyphVector
-_wkReleaseStyleGroup
-_wkSupportsMultipartXMixedReplace
-#endif
 
 #if ENABLE(VIDEO)
 __ZN7WebCore16HTMLMediaElement12endScrubbingEv
@@ -1856,7 +1841,7 @@ __ZN7WebCore23ApplicationCacheStorage5emptyEv
 __ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
 #endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 __ZN7WebCore6Editor13lowercaseWordEv
 __ZN7WebCore6Editor13uppercaseWordEv
 __ZN7WebCore6Editor14capitalizeWordEv
index b7265b2..de5e96d 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef AccessibilityList_h
 #define AccessibilityList_h
 
-#if PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD))
+#if PLATFORM(MAC) && defined(BUILDING_ON_LEOPARD)
 #define ACCESSIBILITY_LISTS 0
 #else
 #define ACCESSIBILITY_LISTS 1
index 1666367..be041be 100644 (file)
@@ -32,7 +32,7 @@
 #include "AccessibilityRenderObject.h"
 #include <wtf/Forward.h>
 
-#if PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD))
+#if PLATFORM(MAC) && defined(BUILDING_ON_LEOPARD)
 #define ACCESSIBILITY_TABLES 0
 #else
 #define ACCESSIBILITY_TABLES 1
index 27c4e93..4cd58e5 100644 (file)
@@ -71,7 +71,7 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotific
                 macNotification = NSAccessibilityFocusedUIElementChangedNotification;                
             break;
         case AXAutocorrectionOccured:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
             macNotification = @"AXAutocorrectionOccurred";
             break;
 #else
@@ -104,7 +104,7 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotific
         case AXRowCountChanged:
             macNotification = NSAccessibilityRowCountChangedNotification;
             break;
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
         case AXRowExpanded:
             macNotification = NSAccessibilityRowExpandedNotification;
             break;
index 25afc18..8877862 100644 (file)
@@ -169,11 +169,6 @@ using namespace std;
 #define NSAccessibilityPlaceholderValueAttribute @"AXPlaceholderValue"
 #endif
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#define NSAccessibilityValueDescriptionAttribute @"AXValueDescription"
-#define NSAccessibilityTimelineSubrole @"AXTimeline"
-#endif
 
 @interface NSObject (WebKitAccessibilityArrayCategory)
 
@@ -1256,10 +1251,8 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
         { RulerRole, NSAccessibilityRulerRole },
         { RulerMarkerRole, NSAccessibilityRulerMarkerRole },
         { LinkRole, NSAccessibilityLinkRole },
-#ifndef BUILDING_ON_TIGER        
         { DisclosureTriangleRole, NSAccessibilityDisclosureTriangleRole },
         { GridRole, NSAccessibilityGridRole },
-#endif
         { WebCoreLinkRole, NSAccessibilityLinkRole }, 
         { ImageMapLinkRole, NSAccessibilityLinkRole },
         { ImageMapRole, @"AXImageMap" },
index 92588e1..0d94c8d 100644 (file)
 
 @end
 
-#ifdef BUILDING_ON_TIGER
-@implementation DOMHTMLDocument (DOMHTMLDocumentOverrides)
-
-- (DOMNode *)firstChild
-{
-    WebCore::HTMLDocument* coreHTMLDocument = core(self);
-    if (!coreHTMLDocument->page() || !coreHTMLDocument->page()->settings()->needsTigerMailQuirks())
-        return kit(coreHTMLDocument->firstChild());
-
-    WebCore::Node* child = coreHTMLDocument->firstChild();
-    while (child && child->nodeType() == WebCore::Node::DOCUMENT_TYPE_NODE)
-        child = child->nextSibling();
-    
-    return kit(child);
-}
-
-@end
-#endif
 
 @implementation DOMHTMLInputElement (FormAutoFillTransition)
 
index 590d653..bebd33f 100644 (file)
@@ -39,14 +39,10 @@ static NSMapTable* DOMWrapperCache;
 
 NSMapTable* createWrapperCache()
 {
-#ifdef BUILDING_ON_TIGER
-    return NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSNonRetainedObjectMapValueCallBacks, 0);
-#else
     // NSMapTable with zeroing weak pointers is the recommended way to build caches like this under garbage collection.
     NSPointerFunctionsOptions keyOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality;
     NSPointerFunctionsOptions valueOptions = NSPointerFunctionsZeroingWeakMemory | NSPointerFunctionsObjectPersonality;
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
-#endif
 }
 
 NSObject* getDOMWrapper(DOMObjectInternal* impl)
index c4a3f6f..ba2ebc2 100644 (file)
@@ -43,11 +43,7 @@ typedef struct DOMObjectInternal DOMObjectInternal;
 @end
 
 @interface DOMObject (DOMLinkStyle)
-#ifndef BUILDING_ON_TIGER
 @property(readonly, retain) DOMStyleSheet *sheet;
-#else
-- (DOMStyleSheet *)sheet;
-#endif
 @end
 
 #endif
index d2ef25d..37f2010 100644 (file)
@@ -52,9 +52,6 @@
 #import <runtime/Completion.h>
 #import <wtf/Threading.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#endif
 
 using namespace JSC;
 using namespace JSC::Bindings;
@@ -112,9 +109,7 @@ static void addExceptionToConsole(ExecState* exec)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 + (id)scriptObjectForJSObject:(JSObjectRef)jsObject originRootObject:(RootObject*)originRootObject rootObject:(RootObject*)rootObject
index ab64132..ebdced4 100644 (file)
@@ -205,7 +205,7 @@ JSValue JavaInstance::invokeMethod(ExecState* exec, RuntimeMethod* runtimeMethod
 
 // This is a deprecated code path which should not be required on Android.
 // Remove this guard once Bug 39476 is fixed.
-#if PLATFORM(ANDROID) || defined(BUILDING_ON_TIGER)
+#if PLATFORM(ANDROID)
     if (!handled)
         result = callJNIMethod(m_instance->m_instance, jMethod->returnType(), jMethod->name().utf8().data(), jMethod->signature(), jArgs.data());
 #endif
index 61c67cb..546d8eb 100644 (file)
@@ -54,14 +54,10 @@ static NSMapTable *s_instanceWrapperCache;
 
 static NSMapTable *createInstanceWrapperCache()
 {
-#ifdef BUILDING_ON_TIGER
-    return NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0);
-#else
     // NSMapTable with zeroing weak pointers is the recommended way to build caches like this under garbage collection.
     NSPointerFunctionsOptions keyOptions = NSPointerFunctionsZeroingWeakMemory | NSPointerFunctionsOpaquePersonality;
     NSPointerFunctionsOptions valueOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality;
     return [[NSMapTable alloc] initWithKeyOptions:keyOptions valueOptions:valueOptions capacity:0];
-#endif
 }
 
 RuntimeObject* ObjcInstance::newRuntimeObject(ExecState* exec)
index 91f4a85..001753e 100644 (file)
@@ -238,10 +238,6 @@ typedef float CGFloat;
 #endif
 #endif /* USE(CG) */
 
-#ifdef BUILDING_ON_TIGER
-#undef ENABLE_FTPDIR
-#define ENABLE_FTPDIR 0
-#endif
 
 #if PLATFORM(WIN) && USE(CG)
 #define WTF_USE_SAFARI_THEME 1
index 81ade39..5c53ebd 100644 (file)
@@ -67,7 +67,7 @@ void CSSImportRule::setCSSStyleSheet(const String& href, const KURL& baseURL, co
     bool enforceMIMEType = strict;
     bool needsSiteSpecificQuirks = parent && parent->document() && parent->document()->settings() && parent->document()->settings()->needsSiteSpecificQuirks();
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if (enforceMIMEType && needsSiteSpecificQuirks) {
         // Covers both http and https, with or without "www."
         if (baseURL.string().contains("mcafee.com/japan/", false))
index 6920c54..a35c445 100644 (file)
@@ -333,9 +333,9 @@ static bool acceptsEditingFocus(Node* node)
 
 static bool disableRangeMutation(Page* page)
 {
-    // This check is made on super-hot code paths, so we only want this on Tiger and Leopard.
-#if defined(TARGETING_TIGER) || defined(TARGETING_LEOPARD)
-    // Disable Range mutation on document modifications in Tiger and Leopard Mail
+    // This check is made on super-hot code paths, so we only want this on Leopard.
+#ifdef TARGETING_LEOPARD
+    // Disable Range mutation on document modifications in Leopard Mail.
     // See <rdar://problem/5865171>
     return page && (page->settings()->needsLeopardMailQuirks() || page->settings()->needsTigerMailQuirks());
 #else
index af62537..c691378 100644 (file)
@@ -1927,14 +1927,10 @@ void Editor::showSpellingGuessPanel()
         return;
     }
 
-#ifndef BUILDING_ON_TIGER
-    // Post-Tiger, this menu item is a show/hide toggle, to match AppKit. Leave Tiger behavior alone
-    // to match rest of OS X.
     if (client()->spellingUIIsShowing()) {
         client()->showSpellingUI(false);
         return;
     }
-#endif
     
     advanceToNextMisspelling(true);
     client()->showSpellingUI(true);
@@ -3174,9 +3170,9 @@ void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, Sel
             }
         }
 
-#if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
+#if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
         // This only erases markers that are in the first unit (word or sentence) of the selection.
-        // Perhaps peculiar, but it matches AppKit on these Mac OSX versions.
+        // Perhaps peculiar, but it matches AppKit on these Mac OS X versions.
         if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
             m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
 #endif
index bf3c414..b63edd5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef SpellingCorrectionController_h
 #define SpellingCorrectionController_h
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 // Some platforms provide UI for suggesting autocorrection.
 #define SUPPORT_AUTOCORRECTION_PANEL 1
 // Some platforms use spelling and autocorrection markers to provide visual cue.
@@ -35,7 +35,7 @@
 #else
 #define SUPPORT_AUTOCORRECTION_PANEL 0
 #define REMOVE_MARKERS_UPON_EDITING 0
-#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
 #include "DocumentMarker.h"
 #include "EditCommand.h"
index 48b52ae..4d48e6c 100644 (file)
@@ -321,7 +321,7 @@ EditAction TypingCommand::editingAction() const
 
 void TypingCommand::markMisspellingsAfterTyping(ETypingCommand commandType)
 {
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
     if (!document()->frame()->editor()->isContinuousSpellCheckingEnabled()
      && !document()->frame()->editor()->isAutomaticQuoteSubstitutionEnabled()
      && !document()->frame()->editor()->isAutomaticLinkDetectionEnabled()
@@ -356,7 +356,7 @@ void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedT
 {
     updatePreservesTypingStyle(commandTypeForAddedTyping);
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
     document()->frame()->editor()->appliedEditing(this);
     // Since the spellchecking code may also perform corrections and other replacements, it should happen after the typing changes.
     if (!m_shouldPreventSpellChecking)
index 60bfe6c..3833bca 100644 (file)
@@ -67,7 +67,7 @@ void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
     bool choosePlainText;
     
     m_frame->editor()->client()->setInsertionPasteboard([NSPasteboard generalPasteboard]);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     RefPtr<DocumentFragment> fragment = pasteboard->documentFragment(m_frame, range, allowPlainText, choosePlainText);
     if (fragment && shouldInsertFragment(fragment, range, EditorInsertActionPasted))
         pasteAsFragment(fragment, canSmartReplaceWithPasteboard(pasteboard), false);
index 039d12f..2531f33 100644 (file)
@@ -359,7 +359,7 @@ void HTMLLinkElement::setCSSStyleSheet(const String& href, const KURL& baseURL,
     if (enforceMIMEType && document()->page() && !document()->page()->settings()->enforceCSSMIMETypeInNoQuirksMode())
         enforceMIMEType = false;
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if (enforceMIMEType && needsSiteSpecificQuirks) {
         // Covers both http and https, with or without "www."
         if (baseURL.string().contains("mcafee.com/japan/", false))
index 033256a..8015204 100644 (file)
@@ -490,11 +490,8 @@ public:
     virtual void setInsertionPasteboard(NSPasteboard*) { };
     virtual NSURL* canonicalizeURL(NSURL*) { return 0; }
     virtual NSURL* canonicalizeURLString(NSString*) { return 0; }
-#ifdef BUILDING_ON_TIGER
-    virtual NSArray* pasteboardTypesForSelection(Frame*) { return 0; }
 #endif
-#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
     virtual void uppercaseWord() { }
     virtual void lowercaseWord() { }
     virtual void capitalizeWord() { }
index bafa7c2..56db550 100644 (file)
@@ -2058,12 +2058,8 @@ void FrameLoader::transitionToCommitted(PassRefPtr<CachedPage> cachedPage)
 
         case FrameLoadTypeStandard:
             history()->updateForStandardLoad();
-#ifndef BUILDING_ON_TIGER
-            // This code was originally added for a Leopard performance imporvement. We decided to 
-            // ifdef it to fix correctness issues on Tiger documented in <rdar://problem/5441823>.
             if (m_frame->view())
                 m_frame->view()->setScrollbarsSuppressed(true);
-#endif
             m_client->transitionToCommittedForNewPage();
             break;
 
index cedf52b..a750a21 100644 (file)
@@ -42,9 +42,6 @@
 #include "HTMLFormElement.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
-#if PLATFORM(QT)
-#include "PluginDatabase.h"
-#endif
 #include "ResourceError.h"
 #include "ResourceHandle.h"
 #include "ResourceLoadScheduler.h"
 #include "Settings.h"
 #include <wtf/CurrentTime.h>
 
+#if PLATFORM(QT)
+#include "PluginDatabase.h"
+#endif
+
 // FIXME: More that is in common with SubresourceLoader should move up into ResourceLoader.
 
 namespace WebCore {
@@ -429,7 +430,7 @@ void MainResourceLoader::didReceiveData(const char* data, int length, long long
 
     ASSERT(!m_response.isNull());
 
-#if USE(CFNETWORK) || (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER))
+#if USE(CFNETWORK) || PLATFORM(MAC)
     // Workaround for <rdar://problem/6060782>
     if (m_response.isNull()) {
         m_response = ResourceResponse(KURL(), "text/html", 0, String(), String());
index 8cc40d2..0288b0d 100644 (file)
@@ -35,7 +35,6 @@
 
 namespace WebCore {
 
-#ifndef BUILDING_ON_TIGER
 static void scheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair)
 {
     const ResourceLoaderSet copy = loaders;
@@ -53,32 +52,23 @@ static void unscheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair)
         if (ResourceHandle* handle = (*it)->handle())
             handle->unschedule(pair);
 }
-#endif
 
 void DocumentLoader::schedule(SchedulePair* pair)
 {
-#ifndef BUILDING_ON_TIGER
     if (m_mainResourceLoader && m_mainResourceLoader->handle())
         m_mainResourceLoader->handle()->schedule(pair);
     scheduleAll(m_subresourceLoaders, pair);
     scheduleAll(m_plugInStreamLoaders, pair);
     scheduleAll(m_multipartSubresourceLoaders, pair);
-#else
-    UNUSED_PARAM(pair);
-#endif
 }
 
 void DocumentLoader::unschedule(SchedulePair* pair)
 {
-#ifndef BUILDING_ON_TIGER
     if (m_mainResourceLoader && m_mainResourceLoader->handle())
         m_mainResourceLoader->handle()->unschedule(pair);
     unscheduleAll(m_subresourceLoaders, pair);
     unscheduleAll(m_plugInStreamLoaders, pair);
     unscheduleAll(m_multipartSubresourceLoaders, pair);
-#else
-    UNUSED_PARAM(pair);
-#endif
 }
 
 } // namespace
index dd51d31..97bde3b 100644 (file)
@@ -361,11 +361,9 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
     case ContextMenuItemTagCheckSpellingWhileTyping:
         frame->editor()->toggleContinuousSpellChecking();
         break;
-#ifndef BUILDING_ON_TIGER
     case ContextMenuItemTagCheckGrammarWithSpelling:
         frame->editor()->toggleGrammarChecking();
         break;
-#endif
 #if PLATFORM(MAC)
     case ContextMenuItemTagShowFonts:
         frame->editor()->showFontPanel();
@@ -377,7 +375,7 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
         frame->editor()->showColorPanel();
         break;
 #endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
     case ContextMenuItemTagMakeUpperCase:
         frame->editor()->uppercaseWord();
         break;
@@ -467,7 +465,6 @@ void ContextMenuController::createAndAppendFontSubMenu(ContextMenuItem& fontMenu
     fontMenuItem.setSubMenu(&fontMenu);
 }
 
-#if !defined(BUILDING_ON_TIGER)
 
 #if !PLATFORM(GTK)
 
@@ -504,27 +501,6 @@ void ContextMenuController::createAndAppendSpellingAndGrammarSubMenu(ContextMenu
 
 #endif // !PLATFORM(GTK)
 
-#else
-
-void ContextMenuController::createAndAppendSpellingAndGrammarSubMenu(ContextMenuItem& spellingAndGrammarMenuItem)
-{
-    ContextMenu spellingMenu;
-
-    ContextMenuItem showSpellingPanel(ActionType, ContextMenuItemTagShowSpellingPanel, 
-        contextMenuItemTagShowSpellingPanel(true));
-    ContextMenuItem checkSpelling(ActionType, ContextMenuItemTagCheckSpelling, 
-        contextMenuItemTagCheckSpelling());
-    ContextMenuItem checkAsYouType(CheckableActionType, ContextMenuItemTagCheckSpellingWhileTyping, 
-        contextMenuItemTagCheckSpellingWhileTyping());
-
-    appendItem(showSpellingPanel, &spellingMenu);
-    appendItem(checkSpelling, &spellingMenu);
-    appendItem(checkAsYouType, &spellingMenu);
-
-    spellingMenuItem.setSubMenu(&spellingMenu);
-}
-
-#endif
 
 #if PLATFORM(MAC)
 
@@ -578,7 +554,7 @@ void ContextMenuController::createAndAppendTextDirectionSubMenu(ContextMenuItem&
 
 #endif
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
 
 void ContextMenuController::createAndAppendSubstitutionsSubMenu(ContextMenuItem& substitutionsMenuItem)
 {
@@ -633,7 +609,7 @@ static bool selectionContainsPossibleWord(Frame* frame)
 }
 
 #if PLATFORM(MAC)
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 1
 #else
 #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 0
@@ -863,7 +839,7 @@ void ContextMenuController::populate()
                 } else
                     appendItem(IgnoreGrammarItem, m_contextMenu.get());
                 appendItem(*separatorItem(), m_contextMenu.get());
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
             } else {
                 // If the string was autocorrected, generate a contextual menu item allowing it to be changed back.
                 String replacedString = m_hitTestResult.replacedString();
@@ -923,7 +899,6 @@ void ContextMenuController::populate()
 #endif
 
         if (!inPasswordField) {
-#ifndef BUILDING_ON_TIGER
 #if !PLATFORM(GTK)
             appendItem(*separatorItem(), m_contextMenu.get());
             ContextMenuItem SpellingAndGrammarMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu, 
@@ -931,13 +906,7 @@ void ContextMenuController::populate()
             createAndAppendSpellingAndGrammarSubMenu(SpellingAndGrammarMenuItem);
             appendItem(SpellingAndGrammarMenuItem, m_contextMenu.get());
 #endif
-#else
-            ContextMenuItem SpellingMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu, 
-                contextMenuItemTagSpellingMenu());
-            createAndAppendSpellingSubMenu(SpellingMenuItem);
-            appendItem(SpellingMenuItem, m_contextMenu.get());
-#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
             ContextMenuItem substitutionsMenuItem(SubmenuType, ContextMenuItemTagSubstitutionsMenu, 
                 contextMenuItemTagSubstitutionsMenu());
             createAndAppendSubstitutionsSubMenu(substitutionsMenuItem);
@@ -1090,11 +1059,9 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
             shouldEnable = frame->selection()->isRange();
             break;
         case ContextMenuItemTagCheckGrammarWithSpelling:
-#ifndef BUILDING_ON_TIGER
             if (frame->editor()->isGrammarCheckingEnabled())
                 shouldCheck = true;
             shouldEnable = true;
-#endif
             break;
         case ContextMenuItemTagItalic: {
             shouldCheck = frame->editor()->selectionHasStyle(CSSPropertyFontStyle, "italic") != FalseTriState;
@@ -1110,12 +1077,10 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
             shouldEnable = false;
             break;
         case ContextMenuItemTagShowSpellingPanel:
-#ifndef BUILDING_ON_TIGER
             if (frame->editor()->spellingPanelIsShowing())
                 item.setTitle(contextMenuItemTagShowSpellingPanel(false));
             else
                 item.setTitle(contextMenuItemTagShowSpellingPanel(true));
-#endif
             shouldEnable = frame->editor()->canEdit();
             break;
         case ContextMenuItemTagNoGuessesFound:
@@ -1129,7 +1094,7 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
         case ContextMenuItemTagTransformationsMenu:
             break;
         case ContextMenuItemTagShowSubstitutions:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             if (frame->editor()->substitutionsPanelIsShowing())
                 item.setTitle(contextMenuItemTagShowSubstitutions(false));
             else
@@ -1144,32 +1109,32 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
             shouldEnable = frame->editor()->canEdit();
             break;
         case ContextMenuItemTagCorrectSpellingAutomatically:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->isAutomaticSpellingCorrectionEnabled();
 #endif
             break;
         case ContextMenuItemTagSmartCopyPaste:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->smartInsertDeleteEnabled();
 #endif
             break;
         case ContextMenuItemTagSmartQuotes:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->isAutomaticQuoteSubstitutionEnabled();
 #endif
             break;
         case ContextMenuItemTagSmartDashes:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->isAutomaticDashSubstitutionEnabled();
 #endif
             break;
         case ContextMenuItemTagSmartLinks:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->isAutomaticLinkDetectionEnabled();
 #endif
             break;
         case ContextMenuItemTagTextReplacement:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             shouldCheck = frame->editor()->isAutomaticTextReplacementEnabled();
 #endif
             break;
index de333e2..280c487 100644 (file)
@@ -132,12 +132,9 @@ public:
     virtual void setInsertionPasteboard(NSPasteboard*) = 0;
     virtual NSURL* canonicalizeURL(NSURL*) = 0;
     virtual NSURL* canonicalizeURLString(NSString*) = 0;
-#ifdef BUILDING_ON_TIGER
-    virtual NSArray* pasteboardTypesForSelection(Frame*) = 0;
-#endif
 #endif
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
     virtual void uppercaseWord() = 0;
     virtual void lowercaseWord() = 0;
     virtual void capitalizeWord() = 0;
index 0d2361f..573dae5 100644 (file)
@@ -43,14 +43,12 @@ void Page::addSchedulePair(PassRefPtr<SchedulePair> prpPair)
         m_scheduledRunLoopPairs = adoptPtr(new SchedulePairHashSet);
     m_scheduledRunLoopPairs->add(pair);
 
-#ifndef BUILDING_ON_TIGER
     for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader()->documentLoader())
             documentLoader->schedule(pair.get());
         if (DocumentLoader* documentLoader = frame->loader()->provisionalDocumentLoader())
             documentLoader->schedule(pair.get());
     }
-#endif
 
     // FIXME: make SharedTimerMac use these SchedulePairs.
 }
@@ -64,14 +62,12 @@ void Page::removeSchedulePair(PassRefPtr<SchedulePair> prpPair)
     RefPtr<SchedulePair> pair = prpPair;
     m_scheduledRunLoopPairs->remove(pair);
 
-#ifndef BUILDING_ON_TIGER
     for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader()->documentLoader())
             documentLoader->unschedule(pair.get());
         if (DocumentLoader* documentLoader = frame->loader()->provisionalDocumentLoader())
             documentLoader->unschedule(pair.get());
     }
-#endif
 }
 
 } // namespace
index 0a7dd42..633e1d5 100644 (file)
@@ -298,7 +298,7 @@ String DefaultLocalizationStrategy::contextMenuItemTagSearchWeb()
 
 String DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary(const String& selectedString)
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
     UNUSED_PARAM(selectedString);
     return WEB_UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item");
 #else
index 2c1cfe7..810fea7 100644 (file)
@@ -34,7 +34,7 @@ namespace WebCore {
     void disableSuddenTermination();
     void enableSuddenTermination();
 
-#if (!PLATFORM(MAC) || defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)) && !PLATFORM(CHROMIUM)
+#if (!PLATFORM(MAC) || defined(BUILDING_ON_LEOPARD)) && !PLATFORM(CHROMIUM)
     inline void disableSuddenTermination() { }
     inline void enableSuddenTermination() { }
 #endif
index ebb01aa..dae50a9 100644 (file)
@@ -62,9 +62,7 @@ class NSFont;
 #endif
 
 typedef struct CGFont* CGFontRef;
-#ifndef BUILDING_ON_TIGER
 typedef const struct __CTFont* CTFontRef;
-#endif
 
 #include <CoreFoundation/CFBase.h>
 #include <objc/objc-auto.h>
@@ -87,19 +85,17 @@ typedef struct HFONT__* HFONT;
 #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGFont* CGFontRef;
 #if OS(DARWIN)
-#ifndef BUILDING_ON_TIGER
 typedef const struct __CTFont* CTFontRef;
 typedef UInt32 ATSUFontID;
 typedef UInt32 ATSFontRef;
 #endif
 #endif
-#endif
 
 namespace WebCore {
 
 class FontDescription;
 
-#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
+#if OS(DARWIN)
 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef>(nsFont); }
 #endif
 
@@ -117,7 +113,7 @@ public:
 #elif OS(DARWIN)
         , m_font(hashTableDeletedFontValue())
 #endif
-#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
+#if USE(CG) && PLATFORM(WIN)
         , m_cgFont(0)
 #elif USE(CAIRO)
         , m_scaledFont(hashTableDeletedFontValue())
@@ -139,7 +135,7 @@ public:
 #if OS(DARWIN)
         , m_font(0)
 #endif
-#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
+#if USE(CG) && PLATFORM(WIN)
         , m_cgFont(0)
 #elif USE(CAIRO)
         , m_scaledFont(0)
@@ -164,7 +160,7 @@ public:
 #if OS(DARWIN)
         , m_font(0)
 #endif
-#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
+#if USE(CG) && PLATFORM(WIN)
         , m_cgFont(0)
 #elif USE(CAIRO)
         , m_scaledFont(0)
@@ -217,11 +213,7 @@ public:
 
 #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 #if OS(DARWIN)
-#ifndef BUILDING_ON_TIGER
     CGFontRef cgFont() const { return m_cgFont.get(); }
-#else
-    CGFontRef cgFont() const { return m_cgFont; }
-#endif
     CTFontRef ctFont() const;
 
     bool roundsGlyphAdvances() const;
@@ -332,11 +324,7 @@ private:
 #if PLATFORM(WIN)
     RetainPtr<CGFontRef> m_cgFont;
 #else
-#ifndef BUILDING_ON_TIGER
     RetainPtr<CGFontRef> m_cgFont;
-#else
-    CGFontRef m_cgFont; // It is not necessary to refcount this, since either an NSFont owns it or some CachedFont has it referenced.
-#endif
     mutable RetainPtr<CTFontRef> m_CTFont;
 #endif
 #endif
index ec22efe..e4e9c52 100644 (file)
@@ -39,7 +39,7 @@
 
 typedef struct CGContext* CGContextRef;
 
-#define USE_CG_SHADING defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#define USE_CG_SHADING defined(BUILDING_ON_LEOPARD)
 
 #if USE_CG_SHADING
 typedef struct CGShading* CGShadingRef;
index 67e864a..0fcc67b 100644 (file)
@@ -256,12 +256,6 @@ private:
     float m_syntheticBoldOffset;
 #endif
 
-#ifdef BUILDING_ON_TIGER
-public:
-    void* m_styleGroup;
-
-private:
-#endif
 
 #if USE(ATSUI)
 public:
index e7716c3..2597847 100644 (file)
@@ -45,7 +45,7 @@
 
 using namespace std;
 
-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
 
 namespace WebCore {
 
@@ -1263,7 +1263,7 @@ void GraphicsLayerCA::updateContentsImage()
 
         // FIXME: maybe only do trilinear if the image is being scaled down,
         // but then what if the layer size changes?
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
         m_contentsLayer->setMinificationFilter(PlatformCALayer::Trilinear);
 #endif
         m_contentsLayer->setContents(m_pendingContentsImage.get());
index c8ed948..f142325 100644 (file)
@@ -35,7 +35,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <wtf/UnusedParam.h>
 
-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
 
 using namespace WebCore;
 
index ae566c4..f335089 100644 (file)
@@ -41,7 +41,7 @@
 #import <wtf/CurrentTime.h>
 #import <wtf/UnusedParam.h>
 
-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
 
 using namespace WebCore;
 
@@ -91,7 +91,7 @@ static double mediaTimeToCurrentTime(CFTimeInterval t)
 
 @interface CALayer(Private)
 - (void)setContentsChanged;
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 - (void)setAcceleratesDrawing:(BOOL)flag;
 - (BOOL)acceleratesDrawing;
 #endif
@@ -557,7 +557,7 @@ void PlatformCALayer::setMasksToBounds(bool value)
 
 bool PlatformCALayer::acceleratesDrawing() const
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     return [m_layer.get() acceleratesDrawing];
 #else
     return false;
@@ -566,7 +566,7 @@ bool PlatformCALayer::acceleratesDrawing() const
 
 void PlatformCALayer::setAcceleratesDrawing(bool acceleratesDrawing)
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     BEGIN_BLOCK_OBJC_EXCEPTIONS
     [m_layer.get() setAcceleratesDrawing:acceleratesDrawing];
     END_BLOCK_OBJC_EXCEPTIONS
index b9fef00..04e3a1d 100644 (file)
 
 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 // Building on 10.6 or later: kCGInterpolationMedium is defined in the CGInterpolationQuality enum.
 #define HAVE_CG_INTERPOLATION_MEDIUM 1
 #endif
 
-#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
+#ifndef TARGETING_LEOPARD
 // Targeting 10.6 or later: use kCGInterpolationMedium.
 #define WTF_USE_CG_INTERPOLATION_MEDIUM 1
 #endif
@@ -93,7 +93,7 @@ CGColorSpaceRef deviceRGBColorSpaceRef()
 CGColorSpaceRef sRGBColorSpaceRef()
 {
     // FIXME: Windows should be able to use kCGColorSpaceSRGB, this is tracked by http://webkit.org/b/31363.
-#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
+#if PLATFORM(WIN)
     return deviceRGBColorSpaceRef();
 #else
     static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
@@ -104,7 +104,7 @@ CGColorSpaceRef sRGBColorSpaceRef()
 CGColorSpaceRef linearRGBColorSpaceRef()
 {
     // FIXME: Windows should be able to use kCGColorSpaceGenericRGBLinear, this is tracked by http://webkit.org/b/31363.
-#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
+#if PLATFORM(WIN)
     return deviceRGBColorSpaceRef();
 #else
     static CGColorSpaceRef linearRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGBLinear);
@@ -1353,7 +1353,7 @@ InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 void GraphicsContext::setAllowsFontSmoothing(bool allowsFontSmoothing)
 {
     UNUSED_PARAM(allowsFontSmoothing);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD)
     CGContextRef context = platformContext();
     CGContextSetAllowsFontSmoothing(context, allowsFontSmoothing);
 #endif
@@ -1457,7 +1457,6 @@ void GraphicsContext::setPlatformShouldSmoothFonts(bool enable)
     CGContextSetShouldSmoothFonts(platformContext(), enable);
 }
 
-#ifndef BUILDING_ON_TIGER // Tiger's setPlatformCompositeOperation() is defined in GraphicsContextMac.mm.
 void GraphicsContext::setPlatformCompositeOperation(CompositeOperator mode)
 {
     if (paintingDisabled())
@@ -1510,6 +1509,5 @@ void GraphicsContext::setPlatformCompositeOperation(CompositeOperator mode)
     }
     CGContextSetBlendMode(platformContext(), target);
 }
-#endif
 
 }
index 54169e6..51f2562 100644 (file)
@@ -29,7 +29,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/RetainPtr.h>
 
-#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
+#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
 #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
 #endif
 
index f404c4d..cf6539e 100644 (file)
@@ -299,11 +299,9 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
     // Adjust the color space.
     subImage = imageWithColorSpace(subImage.get(), styleColorSpace);
     
-#ifndef BUILDING_ON_TIGER
     // Leopard has an optimized call for the tiling of image patterns, but we can only use it if the image has been decoded enough that
     // its buffer is the same size as the overall image.  Because a partially decoded CGImageRef with a smaller width or height than the
     // overall image buffer needs to tile with "gaps", we can't use the optimized tiling call in that case.
-    // FIXME: Could create WebKitSystemInterface SPI for CGCreatePatternWithImage2 and probably make Tiger tile faster as well.
     // FIXME: We cannot use CGContextDrawTiledImage with scaled tiles on Leopard, because it suffers from rounding errors.  Snow Leopard is ok.
     float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
     float w = CGImageGetWidth(tileImage);
@@ -314,12 +312,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
 #endif
         CGContextDrawTiledImage(context, FloatRect(adjustedX, adjustedY, scaledTileWidth, scaledTileHeight), subImage.get());
     else {
-#endif
 
-    // On Leopard, this code now only runs for partially decoded images whose buffers do not yet match the overall size of the image.
-    // On Tiger this code runs all the time.  This code is suboptimal because the pattern does not reference the image directly, and the
-    // pattern is destroyed before exiting the function.  This means any decoding the pattern does doesn't end up cached anywhere, so we
-    // redecode every time we paint.
+    // On Leopard and newer, this code now only runs for partially decoded images whose buffers do not yet match the overall size of the image.
     static const CGPatternCallbacks patternCallbacks = { 0, drawPatternCallback, NULL };
     CGAffineTransform matrix = CGAffineTransformMake(narrowPrecisionToCGFloat(patternTransform.a()), 0, 0, narrowPrecisionToCGFloat(patternTransform.d()), adjustedX, adjustedY);
     matrix = CGAffineTransformConcat(matrix, CGContextGetCTM(context));
@@ -344,9 +338,7 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
     CGContextSetFillColorWithColor(context, color.get());
     CGContextFillRect(context, CGContextGetClipBoundingBox(context));
 
-#ifndef BUILDING_ON_TIGER
     }
-#endif
 
     stateSaver.restore();
 
index 1a630d4..f0776e4 100644 (file)
@@ -83,7 +83,7 @@ ImageSource::~ImageSource()
 
 void ImageSource::clear(bool destroyAllFrames, size_t, SharedBuffer* data, bool allDataReceived)
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD)
     // Recent versions of ImageIO discard previously decoded image frames if the client
     // application no longer holds references to them, so there's no need to throw away
     // the decoder unless we're explicitly asked to destroy all of the frames.
index 6a17707..7b66684 100644 (file)
@@ -37,11 +37,7 @@ enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidt
 void FontPlatformData::loadFont(NSFont* nsFont, float, NSFont*& outNSFont, CGFontRef& cgFont)
 {
     outNSFont = nsFont;
-#ifndef BUILDING_ON_TIGER
     cgFont = CTFontCopyGraphicsFont(toCTFontRef(nsFont), 0);
-#else
-    cgFont = wkGetCGFontFromNSFont(nsFont);
-#endif
 }
 #endif  // PLATFORM(MAC)
 
@@ -54,7 +50,7 @@ FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
     , m_size(size)
     , m_widthVariant(widthVariant)
     , m_font(nsFont)
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might
     // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont().
     , m_isColorBitmapFont(CTFontGetSymbolicTraits(toCTFontRef(nsFont)) & kCTFontColorGlyphsTrait)
@@ -70,11 +66,7 @@ FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
     if (m_font)
         CFRetain(m_font);
 
-#ifndef BUILDING_ON_TIGER
     m_cgFont.adoptCF(cgFont);
-#else
-    m_cgFont = cgFont;
-#endif
 }
 
 FontPlatformData:: ~FontPlatformData()
@@ -146,12 +138,8 @@ void FontPlatformData::setFont(NSFont *font)
     }
 #endif
     
-#ifndef BUILDING_ON_TIGER
     m_cgFont.adoptCF(cgFont);
-#else
-    m_cgFont = cgFont;
-#endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     m_isColorBitmapFont = CTFontGetSymbolicTraits(toCTFontRef(m_font)) & kCTFontColorGlyphsTrait;
 #endif
     m_CTFont = 0;
index 56c2f30..31f592a 100644 (file)
@@ -1608,7 +1608,7 @@ bool MediaPlayerPrivateGStreamer::hasSingleSecurityOrigin() const
 
 bool MediaPlayerPrivateGStreamer::supportsFullscreen() const
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD)
     // See <rdar://problem/7389945>
     return false;
 #else
index 281e49f..8c1017a 100644 (file)
@@ -110,9 +110,6 @@ private:
         ComplexTextRun(const SimpleFontData*, const UChar* characters, unsigned stringLocation, size_t stringLength, bool ltr);
 
 #if USE(ATSUI)
-#ifdef BUILDING_ON_TIGER
-        typedef UInt32 URefCon;
-#endif
         static OSStatus overrideLayoutOperation(ATSULayoutOperationSelector, ATSULineRef, URefCon, void*, ATSULayoutOperationCallbackStatus*);
 #endif
 
index 1473b1e..41a9635 100644 (file)
@@ -142,7 +142,7 @@ void ComplexTextController::collectComplexTextRunsForCharactersCoreText(const UC
         static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
         static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
         ProviderInfo info = { cp, length, fontData->getCFStringAttributes(m_font.typesettingFeatures(), fontData->platformData().orientation()) };
         RetainPtr<CTTypesetterRef> typesetter(AdoptCF, wkCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
 #else
index f7ae6b7..c71c411 100644 (file)
 #import <AppKit/AppKit.h>
 #import <wtf/StdLibExtras.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-#endif
 
 namespace WebCore {
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD)
 static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
 {
     ASSERT_UNUSED(observer, observer == fontCache());
@@ -61,7 +58,7 @@ static void fontCacheATSNotificationCallback(ATSFontNotificationInfoRef, void*)
 void FontCache::platformInit()
 {
     wkSetUpFontCache();
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD)
     CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, fontCacheRegisteredFontsChangedNotificationCallback, kCTFontManagerRegisteredFontsChangedNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);
 #else
     // kCTFontManagerRegisteredFontsChangedNotification does not exist on Leopard and earlier.
index 383adef..4bc6819 100644 (file)
@@ -31,7 +31,7 @@ namespace WebCore {
 
 FontCustomPlatformData::~FontCustomPlatformData()
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if (m_atsContainer)
         ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
 #endif
@@ -69,7 +69,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 
     RetainPtr<CGFontRef> cgFontRef;
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     RetainPtr<CFDataRef> bufferData(AdoptCF, buffer->createCFData());
     RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithCFData(bufferData.get()));
 
@@ -100,16 +100,14 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
     }
     
     cgFontRef.adoptCF(CGFontCreateWithPlatformFont(&fontRef));
-#ifndef BUILDING_ON_TIGER
     // Workaround for <rdar://problem/5675504>.
     if (cgFontRef && !CGFontGetNumberOfGlyphs(cgFontRef.get()))
         cgFontRef = 0;
-#endif
     if (!cgFontRef) {
         ATSFontDeactivate(containerRef, NULL, kATSOptionFlagsDefault);
         return 0;
     }
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD)
 
     return new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
 }
index 4c28ead..067d734 100644 (file)
@@ -119,7 +119,7 @@ static void showGlyphsWithAdvances(const FloatPoint& point, const SimpleFontData
         } else
             CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
     }
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     else {
         if (!count)
             return;
index 18d0dc5..04b72ba 100644 (file)
@@ -36,7 +36,6 @@
 
 namespace WebCore {
 
-#ifndef BUILDING_ON_TIGER
 static bool shouldUseCoreText(UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
 {
     if (fontData->platformData().widthVariant() != RegularWidth || fontData->hasVerticalGlyphs()) {
@@ -49,13 +48,11 @@ static bool shouldUseCoreText(UChar* buffer, unsigned bufferLength, const Simple
 
     return false;
 }
-#endif
 
 bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
 {
     bool haveGlyphs = false;
 
-#ifndef BUILDING_ON_TIGER
     if (!shouldUseCoreText(buffer, bufferLength, fontData)) {
         Vector<CGGlyph, 512> glyphs(bufferLength);
         wkGetGlyphsForCharacters(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
@@ -127,39 +124,6 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
             }
         }
     }
-#else
-    // Use an array of long so we get good enough alignment.
-    long glyphVector[(GLYPH_VECTOR_SIZE + sizeof(long) - 1) / sizeof(long)];
-    
-    OSStatus status = wkInitializeGlyphVector(GlyphPage::size, &glyphVector);
-    if (status != noErr)
-        // This should never happen, perhaps indicates a bad font!  If it does the
-        // font substitution code will find an alternate font.
-        return false;
-
-    wkConvertCharToGlyphs(fontData->m_styleGroup, buffer, bufferLength, &glyphVector);
-
-    unsigned numGlyphs = wkGetGlyphVectorNumGlyphs(&glyphVector);
-    if (numGlyphs != length) {
-        // This should never happen, perhaps indicates a bad font?
-        // If it does happen, the font substitution code will find an alternate font.
-        wkClearGlyphVector(&glyphVector);
-        return false;
-    }
-
-    ATSLayoutRecord* glyphRecord = (ATSLayoutRecord*)wkGetGlyphVectorFirstRecord(glyphVector);
-    for (unsigned i = 0; i < length; i++) {
-        Glyph glyph = glyphRecord->glyphID;
-        if (!glyph)
-            setGlyphDataForIndex(offset + i, 0, 0);
-        else {
-            setGlyphDataForIndex(offset + i, glyph, fontData);
-            haveGlyphs = true;
-        }
-        glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + wkGetGlyphVectorRecordSize(glyphVector));
-    }
-    wkClearGlyphVector(&glyphVector);
-#endif
 
     return haveGlyphs;
 }
index 2383006..076a5f2 100644 (file)
@@ -46,15 +46,9 @@ namespace WebCore {
 
 static void drawFocusRingToContext(CGContextRef context, CGPathRef focusRingPath, CGColorRef color, int radius)
 {
-#ifdef BUILDING_ON_TIGER
-    CGContextBeginTransparencyLayer(context, 0);
-#endif
     CGContextBeginPath(context);
     CGContextAddPath(context, focusRingPath);
     wkDrawFocusRing(context, color, radius);
-#ifdef BUILDING_ON_TIGER
-    CGContextEndTransparencyLayer(context);
-#endif
 }
 
 void GraphicsContext::drawFocusRing(const Path& path, int width, int /*offset*/, const Color& color)
@@ -87,17 +81,6 @@ void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int
     drawFocusRingToContext(platformContext(), focusRingPath.get(), colorRef, radius);
 }
 
-#ifdef BUILDING_ON_TIGER // Post-Tiger's setPlatformCompositeOperation() is defined in GraphicsContextCG.cpp.
-void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op)
-{
-    if (paintingDisabled())
-        return;
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    [[NSGraphicsContext graphicsContextWithGraphicsPort:platformContext() flipped:YES]
-        setCompositingOperation:(NSCompositingOperation)op];
-    [pool drain];
-}
-#endif
 
 static NSColor* createPatternColor(NSString* name, NSColor* defaultColor, bool& usingDot)
 {
@@ -142,7 +125,7 @@ void GraphicsContext::drawLineForTextChecking(const FloatPoint& point, float wid
             patternColor = grammarPatternColor.get();
             break;
         }
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
         // To support correction panel.
         case TextCheckingReplacementLineStyle:
         {
index bc8c312..17b6a28 100644 (file)
@@ -46,12 +46,7 @@ PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames)
         return 0;
 
     bool useIconFromFirstFile;
-#ifdef BUILDING_ON_TIGER
-    // FIXME: find a better image for multiple files to use on Tiger.
-    useIconFromFirstFile = true;
-#else
     useIconFromFirstFile = filenames.size() == 1;
-#endif
     if (useIconFromFirstFile) {
         // Don't pass relative filenames -- we don't want a result that depends on the current directory.
         // Need 0U here to disambiguate String::operator[] from operator(NSString*, int)[]
@@ -64,15 +59,11 @@ PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames)
 
         return adoptRef(new Icon(image));
     }
-#ifdef BUILDING_ON_TIGER
-    return 0;
-#else
     NSImage* image = [NSImage imageNamed:NSImageNameMultipleDocuments];
     if (!image)
         return 0;
 
     return adoptRef(new Icon(image));
-#endif
 }
 
 void Icon::paint(GraphicsContext* context, const IntRect& rect)
index 772c687..f24ce2a 100644 (file)
@@ -35,9 +35,6 @@
 #include "DocumentLoader.h"
 #endif
 
-#ifdef BUILDING_ON_TIGER
-#import "AutodrainedPool.h"
-#endif
 
 #import "BlockExceptions.h"
 #import "DocumentLoader.h"
 #import "RenderStyle.h"
 #endif
 
-#ifdef BUILDING_ON_TIGER
-static IMP method_setImplementation(Method m, IMP imp)
-{
-    IMP result = m->method_imp;
-    m->method_imp = imp;
-    return result;
-}
-#endif
 
 SOFT_LINK_FRAMEWORK(QTKit)
 
@@ -110,10 +99,8 @@ SOFT_LINK_POINTER(QTKit, QTMovieURLAttribute, NSString *)
 SOFT_LINK_POINTER(QTKit, QTMovieVolumeDidChangeNotification, NSString *)
 SOFT_LINK_POINTER(QTKit, QTSecurityPolicyNoCrossSiteAttribute, NSString *)
 SOFT_LINK_POINTER(QTKit, QTVideoRendererWebKitOnlyNewImageAvailableNotification, NSString *)
-#ifndef BUILDING_ON_TIGER
 SOFT_LINK_POINTER(QTKit, QTMovieApertureModeClean, NSString *)
 SOFT_LINK_POINTER(QTKit, QTMovieApertureModeAttribute, NSString *)
-#endif
 
 #define QTMovie getQTMovieClass()
 #define QTMovieView getQTMovieViewClass()
@@ -148,10 +135,8 @@ SOFT_LINK_POINTER(QTKit, QTMovieApertureModeAttribute, NSString *)
 #define QTMovieVolumeDidChangeNotification getQTMovieVolumeDidChangeNotification()
 #define QTSecurityPolicyNoCrossSiteAttribute getQTSecurityPolicyNoCrossSiteAttribute()
 #define QTVideoRendererWebKitOnlyNewImageAvailableNotification getQTVideoRendererWebKitOnlyNewImageAvailableNotification()
-#ifndef BUILDING_ON_TIGER
 #define QTMovieApertureModeClean getQTMovieApertureModeClean()
 #define QTMovieApertureModeAttribute getQTMovieApertureModeAttribute()
-#endif
 
 // Older versions of the QTKit header don't have these constants.
 #if !defined QTKIT_VERSION_MAX_ALLOWED || QTKIT_VERSION_MAX_ALLOWED <= QTKIT_VERSION_7_0
@@ -196,9 +181,6 @@ using namespace std;
 
 namespace WebCore {
 
-#ifdef BUILDING_ON_TIGER
-static const long minimumQuickTimeVersion = 0x07300000; // 7.3
-#endif
 
 
 MediaPlayerPrivateInterface* MediaPlayerPrivateQTKit::create(MediaPlayer* player) 
@@ -259,9 +241,7 @@ NSMutableDictionary* MediaPlayerPrivateQTKit::commonMovieAttributes()
             [NSNumber numberWithBool:NO], QTMovieAskUnresolvedDataRefsAttribute,
             [NSNumber numberWithBool:NO], QTMovieLoopsAttribute,
             [NSNumber numberWithBool:!m_privateBrowsing], @"QTMovieAllowPersistentCacheAttribute",
-#ifndef BUILDING_ON_TIGER
             QTMovieApertureModeClean, QTMovieApertureModeAttribute,
-#endif
             nil];
 }
 
@@ -469,12 +449,7 @@ void MediaPlayerPrivateQTKit::createQTMovieView()
     setSize(m_player->size());
     NSView* parentView = m_player->frameView()->documentView();
     [parentView addSubview:m_qtMovieView.get()];
-#ifdef BUILDING_ON_TIGER
-    // setDelegate: isn't a public call in Tiger, so use performSelector to keep the compiler happy
-    [m_qtMovieView.get() performSelector:@selector(setDelegate:) withObject:m_objcObserver.get()];    
-#else
     [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
-#endif
     [m_objcObserver.get() setView:m_qtMovieView.get()];
     [m_qtMovieView.get() setMovie:m_qtMovie.get()];
     [m_qtMovieView.get() setControllerVisible:NO];
@@ -495,12 +470,7 @@ void MediaPlayerPrivateQTKit::detachQTMovieView()
 {
     if (m_qtMovieView) {
         [m_objcObserver.get() setView:nil];
-#ifdef BUILDING_ON_TIGER
-        // setDelegate: isn't a public call in Tiger, so use performSelector to keep the compiler happy
-        [m_qtMovieView.get() performSelector:@selector(setDelegate:) withObject:nil];    
-#else
         [m_qtMovieView.get() setDelegate:nil];
-#endif
         [m_qtMovieView.get() removeFromSuperview];
         m_qtMovieView = nil;
     }
@@ -907,7 +877,7 @@ bool MediaPlayerPrivateQTKit::hasAudio() const
 
 bool MediaPlayerPrivateQTKit::supportsFullscreen() const
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     return true;
 #else
     // See <rdar://problem/7389945>
@@ -933,7 +903,7 @@ void MediaPlayerPrivateQTKit::setClosedCaptionsVisible(bool closedCaptionsVisibl
     if (metaDataAvailable()) {
         wkQTMovieSetShowClosedCaptions(m_qtMovie.get(), closedCaptionsVisible);
 
-#if USE(ACCELERATED_COMPOSITING) && (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#if USE(ACCELERATED_COMPOSITING) && !defined(BUILDING_ON_LEOPARD)
     if (closedCaptionsVisible && m_qtVideoLayer) {
         // Captions will be rendered upside down unless we flag the movie as flipped (again). See <rdar://7408440>.
         [m_qtVideoLayer.get() setGeometryFlipped:YES];
@@ -1026,7 +996,7 @@ void MediaPlayerPrivateQTKit::cacheMovieScale()
     NSSize initialSize = NSZeroSize;
     NSSize naturalSize = [[m_qtMovie.get() attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     // QTMovieCurrentSizeAttribute is not allowed with instances of QTMovie that have been 
     // opened with QTMovieOpenForPlaybackAttribute, so ask for the display transform attribute instead.
     NSAffineTransform *displayTransform = [m_qtMovie.get() attributeForKey:@"QTMoviePreferredTransformAttribute"];
@@ -1325,9 +1295,6 @@ void MediaPlayerPrivateQTKit::paint(GraphicsContext* context, const IntRect& r)
     context->setImageInterpolationQuality(InterpolationLow);
     IntRect paintRect(IntPoint(0, 0), IntSize(r.width(), r.height()));
     
-#ifdef BUILDING_ON_TIGER
-    AutodrainedPool pool;
-#endif
     NSGraphicsContext* newContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context->platformContext() flipped:NO];
 
     // draw the current video frame
@@ -1471,23 +1438,8 @@ MediaPlayer::SupportsType MediaPlayerPrivateQTKit::supportsType(const String& ty
 
 bool MediaPlayerPrivateQTKit::isAvailable()
 {
-#ifdef BUILDING_ON_TIGER
-    SInt32 version;
-    OSErr result;
-    result = Gestalt(gestaltQuickTime, &version);
-    if (result != noErr) {
-        LOG_ERROR("No QuickTime available. Disabling <video> and <audio> support.");
-        return false;
-    }
-    if (version < minimumQuickTimeVersion) {
-        LOG_ERROR("QuickTime version %x detected, at least %x required. Disabling <video> and <audio> support.", version, minimumQuickTimeVersion);
-        return false;
-    }
-    return true;
-#else
     // On 10.5 and higher, QuickTime will always be new enough for <video> and <audio> support, so we just check that the framework can be loaded.
     return QTKitLibrary();
-#endif
 }
 
 void MediaPlayerPrivateQTKit::getSitesInMediaCache(Vector<String>& sites) 
index f34d53b..7780db8 100644 (file)
@@ -63,33 +63,6 @@ static bool initFontData(SimpleFontData* fontData)
     if (!fontData->platformData().cgFont())
         return false;
 
-#ifdef BUILDING_ON_TIGER
-    ATSUStyle fontStyle;
-    if (ATSUCreateStyle(&fontStyle) != noErr)
-        return false;
-
-    ATSUFontID fontId = fontData->platformData().m_atsuFontID;
-    if (!fontId) {
-        ATSUDisposeStyle(fontStyle);
-        return false;
-    }
-
-    ATSUAttributeTag tag = kATSUFontTag;
-    ByteCount size = sizeof(ATSUFontID);
-    ATSUFontID *valueArray[1] = {&fontId};
-    OSStatus status = ATSUSetAttributes(fontStyle, 1, &tag, &size, (void* const*)valueArray);
-    if (status != noErr) {
-        ATSUDisposeStyle(fontStyle);
-        return false;
-    }
-
-    if (wkGetATSStyleGroup(fontStyle, &fontData->m_styleGroup) != noErr) {
-        ATSUDisposeStyle(fontStyle);
-        return false;
-    }
-
-    ATSUDisposeStyle(fontStyle);
-#endif
 
     return true;
 }
@@ -101,7 +74,7 @@ static NSString *webFallbackFontFamily(void)
 }
 
 #if !ERROR_DISABLED
-#if defined(__LP64__) || (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
+#if defined(__LP64__) || (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
 static NSString* pathFromFont(NSFont*)
 {
     // FMGetATSFontRefFromFont is not available. As pathFromFont is only used for debugging purposes,
@@ -111,27 +84,12 @@ static NSString* pathFromFont(NSFont*)
 #else
 static NSString* pathFromFont(NSFont *font)
 {
-#ifndef BUILDING_ON_TIGER
     ATSFontRef atsFont = FMGetATSFontRefFromFont(CTFontGetPlatformFont(toCTFontRef(font), 0));
-#else
-    ATSFontRef atsFont = FMGetATSFontRefFromFont(wkGetNSFontATSUFontId(font));
-#endif
     FSRef fileRef;
 
-#ifndef BUILDING_ON_TIGER
     OSStatus status = ATSFontGetFileReference(atsFont, &fileRef);
     if (status != noErr)
         return nil;
-#else
-    FSSpec oFile;
-    OSStatus status = ATSFontGetFileSpecification(atsFont, &oFile);
-    if (status != noErr)
-        return nil;
-
-    status = FSpMakeFSRef(&oFile, &fileRef);
-    if (status != noErr)
-        return nil;
-#endif
 
     UInt8 filePathBuffer[PATH_MAX];
     status = FSRefMakePath(&fileRef, filePathBuffer, PATH_MAX);
@@ -145,9 +103,6 @@ static NSString* pathFromFont(NSFont *font)
 
 void SimpleFontData::platformInit()
 {
-#ifdef BUILDING_ON_TIGER
-    m_styleGroup = 0;
-#endif
 #if USE(ATSUI)
     m_ATSUMirrors = false;
     m_checkedShapesArabic = false;
@@ -219,14 +174,10 @@ void SimpleFontData::platformInit()
     int iDescent;
     int iLineGap;
     unsigned unitsPerEm;
-#ifdef BUILDING_ON_TIGER
-    wkGetFontMetrics(m_platformData.cgFont(), &iAscent, &iDescent, &iLineGap, &unitsPerEm);
-#else
     iAscent = CGFontGetAscent(m_platformData.cgFont());
     iDescent = CGFontGetDescent(m_platformData.cgFont());
     iLineGap = CGFontGetLeading(m_platformData.cgFont());
     unitsPerEm = CGFontGetUnitsPerEm(m_platformData.cgFont());
-#endif
 
     float pointSize = m_platformData.m_size;
     float ascent = scaleEmToUnits(iAscent, unitsPerEm) * pointSize;
@@ -297,27 +248,7 @@ void SimpleFontData::platformInit()
 
 static CFDataRef copyFontTableForTag(FontPlatformData& platformData, FourCharCode tableName)
 {
-#ifdef BUILDING_ON_TIGER
-    ATSFontRef atsFont = FMGetATSFontRefFromFont(platformData.m_atsuFontID);
-
-    ByteCount tableSize;
-    if (ATSFontGetTable(atsFont, tableName, 0, 0, NULL, &tableSize) != noErr)
-        return 0;
-    
-    CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, tableSize);
-    if (!data)
-        return 0;
-    
-    CFDataIncreaseLength(data, tableSize);
-    if (ATSFontGetTable(atsFont, tableName, 0, tableSize, CFDataGetMutableBytePtr(data), &tableSize) != noErr) {
-        CFRelease(data);
-        return 0;
-    }
-    
-    return data;
-#else
     return CGFontCopyTableForTag(platformData.cgFont(), tableName);
-#endif
 }
 
 void SimpleFontData::platformCharWidthInit()
@@ -358,10 +289,6 @@ void SimpleFontData::platformDestroy()
             fontCache()->releaseFontData(m_derivedFontData->emphasisMark.leakPtr());
     }
 
-#ifdef BUILDING_ON_TIGER
-    if (m_styleGroup)
-        wkReleaseStyleGroup(m_styleGroup);
-#endif
 #if USE(ATSUI)
     HashMap<unsigned, ATSUStyle>::iterator end = m_ATSUStyleMap.end();
     for (HashMap<unsigned, ATSUStyle>::iterator it = m_ATSUStyleMap.begin(); it != end; ++it)
index 8a2c4a0..da5ee3b 100644 (file)
@@ -51,9 +51,7 @@
 class NSFont;
 #endif
 
-#ifndef BUILDING_ON_TIGER
 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef>(nsFont); }
-#endif
 
 #endif
 
index 43d6a52..8fbfe0b 100644 (file)
@@ -82,7 +82,7 @@ static CGColorSpaceRef createColorSpace(const ColorProfile& colorProfile)
         return CGColorSpaceCreateDeviceRGB();
 
     RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
-#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
+#ifndef TARGETING_LEOPARD
     return CGColorSpaceCreateWithICCProfile(data.get());
 #else
     RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
index a5005eb..ef759fb 100644 (file)
@@ -41,9 +41,6 @@
 #import "SecurityOrigin.h"
 #import "WebCoreSystemInterface.h"
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#endif
 
 namespace WebCore {
 
index e788949..ed3e5f9 100644 (file)
@@ -34,9 +34,6 @@
 #import "WebCoreSystemInterface.h"
 #import <wtf/RetainPtr.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#endif
 
 @interface NSHTTPCookie (WebCoreHTTPOnlyCookies)
 - (BOOL)isHTTPOnly;
index 41d23db..2ca943d 100644 (file)
@@ -114,7 +114,7 @@ static NSArray *insertablePasteboardTypes()
     static NSArray *types = nil;
     if (!types) {
         types = [[NSArray alloc] initWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
                  NSPICTPboardType,
 #endif
                  NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil];
index b73177b..db5cdc6 100644 (file)
@@ -29,7 +29,7 @@
 @protocol NAME <NSObject> \
 @end
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 
 EMPTY_PROTOCOL(NSTableViewDataSource)
 EMPTY_PROTOCOL(NSTableViewDelegate)
@@ -37,7 +37,7 @@ EMPTY_PROTOCOL(NSWindowDelegate)
 
 #endif
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 
 EMPTY_PROTOCOL(NSURLConnectionDelegate)
 EMPTY_PROTOCOL(NSURLDownloadDelegate)
index a9cbcf4..6b209d7 100644 (file)
@@ -68,23 +68,14 @@ String openTemporaryFile(const String& prefix, PlatformFileHandle& platformFileH
 
 bool canExcludeFromBackup()
 {
-#ifdef BUILDING_ON_TIGER
-    return false;
-#else
     return true;
-#endif
 }
 
 bool excludeFromBackup(const String& path)
 {
-#ifdef BUILDING_ON_TIGER
-    UNUSED_PARAM(path);
-    return false;
-#else
     // It is critical to pass FALSE for excludeByPath because excluding by path requires root privileges.
     CSBackupSetItemExcluded(pathAsURL(path).get(), TRUE, FALSE); 
     return true;
-#endif
 }
 
 } // namespace WebCore
index 3250769..ea1b85d 100644 (file)
@@ -79,7 +79,7 @@ namespace WebCore {
     } _flags;
 }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD)
 - (id)init;
 - (id)initWithDOMRange:(DOMRange *)domRange;
 
index c0b0ba2..51f06e1 100644 (file)
@@ -50,7 +50,7 @@ using namespace HTMLNames;
 static NSFileWrapper *fileWrapperForURL(DocumentLoader *, NSURL *);
 static NSFileWrapper *fileWrapperForElement(Element*);
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 // Additional control Unicode characters
 const unichar WebNextLineCharacter = 0x0085;
@@ -100,7 +100,7 @@ static NSFont *WebDefaultFont()
 
 @implementation WebHTMLConverter
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 static NSFont *_fontForNameAndSize(NSString *fontName, CGFloat size, NSMutableDictionary *cache)
 {
@@ -1657,7 +1657,7 @@ static NSInteger _colCompare(id block1, id block2, void *)
     return (0 == _errorCode) ? [[_attrStr retain] autorelease] : nil;
 }
 
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD)
 
 // This function uses TextIterator, which makes offsets in its result compatible with HTML editing.
 + (NSAttributedString *)editingAttributedStringFromRange:(Range*)range
index 69782ab..191efd5 100644 (file)
@@ -69,7 +69,6 @@ NSString *WebURLNamePboardType = @"public.url-name";
 NSString *WebURLPboardType = @"public.url";
 NSString *WebURLsWithTitlesPboardType = @"WebURLsWithTitlesPboardType";
 
-#ifndef BUILDING_ON_TIGER
 static NSArray* selectionPasteboardTypes(bool canSmartCopyOrDelete, bool selectionContainsAttachments)
 {
     if (selectionContainsAttachments) {
@@ -84,7 +83,6 @@ static NSArray* selectionPasteboardTypes(bool canSmartCopyOrDelete, bool selecti
             return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFPboardType, NSStringPboardType, nil];
     }
 }
-#endif
 
 static NSArray* writableTypesForURL()
 {
@@ -149,7 +147,7 @@ void Pasteboard::writeSelection(NSPasteboard* pasteboard, NSArray* pasteboardTyp
     NSAttributedString *attributedString = nil;
     if (frame->view()->platformWidget())
         attributedString = [[[NSAttributedString alloc] _initWithDOMRange:kit(selectedRange)] autorelease];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     else {
         // In WebKit2 we are using a different way to create the NSAttributedString from the DOMrange that doesn't require access to the WebView.
         RetainPtr<WebHTMLConverter> converter = [[WebHTMLConverter alloc] initWithDOMRange:kit(selectedRange)];
@@ -158,26 +156,9 @@ void Pasteboard::writeSelection(NSPasteboard* pasteboard, NSArray* pasteboardTyp
     }
 #endif
 
-#ifdef BUILDING_ON_TIGER
-    // 4930197: Mail overrides [WebHTMLView pasteboardTypesForSelection] in order to add another type to the pasteboard
-    // after WebKit does.  On Tiger we must call this function so that Mail code will be executed, meaning that 
-    // we can't call WebCore::Pasteboard's method for setting types. 
-    UNUSED_PARAM(canSmartCopyOrDelete);
-
-    NSArray *types = pasteboardTypes ? pasteboardTypes : frame->editor()->client()->pasteboardTypesForSelection(frame);
-    // Don't write RTFD to the pasteboard when the copied attributed string has no attachments.
-    NSMutableArray *mutableTypes = nil;
-    if (![attributedString containsAttachments]) {
-        mutableTypes = [[types mutableCopy] autorelease];
-        [mutableTypes removeObject:NSRTFDPboardType];
-        types = mutableTypes;
-    }
-    [pasteboard declareTypes:types owner:nil];    
-#else
     NSArray *types = pasteboardTypes ? pasteboardTypes : selectionPasteboardTypes(canSmartCopyOrDelete, [attributedString containsAttachments]);
     [pasteboard declareTypes:types owner:nil];
     frame->editor()->client()->didSetSelectionTypesForPasteboard();
-#endif
     
     // Put HTML on the pasteboard.
     if ([types containsObject:WebArchivePboardType]) {
@@ -571,7 +552,7 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
         (fragment = documentFragmentWithImageResource(frame, ArchiveResource::create(SharedBuffer::wrapNSData([[[m_pasteboard.get() dataForType:NSPDFPboardType] copy] autorelease]), uniqueURLWithRelativePart(@"application.pdf"), "application/pdf", "", ""))))
         return fragment.release();
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if ([types containsObject:NSPICTPboardType] &&
         (fragment = documentFragmentWithImageResource(frame, ArchiveResource::create(SharedBuffer::wrapNSData([[[m_pasteboard.get() dataForType:NSPICTPboardType] copy] autorelease]), uniqueURLWithRelativePart(@"image.pict"), "image/pict", "", ""))))
         return fragment.release();
index e69bcb2..4607781 100644 (file)
@@ -75,10 +75,10 @@ void PopupMenuMac::populate()
     if (!client()->shouldPopOver())
         [m_popup.get() addItemWithTitle:@""];
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     TextDirection menuTextDirection = client()->menuStyle().textDirection();
     [m_popup.get() setUserInterfaceLayoutDirection:menuTextDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD)
 
     ASSERT(client());
     int size = client()->listSize();
@@ -98,7 +98,7 @@ void PopupMenuMac::populate()
                 [attributes setObject:font forKey:NSFontAttributeName];
             }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             RetainPtr<NSMutableParagraphStyle> paragraphStyle(AdoptNS, [[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
             [paragraphStyle.get() setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
             NSWritingDirection writingDirection = style.textDirection() == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
@@ -109,7 +109,7 @@ void PopupMenuMac::populate()
                 [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
             }
             [attributes setObject:paragraphStyle.get() forKey:NSParagraphStyleAttributeName];
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD)
 
             // FIXME: Add support for styling the foreground and background colors.
             // FIXME: Find a way to customize text color when an item is highlighted.
index fdbac1f..5171f29 100644 (file)
@@ -153,4 +153,4 @@ const char* PurgeableBuffer::data() const
     
 }
 
-#endif // BUILDING_ON_TIGER
+#endif
index 3f5e5d4..70eca27 100644 (file)
@@ -31,9 +31,6 @@
 #include <string.h>
 #include <wtf/PassRefPtr.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#endif
 
 using namespace WebCore;
 
@@ -51,9 +48,7 @@ using namespace WebCore;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (void)dealloc
index cc9ff17..4448c21 100644 (file)
@@ -36,7 +36,7 @@
 #include <stdio.h>
 
 // On Snow Leopard and newer we'll ask IOKit to deliver notifications on a queue.
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 #define IOKIT_WITHOUT_LIBDISPATCH 1
 #endif
 
index 513d01b..f624116 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "SuddenTermination.h"
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 namespace WebCore {
 
index 5a2d564..82afbf0 100644 (file)
@@ -45,19 +45,13 @@ void WebCoreObjCFinalizeOnMainThread(Class cls)
 {
     // This method relies on threading being initialized by the caller, otherwise
     // WebCoreObjCScheduleDeallocateOnMainThread will crash.
-#if !defined(BUILDING_ON_TIGER) && !defined(DONT_FINALIZE_ON_MAIN_THREAD)
+#ifndef DONT_FINALIZE_ON_MAIN_THREAD
     objc_finalizeOnMainThread(cls);
 #else
     UNUSED_PARAM(cls);
 #endif
 }
 
-#ifdef BUILDING_ON_TIGER
-static inline IMP method_getImplementation(Method method) 
-{
-    return method->method_imp;
-}
-#endif
 
 typedef std::pair<Class, id> ClassAndIdPair;
 
index 0dfb69b..35d50b8 100644 (file)
@@ -29,7 +29,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <objc/objc.h>
 
-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #include <IOSurface/IOSurface.h>
 #endif
 
@@ -165,29 +165,11 @@ extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost
 extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL);
 
-#ifndef BUILDING_ON_TIGER
 extern void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
-#else
-#define GLYPH_VECTOR_SIZE (50 * 32)
-
-extern void (*wkClearGlyphVector)(void* glyphs);
-extern OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
-extern CFStringRef (*wkCopyFullFontName)(CGFontRef font);
-extern OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
-extern CGFontRef (*wkGetCGFontFromNSFont)(NSFont*);
-extern void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
-extern ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector);
-extern void* wkGetGlyphsForCharacters;
-extern int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector);
-extern size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector);
-extern OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
-extern void (*wkReleaseStyleGroup)(void* group);
-extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
-#endif
 
 extern BOOL (*wkUseSharedMediaUI)();
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 extern void* wkGetHyphenationLocationBeforeIndex;
 #else
 extern CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
@@ -203,7 +185,7 @@ extern int (*wkGetNSEventMomentumPhase)(NSEvent *);
 #endif
 
 extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
 
 extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
index eadacec..9ef157a 100644 (file)
@@ -102,26 +102,9 @@ void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNum
 void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL);
 
-#ifndef BUILDING_ON_TIGER
 void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
-#else
-void (*wkClearGlyphVector)(void* glyphs);
-OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
-CFStringRef (*wkCopyFullFontName)(CGFontRef font);
-OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
-CGFontRef (*wkGetCGFontFromNSFont)(NSFont*);
-void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
-ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector);
-void* wkGetGlyphsForCharacters;
-int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector);
-size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector);
-OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
-void (*wkReleaseStyleGroup)(void* group);
-ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
-BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 void* wkGetHyphenationLocationBeforeIndex;
 #else
 CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
@@ -129,7 +112,7 @@ int (*wkGetNSEventMomentumPhase)(NSEvent *);
 #endif
 
 CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
 
 CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
index 22e6291..0d6ffc2 100644 (file)
@@ -38,9 +38,6 @@
 
 using namespace WebCore;
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-#endif
 
 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask)
 
@@ -107,7 +104,7 @@ static BOOL betterChoice(NSFontTraitMask desiredTraits, int desiredWeight,
 // Workaround for <rdar://problem/5781372>.
 static inline void fixUpWeight(NSInteger& weight, NSString *fontName)
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     UNUSED_PARAM(weight);
     UNUSED_PARAM(fontName);
 #else
@@ -293,7 +290,6 @@ static inline FontTraitsMask toTraitsMask(NSFontTraitMask appKitTraits, NSIntege
 
 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits weight:(int)desiredWeight size:(float)size
 {
-#ifndef BUILDING_ON_TIGER
     NSFont *font = [self internalFontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
     if (font)
         return font;
@@ -301,7 +297,6 @@ static inline FontTraitsMask toTraitsMask(NSFontTraitMask appKitTraits, NSIntege
     // Auto activate the font before looking for it a second time.
     // Ignore the result because we want to use our own algorithm to actually find the font.
     [NSFont fontWithName:desiredFamily size:size];
-#endif
 
     return [self internalFontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
 }
index f75faaa..925b060 100644 (file)
@@ -26,9 +26,6 @@
 #import "config.h"
 #import "Widget.h"
 
-#ifdef BUILDING_ON_TIGER
-#import "AutodrainedPool.h"
-#endif
 
 #import "BlockExceptions.h"
 #import "Chrome.h"
@@ -305,9 +302,6 @@ void Widget::paint(GraphicsContext* p, const IntRect& r)
 
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
         {
-#ifdef BUILDING_ON_TIGER
-            AutodrainedPool pool;
-#endif
             NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES];
             [view displayRectIgnoringOpacity:dirtyRect inContext:nsContext];
         }
index ee47887..aae4d52 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "PlatformString.h"
 
-#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_LEOPARD))
 
 #if CERTIFICATE_CREDENTIALS_SUPPORTED
 #include <Security/SecBase.h>
index b6f9922..881e392 100644 (file)
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
-#ifdef BUILDING_ON_TIGER
-// This function is available on Tiger, but not declared in the CFRunLoop.h header on Tiger.
-extern "C" CFRunLoopRef CFRunLoopGetMain();
-#endif
 
 namespace WebCore {
 
index 57d714b..245e6ff 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace WebCore {
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 static void addProxyServersForURL(Vector<ProxyServer>& proxyServers, const KURL& url)
 {
     RetainPtr<CFDictionaryRef> proxySettings(AdoptCF, CFNetworkCopySystemProxySettings());
index 0e0fb8f..6a39014 100644 (file)
@@ -221,7 +221,7 @@ void ResourceRequest::setHTTPPipeliningEnabled(bool flag)
     s_httpPipeliningEnabled = flag;
 }
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 static inline bool readBooleanPreference(CFStringRef key)
 {
     Boolean keyExistsAndHasValidFormat;
@@ -237,7 +237,7 @@ unsigned initializeMaximumHTTPConnectionCountPerHost()
     // Always set the connection count per host, even when pipelining.
     unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     static const unsigned unlimitedConnectionCount = 10000;
 
     if (!ResourceRequest::httpPipeliningEnabled() && readBooleanPreference(CFSTR("WebKitEnableHTTPPipelining")))
index 4adee70..ce6c645 100644 (file)
@@ -61,7 +61,6 @@ private:
     void createStreams();
     void scheduleStreams();
     void chooseProxy();
-#ifndef BUILDING_ON_TIGER
     void chooseProxyFromArray(CFArrayRef);
     void executePACFileURL(CFURLRef);
     void removePACRunLoopSource();
@@ -69,7 +68,6 @@ private:
     static void pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef error);
     static void pacExecutionCallbackMainThread(void*);
     static CFStringRef copyPACExecutionDescription(void*);
-#endif
 
     bool shouldUseSSL() const { return m_url.protocolIs("wss"); }
     unsigned short port() const;
@@ -86,9 +84,7 @@ private:
     void readStreamCallback(CFStreamEventType);
     void writeStreamCallback(CFStreamEventType);
 
-#ifndef BUILDING_ON_TIGER
     void reportErrorToClient(CFErrorRef);
-#endif
 
     // No authentication for streams per se, but proxy may ask for credentials.
     virtual void receivedCredential(const AuthenticationChallenge&, const Credential&);
index ee06c68..0eba3b8 100644 (file)
@@ -41,7 +41,7 @@
 #include <wtf/MainThread.h>
 #include <wtf/text/StringConcatenate.h>
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
@@ -53,9 +53,6 @@
 #include "WebCoreSystemInterface.h"
 #endif
 
-#ifdef BUILDING_ON_TIGER
-#define CFN_EXPORT extern
-#endif
 
 namespace WebCore {
 
@@ -101,15 +98,12 @@ void SocketStreamHandle::scheduleStreams()
     CFReadStreamOpen(m_readStream.get());
     CFWriteStreamOpen(m_writeStream.get());
 
-#ifndef BUILDING_ON_TIGER
     if (m_pacRunLoopSource)
         removePACRunLoopSource();
-#endif
 
     m_connectingSubstate = WaitingForConnect;
 }
 
-#ifndef BUILDING_ON_TIGER
 CFStringRef SocketStreamHandle::copyPACExecutionDescription(void*)
 {
     return CFSTR("WebSocket proxy PAC file execution");
@@ -250,56 +244,6 @@ void SocketStreamHandle::chooseProxyFromArray(CFArrayRef proxyArray)
     m_connectionType = Direct;
 }
 
-#else // BUILDING_ON_TIGER
-
-void SocketStreamHandle::chooseProxy()
-{
-    // We don't need proxy information often, so there is no need to set up a permanent dynamic store session.
-    RetainPtr<CFDictionaryRef> proxyDictionary(AdoptCF, SCDynamicStoreCopyProxies(0));
-
-    // SOCKS or HTTPS (AKA CONNECT) proxies are supported.
-    // WebSocket protocol relies on handshake being transferred unchanged, so we need a proxy that will not modify headers.
-    // Since HTTP proxies must add Via headers, they are highly unlikely to work.
-    // Many CONNECT proxies limit connectivity to port 443, so we prefer SOCKS, if configured.
-
-    if (!proxyDictionary) {
-        m_connectionType = Direct;
-        return;
-    }
-
-    // FIXME: check proxy bypass list and ExcludeSimpleHostnames.
-    // FIXME: Support PAC files.
-
-    CFTypeRef socksEnableCF = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesSOCKSEnable);
-    int socksEnable;
-    if (socksEnableCF && CFGetTypeID(socksEnableCF) == CFNumberGetTypeID() && CFNumberGetValue(static_cast<CFNumberRef>(socksEnableCF), kCFNumberIntType, &socksEnable) && socksEnable) {
-        CFTypeRef proxyHost = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesSOCKSProxy);
-        CFTypeRef proxyPort = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesSOCKSPort);
-        if (proxyHost && CFGetTypeID(proxyHost) == CFStringGetTypeID() && proxyPort && CFGetTypeID(proxyPort) == CFNumberGetTypeID()) {
-            m_proxyHost = static_cast<CFStringRef>(proxyHost);
-            m_proxyPort = static_cast<CFNumberRef>(proxyPort);
-            m_connectionType = SOCKSProxy;
-            return;
-        }
-    }
-
-    CFTypeRef httpsEnableCF = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesHTTPSEnable);
-    int httpsEnable;
-    if (httpsEnableCF && CFGetTypeID(httpsEnableCF) == CFNumberGetTypeID() && CFNumberGetValue(static_cast<CFNumberRef>(httpsEnableCF), kCFNumberIntType, &httpsEnable) && httpsEnable) {
-        CFTypeRef proxyHost = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesHTTPSProxy);
-        CFTypeRef proxyPort = CFDictionaryGetValue(proxyDictionary.get(), kSCPropNetProxiesHTTPSPort);
-
-        if (proxyHost && CFGetTypeID(proxyHost) == CFStringGetTypeID() && proxyPort && CFGetTypeID(proxyPort) == CFNumberGetTypeID()) {
-            m_proxyHost = static_cast<CFStringRef>(proxyHost);
-            m_proxyPort = static_cast<CFNumberRef>(proxyPort);
-            m_connectionType = CONNECTProxy;
-            return;
-        }
-    }
-
-    m_connectionType = Direct;
-}
-#endif // BUILDING_ON_TIGER
 
 void SocketStreamHandle::createStreams()
 {
@@ -371,12 +315,10 @@ static ProtectionSpaceAuthenticationScheme authenticationSchemeFromAuthenticatio
         return ProtectionSpaceAuthenticationSchemeHTTPBasic;
     if (CFEqual(method, kCFHTTPAuthenticationSchemeDigest))
         return ProtectionSpaceAuthenticationSchemeHTTPDigest;
-#ifndef BUILDING_ON_TIGER
     if (CFEqual(method, kCFHTTPAuthenticationSchemeNTLM))
         return ProtectionSpaceAuthenticationSchemeNTLM;
     if (CFEqual(method, kCFHTTPAuthenticationSchemeNegotiate))
         return ProtectionSpaceAuthenticationSchemeNegotiate;
-#endif
     ASSERT_NOT_REACHED();
     return ProtectionSpaceAuthenticationSchemeUnknown;
 }
@@ -529,13 +471,8 @@ void SocketStreamHandle::readStreamCallback(CFStreamEventType type)
         ASSERT_NOT_REACHED();
         break;
     case kCFStreamEventErrorOccurred: {
-#ifndef BUILDING_ON_TIGER
         RetainPtr<CFErrorRef> error(AdoptCF, CFReadStreamCopyError(m_readStream.get()));
         reportErrorToClient(error.get());
-#else
-        CFStreamError error = CFReadStreamGetError(m_readStream.get());
-        m_client->didFail(this, SocketStreamError(error.error)); // FIXME: Provide a sensible error.
-#endif
         break;
     }
     case kCFStreamEventEndEncountered:
@@ -578,13 +515,8 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
         break;
     }
     case kCFStreamEventErrorOccurred: {
-#ifndef BUILDING_ON_TIGER
         RetainPtr<CFErrorRef> error(AdoptCF, CFWriteStreamCopyError(m_writeStream.get()));
         reportErrorToClient(error.get());
-#else
-        CFStreamError error = CFWriteStreamGetError(m_writeStream.get());
-        m_client->didFail(this, SocketStreamError(error.error)); // FIXME: Provide a sensible error.
-#endif
         break;
     }
     case kCFStreamEventEndEncountered:
@@ -593,7 +525,6 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
     }
 }
 
-#ifndef BUILDING_ON_TIGER
 void SocketStreamHandle::reportErrorToClient(CFErrorRef error)
 {
     CFIndex errorCode = CFErrorGetCode(error);
@@ -614,15 +545,12 @@ void SocketStreamHandle::reportErrorToClient(CFErrorRef error)
 
     m_client->didFail(this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
 }
-#endif // BUILDING_ON_TIGER
 
 SocketStreamHandle::~SocketStreamHandle()
 {
     LOG(Network, "SocketStreamHandle %p dtor", this);
 
-#ifndef BUILDING_ON_TIGER
     ASSERT(!m_pacRunLoopSource);
-#endif
 }
 
 int SocketStreamHandle::platformSend(const char* data, int length)
@@ -637,10 +565,8 @@ void SocketStreamHandle::platformClose()
 {
     LOG(Network, "SocketStreamHandle %p platformClose", this);
 
-#ifndef BUILDING_ON_TIGER
     if (m_pacRunLoopSource) 
         removePACRunLoopSource();
-#endif
 
     ASSERT(!m_readStream == !m_writeStream);
     if (!m_readStream)
index efa42d9..cc0257d 100644 (file)
@@ -90,7 +90,7 @@ using namespace WebCore;
 
 namespace WebCore {
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 // There is no constant in headers, but NTLM is supported.
 NSString * const NSURLAuthenticationMethodNTLM = @"NSURLAuthenticationMethodNTLM";
 #endif
index 2045eb3..f0ffa75 100644 (file)
 
 #include <SystemConfiguration/SystemConfiguration.h>
 
-#ifdef BUILDING_ON_TIGER 
-// This function is available on Tiger, but not declared in the CFRunLoop.h header on Tiger. 
-extern "C" CFRunLoopRef CFRunLoopGetMain(); 
-#endif 
 
 namespace WebCore {
 
index c0a49d7..6966ef8 100644 (file)
@@ -54,9 +54,6 @@
 #import <wtf/text/CString.h>
 #import <wtf/UnusedParam.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-#endif
 
 using namespace WebCore;
 
@@ -86,7 +83,6 @@ using namespace WebCore;
 - (id)_propertyForKey:(NSString *)key;
 @end
 
-#ifndef BUILDING_ON_TIGER
 
 class WebCoreSynchronousLoaderClient : public ResourceHandleClient {
 public:
@@ -133,13 +129,9 @@ private:
 
 static NSString *WebCoreSynchronousLoaderRunLoopMode = @"WebCoreSynchronousLoaderRunLoopMode";
 
-#endif
 
 namespace WebCore {
 
-#ifdef BUILDING_ON_TIGER
-static unsigned inNSURLConnectionCallback;
-#endif
 
 #ifndef NDEBUG
 static bool isInitializingConnection;
@@ -149,25 +141,16 @@ class CallbackGuard {
 public:
     CallbackGuard()
     {
-#ifdef BUILDING_ON_TIGER
-        ++inNSURLConnectionCallback;
-#endif
     }
     ~CallbackGuard()
     {
-#ifdef BUILDING_ON_TIGER
-        ASSERT(inNSURLConnectionCallback > 0);
-        --inNSURLConnectionCallback;
-#endif
     }
 };
 
-#ifndef BUILDING_ON_TIGER
 static String encodeBasicAuthorization(const String& user, const String& password)
 {
     return base64Encode((user + ":" + password).utf8());
 }
-#endif
 
 ResourceHandleInternal::~ResourceHandleInternal()
 {
@@ -219,11 +202,7 @@ static bool shouldRelaxThirdPartyCookiePolicy(const KURL& url)
 void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff)
 {
     // Credentials for ftp can only be passed in URL, the connection:didReceiveAuthenticationChallenge: delegate call won't be made.
-    if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty())
-#ifndef BUILDING_ON_TIGER
-     && !firstRequest().url().protocolInHTTPFamily() // On Tiger, always pass credentials in URL, so that they get stored even if the request gets cancelled right away.
-#endif
-    ) {
+    if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolInHTTPFamily()) {
         KURL urlWithCredentials(firstRequest().url());
         urlWithCredentials.setUser(d->m_user);
         urlWithCredentials.setPass(d->m_pass);
@@ -233,7 +212,6 @@ void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredential
     if (shouldRelaxThirdPartyCookiePolicy(firstRequest().url()))
         firstRequest().setFirstPartyForCookies(firstRequest().url());
 
-#if !defined(BUILDING_ON_TIGER)
     if (shouldUseCredentialStorage && firstRequest().url().protocolInHTTPFamily()) {
         if (d->m_user.isEmpty() && d->m_pass.isEmpty()) {
             // <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication, 
@@ -282,12 +260,6 @@ void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredential
     d->m_connection.adoptNS([[NSURLConnection alloc] initWithRequest:nsRequest delegate:delegate startImmediately:NO]);
     return;
 
-#else
-    // Building on Tiger. Don't use WebCore credential storage, don't try to disable content sniffing.
-    UNUSED_PARAM(shouldUseCredentialStorage);
-    UNUSED_PARAM(shouldContentSniff);
-    d->m_connection.adoptNS([[NSURLConnection alloc] initWithRequest:firstRequest().nsURLRequest() delegate:delegate]);
-#endif
 }
 
 bool ResourceHandle::start(NetworkingContext* context)
@@ -315,12 +287,6 @@ bool ResourceHandle::start(NetworkingContext* context)
     if (!ResourceHandle::didSendBodyDataDelegateExists())
         associateStreamWithResourceHandle([firstRequest().nsURLRequest() HTTPBodyStream], this);
 
-#ifdef BUILDING_ON_TIGER
-    // A conditional request sent by WebCore (e.g. to update appcache) can be for a resource that is not cacheable by NSURLConnection,
-    // which can get confused and fail to load it in this case.
-    if (firstRequest().isConditional())
-        firstRequest().setCachePolicy(ReloadIgnoringCacheData);
-#endif
 
     d->m_needsSiteSpecificQuirks = context->needsSiteSpecificQuirks();
 
@@ -329,7 +295,6 @@ bool ResourceHandle::start(NetworkingContext* context)
         shouldUseCredentialStorage,
         d->m_shouldContentSniff || context->localFileContentSniffingEnabled());
 
-#ifndef BUILDING_ON_TIGER
     bool scheduled = false;
     if (SchedulePairHashSet* scheduledPairs = context->scheduledRunLoopPairs()) {
         SchedulePairHashSet::iterator end = scheduledPairs->end();
@@ -347,7 +312,6 @@ bool ResourceHandle::start(NetworkingContext* context)
         [connection() start];
     else
         d->m_startWhenScheduled = true;
-#endif
 
 #ifndef NDEBUG
     isInitializingConnection = NO;
@@ -388,7 +352,6 @@ void ResourceHandle::platformSetDefersLoading(bool defers)
 
 void ResourceHandle::schedule(SchedulePair* pair)
 {
-#ifndef BUILDING_ON_TIGER
     NSRunLoop *runLoop = pair->nsRunLoop();
     if (!runLoop)
         return;
@@ -397,19 +360,12 @@ void ResourceHandle::schedule(SchedulePair* pair)
         [d->m_connection.get() start];
         d->m_startWhenScheduled = false;
     }
-#else
-    UNUSED_PARAM(pair);
-#endif
 }
 
 void ResourceHandle::unschedule(SchedulePair* pair)
 {
-#ifndef BUILDING_ON_TIGER
     if (NSRunLoop *runLoop = pair->nsRunLoop())
         [d->m_connection.get() unscheduleFromRunLoop:runLoop forMode:(NSString *)pair->mode()];
-#else
-    UNUSED_PARAM(pair);
-#endif
 }
 
 WebCoreResourceHandleAsDelegate *ResourceHandle::delegate()
@@ -461,19 +417,11 @@ NSURLConnection *ResourceHandle::connection() const
 
 bool ResourceHandle::loadsBlocked()
 {
-#ifndef BUILDING_ON_TIGER
     return false;
-#else
-    // On Tiger, if we're in an NSURLConnection callback, that blocks all other NSURLConnection callbacks.
-    // On Leopard and newer, it blocks only callbacks on that same NSURLConnection object, which is not
-    // a problem in practice.
-    return inNSURLConnectionCallback != 0;
-#endif
 }
 
 bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
 {
-#ifndef BUILDING_ON_TIGER
     request.setCachePolicy(ReturnCacheDataDontLoad);
     NSURLResponse *nsURLResponse = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -483,11 +431,6 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
     END_BLOCK_OBJC_EXCEPTIONS;
     
     return nsURLResponse;
-#else
-    // <rdar://problem/6803217> - Re-enable after <rdar://problem/6786454> is resolved.
-    UNUSED_PARAM(request);
-    return false;
-#endif
 }
 
 void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
@@ -506,7 +449,6 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
 
     ASSERT(!request.isEmpty());
     
-#ifndef BUILDING_ON_TIGER
     OwnPtr<WebCoreSynchronousLoaderClient> client = WebCoreSynchronousLoaderClient::create();
     client->setAllowStoredCredentials(storedCredentials == AllowStoredCredentials);
 
@@ -534,21 +476,6 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
     
     [handle->connection() cancel];
 
-#else
-    UNUSED_PARAM(storedCredentials);
-    UNUSED_PARAM(context);
-    NSURLRequest *firstRequest = request.nsURLRequest();
-
-    if (shouldRelaxThirdPartyCookiePolicy([firstRequest URL])) {
-        NSMutableURLRequest *mutableRequest = [[firstRequest mutableCopy] autorelease];
-        [mutableRequest setMainDocumentURL:[mutableRequest URL]];
-        firstRequest = mutableRequest;
-    }
-
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    result = [NSURLConnection sendSynchronousRequest:firstRequest returningResponse:&nsURLResponse error:&nsError];
-    END_BLOCK_OBJC_EXCEPTIONS;
-#endif
 
     if (!nsError)
         response = nsURLResponse;
@@ -621,7 +548,6 @@ void ResourceHandle::didReceiveAuthenticationChallenge(const AuthenticationChall
         return;
     }
 
-#ifndef BUILDING_ON_TIGER
     if (!client() || client()->shouldUseCredentialStorage(this)) {
         if (!d->m_initialCredential.isEmpty() || challenge.previousFailureCount()) {
             // The stored credential wasn't accepted, stop using it.
@@ -643,7 +569,6 @@ void ResourceHandle::didReceiveAuthenticationChallenge(const AuthenticationChall
             }
         }
     }
-#endif
 
     d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
     d->m_currentWebChallenge = core(d->m_currentMacChallenge);
@@ -685,13 +610,6 @@ void ResourceHandle::receivedCredential(const AuthenticationChallenge& challenge
         return;
     }
 
-#ifdef BUILDING_ON_TIGER
-    if (credential.persistence() == CredentialPersistenceNone) {
-        // NSURLCredentialPersistenceNone doesn't work on Tiger, so we have to use session persistence.
-        Credential webCredential(credential.user(), credential.password(), CredentialPersistenceForSession);
-        [[d->m_currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:d->m_currentMacChallenge];
-    } else
-#else
     if (credential.persistence() == CredentialPersistenceForSession && (!d->m_needsSiteSpecificQuirks || ![[[mac(challenge) protectionSpace] host] isEqualToString:@"gallery.me.com"])) {
         // Manage per-session credentials internally, because once NSURLCredentialPersistenceForSession is used, there is no way
         // to ignore it for a particular request (short of removing it altogether).
@@ -703,7 +621,6 @@ void ResourceHandle::receivedCredential(const AuthenticationChallenge& challenge
         CredentialStorage::set(webCredential, core([d->m_currentMacChallenge protectionSpace]), urlToStore);
         [[d->m_currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:d->m_currentMacChallenge];
     } else
-#endif
         [[d->m_currentMacChallenge sender] useCredential:mac(credential) forAuthenticationChallenge:d->m_currentMacChallenge];
 
     clearAuthentication();
@@ -1011,45 +928,12 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
     m_handle->client()->didFail(m_handle, error);
 }
 
-#ifdef BUILDING_ON_TIGER
-- (void)_callConnectionWillCacheResponseWithInfo:(NSMutableDictionary *)info
-{
-    NSURLConnection *connection = [info objectForKey:@"connection"];
-    NSCachedURLResponse *cachedResponse = [info objectForKey:@"cachedResponse"];
-    NSCachedURLResponse *result = [self connection:connection willCacheResponse:cachedResponse];
-    if (result)
-        [info setObject:result forKey:@"result"];
-}
-#endif
 
 - (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
 {
     LOG(Network, "Handle %p delegate connection:%p willCacheResponse:%p", m_handle, connection, cachedResponse);
 
-#ifdef BUILDING_ON_TIGER
-    // On Tiger CFURLConnection can sometimes call the connection:willCacheResponse: delegate method on
-    // a secondary thread instead of the main thread. If this happens perform the work on the main thread.
-    if (!pthread_main_np()) {
-        NSMutableDictionary *info = [[NSMutableDictionary alloc] init];
-        if (connection)
-            [info setObject:connection forKey:@"connection"];
-        if (cachedResponse)
-            [info setObject:cachedResponse forKey:@"cachedResponse"];
-
-        // Include synchronous url connection's mode as an acceptable run loopmode
-        // <rdar://problem/5511842>
-        NSArray *modes = [[NSArray alloc] initWithObjects:(NSString *)kCFRunLoopCommonModes, @"NSSynchronousURLConnection_PrivateMode", nil];        
-        [self performSelectorOnMainThread:@selector(_callConnectionWillCacheResponseWithInfo:) withObject:info waitUntilDone:YES modes:modes];
-        [modes release];
-
-        NSCachedURLResponse *result = [[info valueForKey:@"result"] retain];
-        [info release];
-
-        return [result autorelease];
-    }
-#else
     UNUSED_PARAM(connection);
-#endif
 
 #ifndef NDEBUG
     if (isInitializingConnection)
@@ -1080,7 +964,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
 
 @end
 
-#ifndef BUILDING_ON_TIGER
 
 WebCoreSynchronousLoaderClient::~WebCoreSynchronousLoaderClient()
 {
@@ -1147,6 +1030,5 @@ void WebCoreSynchronousLoaderClient::didFail(ResourceHandle*, const ResourceErro
     m_isDone = true;
 }
 
-#endif // BUILDING_ON_TIGER
 
 #endif // !USE(CFNETWORK)
index d99e1b7..24d09c0 100644 (file)
@@ -36,9 +36,6 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef BUILDING_ON_TIGER
-typedef unsigned NSUInteger;
-#endif
 
 @interface NSURLRequest (WebNSURLRequestDetails)
 - (NSArray *)contentDispositionEncodingFallbackArray;
@@ -69,7 +66,7 @@ void ResourceRequest::doUpdateResourceRequest()
         m_httpMethod = method;
     m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     if (ResourceRequest::httpPipeliningEnabled())
         m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority(m_nsRequest.get()));
 #endif
@@ -115,11 +112,8 @@ void ResourceRequest::doUpdatePlatformRequest()
     else
         nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
 
-#ifdef BUILDING_ON_TIGER
-    wkSupportsMultipartXMixedReplace(nsRequest);
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     if (ResourceRequest::httpPipeliningEnabled())
         wkSetHTTPPipeliningPriority(nsRequest, toHTTPPipeliningPriority(m_priority));
 #endif
index 704592a..483431f 100644 (file)
@@ -40,9 +40,6 @@
 - (NSTimeInterval)_calculatedExpiration;
 @end
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-#endif
 
 namespace WebCore {
 
index 3be2d88..56aa118 100644 (file)
@@ -148,7 +148,6 @@ bool isTextBreak(TextBreakIterator* iterator, int position)
     return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
 }
 
-#ifndef BUILDING_ON_TIGER
 static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBreakIterator*& iterator,
     const char* breakRules, const UChar* string, int length)
 {
@@ -173,14 +172,9 @@ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBrea
 
     return iterator;
 }
-#endif // BUILDING_ON_TIGER
 
 TextBreakIterator* cursorMovementIterator(const UChar* string, int length)
 {
-#ifdef BUILDING_ON_TIGER
-    // ICU 3.2 cannot compile the below rules.
-    return characterBreakIterator(string, length);
-#else
     // This rule set is based on character-break iterator rules of ICU 4.0
     // <http://source.icu-project.org/repos/icu/icu/tags/release-4-0/source/data/brkitr/char.txt>.
     // The major differences from the original ones are listed below:
@@ -260,7 +254,6 @@ TextBreakIterator* cursorMovementIterator(const UChar* string, int length)
     static bool createdCursorMovementIterator = false;
     static TextBreakIterator* staticCursorMovementIterator;
     return setUpIteratorWithRules(createdCursorMovementIterator, staticCursorMovementIterator, kRules, string, length);
-#endif // BUILDING_ON_TIGER
 }
 
 }
index d2040d5..72598c1 100644 (file)
 
 namespace WebCore {
 
-#if !defined(BUILDING_ON_TIGER)
 #define WTF_USE_GRAMMAR_CHECKING 1
-#endif
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
 #define WTF_USE_UNIFIED_TEXT_CHECKING 1
 #define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
 #endif
index c0d11de..c948758 100644 (file)
 #include "TextEncoding.h"
 #include <wtf/UnusedParam.h>
 
-#ifndef BUILDING_ON_TIGER
 #include "unicode/ucnv.h"
 #include "unicode/ucsdet.h"
-#endif
 
 namespace WebCore {
 
@@ -46,13 +44,6 @@ bool detectTextEncoding(const char* data, size_t len,
                         TextEncoding* detectedEncoding)
 {
     *detectedEncoding = TextEncoding();
-#ifdef BUILDING_ON_TIGER
-    // Tiger came with ICU 3.2 and does not have the encoding detector.
-    UNUSED_PARAM(data);
-    UNUSED_PARAM(len);
-    UNUSED_PARAM(hintEncodingName);
-    return false;
-#else
     int matchesCount = 0; 
     UErrorCode status = U_ZERO_ERROR;
     UCharsetDetector* detector = ucsdet_open(&status);
@@ -123,7 +114,6 @@ bool detectTextEncoding(const char* data, size_t len,
     }    
     ucsdet_close(detector);
     return false;
-#endif
 }
 
 }
index 3adacad..b1142a9 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Hyphenation.h"
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
 #include "AtomicStringKeyedMRUCache.h"
 #include "TextBreakIteratorInternalICU.h"
@@ -93,4 +93,4 @@ size_t lastHyphenLocation(const UChar*, size_t, size_t, const AtomicString&)
 
 } // namespace WebCore
 
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
index c99ddac..d1a8a32 100644 (file)
@@ -28,7 +28,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Threading.h>
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)
+#if PLATFORM(MAC)
 #include <objc/objc-auto.h>
 #endif
 
@@ -114,7 +114,7 @@ namespace StringWrapperCFAllocator {
 
     static CFAllocatorRef create()
     {
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)
+#if PLATFORM(MAC)
         // Since garbage collection isn't compatible with custom allocators, don't use this at all when garbage collection is active.
         if (objc_collectingEnabled())
             return 0;
index d5c9283..4c86768 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "Hyphenation.h"
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 
 #import "AtomicStringKeyedMRUCache.h"
 #import "TextBreakIteratorInternalICU.h"
@@ -67,4 +67,4 @@ size_t lastHyphenLocation(const UChar* characters, size_t length, size_t beforeI
 
 } // namespace WebCore
 
-#endif // defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
index 9da47fd..6df3484 100644 (file)
@@ -61,14 +61,10 @@ m_ascent(0), m_descent(0), m_lineGap(0), m_lineSpacing(0), m_xHeight(0)
         int iDescent;
         int iLineGap;
         unsigned unitsPerEm;
-#ifdef BUILDING_ON_TIGER
-        wkGetFontMetrics(cgFont, &iAscent, &iDescent, &iLineGap, &unitsPerEm);
-#else
         iAscent = CGFontGetAscent(cgFont);
         iDescent = CGFontGetDescent(cgFont);
         iLineGap = CGFontGetLeading(cgFont);
         unitsPerEm = CGFontGetUnitsPerEm(cgFont);
-#endif
         float pointSize = font->GetPointSize();
         float fAscent = scaleEmToUnits(iAscent, unitsPerEm) * pointSize;
         float fDescent = -scaleEmToUnits(iDescent, unitsPerEm) * pointSize;
index c02c129..e591442 100644 (file)
@@ -899,7 +899,7 @@ bool RenderLayerBacking::containsPaintedContent() const
     if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
         return hasBoxDecorationsOrBackground(renderer());
 #endif
-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #elif ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
     if (isAcceleratedCanvas(renderer()))
         return hasBoxDecorationsOrBackground(renderer());
index f4f95c5..ac403f2 100644 (file)
@@ -1426,14 +1426,6 @@ int RenderText::previousOffset(int current) const
     if (result == TextBreakDone)
         result = current - 1;
 
-#ifdef BUILDING_ON_TIGER
-    // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
-    if (static_cast<unsigned>(result) < si->length()) {
-        UChar character = (*si)[result];
-        if (character == 0xFF9E || character == 0xFF9F)
-            --result;
-    }
-#endif
 
     return result;
 }
@@ -1561,14 +1553,6 @@ int RenderText::nextOffset(int current) const
     if (result == TextBreakDone)
         result = current + 1;
 
-#ifdef BUILDING_ON_TIGER
-    // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
-    if (static_cast<unsigned>(result) < si->length()) {
-        UChar character = (*si)[result];
-        if (character == 0xFF9E || character == 0xFF9F)
-            ++result;
-    }
-#endif
 
     return result;
 }
index fb5b930..a10e599 100644 (file)
 #include "HTMLMeterElement.h"
 #endif
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-typedef unsigned NSUInteger;
-#endif
 
 using namespace std;
 
@@ -788,10 +784,8 @@ bool RenderThemeMac::paintMenuList(RenderObject* o, const PaintInfo& paintInfo,
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
     
-#ifndef BUILDING_ON_TIGER
     // On Leopard, the cell will draw outside of the given rect, so we have to clip to the rect
     paintInfo.context->clip(inflatedRect);
-#endif
 
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
@@ -1386,10 +1380,6 @@ bool RenderThemeMac::paintSearchField(RenderObject* o, const PaintInfo& paintInf
     [search setSearchButtonCell:nil];
 
     [search drawWithFrame:NSRect(unzoomedRect) inView:documentViewFor(o)];
-#ifdef BUILDING_ON_TIGER
-    if ([search showsFirstResponder])
-        wkDrawTextFieldCellFocusRing(search, NSRect(unzoomedRect));
-#endif
 
     [search setControlView:nil];
     [search resetSearchButtonCell];
@@ -1631,13 +1621,8 @@ static int mediaControllerTheme()
     Boolean validKey;
     Boolean useQTMediaUIPref = CFPreferencesGetAppBooleanValue(CFSTR("UseQuickTimeMediaUI"), CFSTR("com.apple.WebCore"), &validKey);
 
-#if !defined(BUILDING_ON_TIGER)
     if (validKey && !useQTMediaUIPref)
         return controllerTheme;
-#else
-    if (!validKey || !useQTMediaUIPref)
-        return controllerTheme;
-#endif
 
     controllerTheme = MediaControllerThemeQuickTime;
     return controllerTheme;
@@ -1977,7 +1962,7 @@ IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonB
 
 bool RenderThemeMac::shouldShowPlaceholderWhenFocused() const
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     return true;
 #else
     return false;
index de592d2..37b0ee7 100644 (file)
@@ -145,15 +145,6 @@ static inline bool needsLineBreakIterator(UChar ch)
     return ch > asciiLineBreakTableLastChar && ch != noBreakSpace;
 }
 
-#if PLATFORM(MAC) && defined(BUILDING_ON_TIGER)
-static inline TextBreakLocatorRef lineBreakLocator()
-{
-    TextBreakLocatorRef locator = 0;
-    UCCreateTextBreakLocator(0, 0, kUCTextBreakLineMask, &locator);
-    return locator;
-}
-#endif
-
 int nextBreakablePosition(LazyLineBreakIterator& lazyBreakIterator, int pos, bool treatNoBreakSpaceAsBreak)
 {
     const UChar* str = lazyBreakIterator.string();
@@ -169,18 +160,9 @@ int nextBreakablePosition(LazyLineBreakIterator& lazyBreakIterator, int pos, boo
 
         if (needsLineBreakIterator(ch) || needsLineBreakIterator(lastCh)) {
             if (nextBreak < i && i) {
-#if !PLATFORM(MAC) || !defined(BUILDING_ON_TIGER)
                 TextBreakIterator* breakIterator = lazyBreakIterator.get();
                 if (breakIterator)
                     nextBreak = textBreakFollowing(breakIterator, i - 1);
-#else
-                static TextBreakLocatorRef breakLocator = lineBreakLocator();
-                if (breakLocator) {
-                    UniCharArrayOffset nextUCBreak;
-                    if (UCFindTextBreak(breakLocator, kUCTextBreakLineMask, 0, str, len, i, &nextUCBreak) == 0)
-                        nextBreak = nextUCBreak;
-                }
-#endif
             }
             if (i == nextBreak && !isBreakableSpace(lastCh, treatNoBreakSpaceAsBreak))
                 return i;
index 7348304..0bfc640 100644 (file)
@@ -271,9 +271,7 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 // Given a reference to a Carbon window that is to be encapsulated, and an indicator of whether or not this object should take responsibility for disposing of the Carbon window, initialize.
index a3cdc66..284dcea 100644 (file)
@@ -105,9 +105,6 @@ static const OSType NSViewCarbonControlFirstResponderViewPropertyTag = 'frvw';
 */
 static const OSType NSCarbonWindowPropertyTag = 'win ';
 
-#ifdef BUILDING_ON_TIGER
-const int typeByteCount = typeSInt32;
-#endif
 
 static SEL _NSSelectorForHICommand( const HICommand* hiCommand );
 
index a6dd828..082cf6d 100644 (file)
     }
 }
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 1
 #else
 #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 0
index e794c2f..2248985 100644 (file)
@@ -104,9 +104,7 @@ WebBackForwardList *kit(BackForwardListImpl* backForwardList)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)init
index a2e49ed..d06aab5 100644 (file)
@@ -97,9 +97,7 @@ void WKNotifyHistoryItemChanged(HistoryItem*)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)init
index eda9985..8e39924 100644 (file)
@@ -464,13 +464,7 @@ all : \
 endif
 
 REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
-HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< $(PROCESS_HEADER_FOR_MACOSX_TARGET_CMD) > $@
-
-ifeq ($(MACOSX_DEPLOYMENT_TARGET),10.4)
-PROCESS_HEADER_FOR_MACOSX_TARGET_CMD = | ( unifdef -DBUILDING_ON_TIGER || exit 0 )
-else
-PROCESS_HEADER_FOR_MACOSX_TARGET_CMD = | ( unifdef -UBUILDING_ON_TIGER || exit 0 )
-endif
+HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< > $@
 
 $(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
        $(HEADER_MIGRATE_CMD)
index 71c4cc7..b01ae4c 100644 (file)
@@ -66,9 +66,7 @@ static void cacheValueForKey(const void *key, const void *value, void *self)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 + (void)initializeLookupTable
index 2331338..b1c6c97 100644 (file)
@@ -116,7 +116,7 @@ static NSMutableDictionary *descriptions = nil;
         [userInfo setObject:localizedDescription forKey:NSLocalizedDescriptionKey];
     if (contentURL) {
         [userInfo setObject:contentURL forKey:@"NSErrorFailingURLKey"];
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
         [userInfo setObject:[contentURL _web_userVisibleString] forKey:NSErrorFailingURLStringKey];
 #else
         [userInfo setObject:[contentURL _web_userVisibleString] forKey:NSURLErrorFailingURLStringErrorKey];
index 124a472..6eb09ba 100644 (file)
@@ -326,15 +326,11 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
     NSString *cacheDir = [defaults objectForKey:WebKitLocalCacheDefaultsKey];
 
     if (!cacheDir || ![cacheDir isKindOfClass:[NSString class]]) {
-#ifdef BUILDING_ON_TIGER
-        cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
-#else
         char cacheDirectory[MAXPATHLEN];
         size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
     
         if (cacheDirectoryLen)
             cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
-#endif
     }
 
     return [cacheDir stringByAppendingPathComponent:bundleIdentifier];
index dcf62d0..e9a0fec 100644 (file)
 @end
 
 
-#ifdef BUILDING_ON_TIGER
-@interface NSFileManager (WebNSFileManagerTigerForwardCompatibility)
-- (NSArray *)contentsOfDirectoryAtPath:(NSString *)path error:(NSError **)error;
-- (BOOL)moveItemAtPath:(NSString *)srcPath toPath:(NSString *)dstPath error:(NSError **)error;
-- (BOOL)removeItemAtPath:(NSString *)path error:(NSError **)error;
-- (NSDictionary *)attributesOfFileSystemForPath:(NSString *)path error:(NSError **)error;
-- (NSString *)destinationOfSymbolicLinkAtPath:(NSString *)path error:(NSError **)error;
-- (NSDictionary *)attributesOfItemAtPath:(NSString *)path error:(NSError **)error;
-@end
-#endif
index cafb69d..7a5647c 100644 (file)
@@ -186,60 +186,3 @@ static BOOL fileExists(NSString *path)
 
 @end
 
-#ifdef BUILDING_ON_TIGER
-
-@implementation NSFileManager (WebNSFileManagerTigerForwardCompatibility)
-
-- (NSArray *)contentsOfDirectoryAtPath:(NSString *)path error:(NSError **)error
-{
-    // We don't report errors via the NSError* output parameter, so ensure that the caller does not expect us to do so.
-    ASSERT_ARG(error, !error);
-
-    return [self directoryContentsAtPath:path];
-}
-
-- (NSString *)destinationOfSymbolicLinkAtPath:(NSString *)path error:(NSError **)error
-{
-    // We don't report errors via the NSError* output parameter, so ensure that the caller does not expect us to do so.
-    ASSERT_ARG(error, !error);
-
-    return [self pathContentOfSymbolicLinkAtPath:path];
-}
-
-- (NSDictionary *)attributesOfFileSystemForPath:(NSString *)path error:(NSError **)error
-{
-    // We don't report errors via the NSError* output parameter, so ensure that the caller does not expect us to do so.
-    ASSERT_ARG(error, !error);
-
-    return [self fileSystemAttributesAtPath:path];
-}
-
-- (NSDictionary *)attributesOfItemAtPath:(NSString *)path error:(NSError **)error
-{
-    // We don't report errors via the NSError* output parameter, so ensure that the caller does not expect us to do so.
-    ASSERT_ARG(error, !error);
-
-    return [self fileAttributesAtPath:path traverseLink:NO];
-}
-
-- (BOOL)moveItemAtPath:(NSString *)srcPath toPath:(NSString *)dstPath error:(NSError **)error
-{
-    // The implementation of moveItemAtPath:toPath:error: interacts with the NSFileManager's delegate.
-    // We are not matching that behaviour at the moment, but it should not be a problem as any client
-    // expecting that would need to call setDelegate: first which will generate a compile-time warning,
-    // as that method is not available on Tiger.
-    return [self movePath:srcPath toPath:dstPath handler:nil];
-}
-
-- (BOOL)removeItemAtPath:(NSString *)path error:(NSError **)error
-{
-    // The implementation of removeItemAtPath:error: interacts with the NSFileManager's delegate.
-    // We are not matching that behaviour at the moment, but it should not be a problem as any client
-    // expecting that would need to call setDelegate: first which will generate a compile-time warning,
-    // as that method is not available on Tiger.
-    return [self removeFileAtPath:path handler:nil];
-}
-
-@end
-
-#endif
index 4b97ab3..4ef95e3 100644 (file)
@@ -26,9 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef BUILDING_ON_TIGER
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
 
 
index d3cce46..2b807bf 100644 (file)
@@ -64,9 +64,7 @@ extern "C" {
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
     WKSendUserChangeNotifications();
 }
 
index 448b750..76afe21 100644 (file)
@@ -144,9 +144,7 @@ class WebHaltablePlugin;
 
 - (NSRect)actualVisibleRectInWindow; // takes transforms into account.
 
-#ifndef BUILDING_ON_TIGER
 - (CALayer *)pluginLayer;
-#endif
 
 @end
 
index f1eecde..25934d8 100644 (file)
@@ -117,9 +117,7 @@ String WebHaltablePlugin::pluginName() const
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
     WKSendUserChangeNotifications();
 }
 
@@ -143,7 +141,7 @@ String WebHaltablePlugin::pluginName() const
     _baseURL.adoptNS([baseURL copy]);
     _MIMEType.adoptNS([MIME copy]);
     
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     // Enable "kiosk mode" when instantiating the QT plug-in inside of Dashboard. See <rdar://problem/6878105>
     if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.dashboard.client"] &&
         [_pluginPackage.get() bundleIdentifier] == "com.apple.QuickTime Plugin.plugin") {
@@ -507,7 +505,7 @@ String WebHaltablePlugin::pluginName() const
     ASSERT(!_isHalted);
     ASSERT(_isStarted);
     Element *element = [self element];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     CGImageRef cgImage = CGImageRetain([core([self webFrame])->nodeImage(element).get() CGImageForProposedRect:nil context:nil hints:nil]);
 #else
     RetainPtr<CGImageSourceRef> imageRef(AdoptCF, CGImageSourceCreateWithData((CFDataRef)[core([self webFrame])->nodeImage(element).get() TIFFRepresentation], 0));
@@ -983,13 +981,11 @@ String WebHaltablePlugin::pluginName() const
     return intersection(toRenderWidget(renderer)->windowClipRect(), widgetRect);
 }
 
-#ifndef BUILDING_ON_TIGER
 - (CALayer *)pluginLayer
 {
     ASSERT_NOT_REACHED();
     return nil;
 }
-#endif
 
 @end
 
index 128834e..08cce94 100644 (file)
@@ -69,9 +69,7 @@ using namespace WebCore;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 + (WebBasePluginPackage *)pluginWithPath:(NSString *)pluginPath
index 445c3bb..e9d9220 100644 (file)
@@ -29,9 +29,6 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #import "WebBasePluginPackage.h"
 
-#ifdef BUILDING_ON_TIGER
-typedef short ResFileRefNum;
-#endif
 
 #if defined(__ppc__) && !defined(__LP64__)
 #define SUPPORT_CFM
index b2debfa..f122a58 100644 (file)
@@ -61,9 +61,7 @@ typedef union PluginPort {
 @interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader, WebPluginContainerCheckController>
 {
     RefPtr<WebNetscapePluginStream> _manualStream;
-#ifndef BUILDING_ON_TIGER
     RetainPtr<CALayer> _pluginLayer;
-#endif
     unsigned _dataLengthReceived;
     RetainPtr<NSError> _error;
         
@@ -154,9 +152,7 @@ typedef union PluginPort {
 @interface WebNetscapePluginView (WebInternal)
 - (BOOL)sendEvent:(void*)event isDrawRect:(BOOL)eventIsDrawRect;
 - (NPEventModel)eventModel;
-#ifndef BUILDING_ON_TIGER
 - (CALayer *)pluginLayer;
-#endif
 - (NPError)loadRequest:(NSURLRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData sendNotification:(BOOL)sendNotification;
 - (NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
 - (NPError)getURL:(const char *)URL target:(const char *)target;
index 3d0e3b2..afd979e 100644 (file)
@@ -193,9 +193,7 @@ typedef struct {
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
     WKSendUserChangeNotifications();
 }
 
@@ -1088,7 +1086,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     }        
 #endif // NP_NO_CARBON
     
-#ifndef BUILDING_ON_TIGER
     if (drawingModel == NPDrawingModelCoreAnimation) {
         void *value = 0;
         if ([_pluginPackage.get() pluginFuncs]->getvalue(plugin, NPPVpluginCoreAnimationLayer, &value) == NPERR_NO_ERROR && value) {
@@ -1126,7 +1123,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
 
         ASSERT(_pluginLayer);
     }
-#endif
     
     // Create the event handler
     _eventHandler = WebNetscapePluginEventHandler::create(self);
@@ -1134,7 +1130,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     return YES;
 }
 
-#ifndef BUILDING_ON_TIGER
 // FIXME: This method is an ideal candidate to move up to the base class
 - (CALayer *)pluginLayer
 {
@@ -1151,7 +1146,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
         [newLayer addSublayer:_pluginLayer.get()];
     }
 }
-#endif
 
 - (void)loadStream
 {
@@ -1202,9 +1196,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     // Setting the window type to 0 ensures that NPP_SetWindow will be called if the plug-in is restarted.
     lastSetWindow.type = (NPWindowType)0;
     
-#ifndef BUILDING_ON_TIGER
     _pluginLayer = 0;
-#endif
     
     [self _destroyPlugin];
     [_pluginPackage.get() close];
@@ -1328,19 +1320,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     [self cancelCheckIfAllowedToLoadURL:[[check contextInfo] checkRequestID]];
 }
 
-#ifdef BUILDING_ON_TIGER
-// The Tiger compiler requires these two methods be present. Otherwise it doesn't think WebNetscapePluginView
-// conforms to the WebPluginContainerCheckController protocol.
-- (WebView *)webView
-{
-    return [super webView];   
-}
-
-- (WebFrame *)webFrame
-{
-    return [super webFrame];   
-}
-#endif
 
 // MARK: NSVIEW
 
@@ -2060,11 +2039,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
         
         case NPNVsupportsCoreAnimationBool:
         {
-#ifdef BUILDING_ON_TIGER
-            *(NPBool *)value = FALSE;
-#else
             *(NPBool *)value = TRUE;
-#endif
             return NPERR_NO_ERROR;
         }
             
@@ -2124,9 +2099,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
                 case NPDrawingModelQuickDraw:
 #endif
                 case NPDrawingModelCoreGraphics:
-#ifndef BUILDING_ON_TIGER
                 case NPDrawingModelCoreAnimation:
-#endif
                     drawingModel = newDrawingModel;
                     return NPERR_NO_ERROR;
                     
@@ -2238,7 +2211,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
             break;
         }
         case NPNURLVProxy: {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
             if (!value)
                 break;
             
@@ -2348,7 +2321,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
 // For now, we'll distinguish older broken versions of Silverlight by asking the plug-in if it resolved its full screen badness.
 - (void)_workaroundSilverlightFullscreenBug:(BOOL)initializedPlugin
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     ASSERT(_isSilverlight);
     NPBool isFullscreenPerformanceIssueFixed = 0;
     NPPluginFuncs *pluginFuncs = [_pluginPackage.get() pluginFuncs];
index 15b2c67..ba1f7c9 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CorrectionPanel_h
 #define CorrectionPanel_h
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #import <AppKit/NSSpellChecker.h>
 #import <WebCore/SpellingCorrectionController.h>
 #import <wtf/RetainPtr.h>
@@ -55,6 +55,6 @@ private:
     RetainPtr<NSCondition> m_resultCondition;
 };
 
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
 #endif // CorrectionPanel_h
index ce52b74..b64b1a0 100644 (file)
@@ -26,7 +26,7 @@
 
 #import "WebViewPrivate.h"
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 using namespace WebCore;
 
 static inline NSCorrectionIndicatorType correctionIndicatorType(CorrectionPanelInfo::PanelType panelType)
@@ -153,5 +153,5 @@ void CorrectionPanel::handleAcceptedReplacement(NSString* acceptedReplacement, N
     [m_resultCondition.get() unlock];
 }
 
-#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
index 6bf116b..98aea54 100644 (file)
@@ -861,7 +861,7 @@ void WebChromeClient::formDidBlur(const WebCore::Node* node)
 
 bool WebChromeClient::selectItemWritingDirectionIsNatural()
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     return false;
 #else
     return true;
@@ -870,7 +870,7 @@ bool WebChromeClient::selectItemWritingDirectionIsNatural()
 
 bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     return true;
 #else
     return false;
index 0741165..dd3a880 100644 (file)
@@ -75,11 +75,8 @@ public:
     virtual void setInsertionPasteboard(NSPasteboard *);
     virtual NSURL* canonicalizeURL(NSURL*);
     virtual NSURL* canonicalizeURLString(NSString*);
-#ifdef BUILDING_ON_TIGER
-    virtual NSArray *pasteboardTypesForSelection(WebCore::Frame*);
-#endif
     
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     virtual void uppercaseWord();
     virtual void lowercaseWord();
     virtual void capitalizeWord();
@@ -139,7 +136,7 @@ public:
     virtual void willSetInputMethodState();
     virtual void setInputMethodState(bool enabled);
     virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     virtual void showCorrectionPanel(WebCore::CorrectionPanelInfo::PanelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
     virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel);
     virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel);
@@ -153,7 +150,7 @@ private:
     RetainPtr<WebEditorUndoTarget> m_undoTarget;
     bool m_haveUndoRedoOperations;
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     CorrectionPanel m_correctionPanel;
 #endif
 };
index 8036a9e..fe070df 100644 (file)
@@ -74,7 +74,7 @@ using namespace WebCore;
 
 using namespace HTMLNames;
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 @interface NSSpellChecker (WebNSSpellCheckerDetails)
 - (NSString *)languageForWordRange:(NSRange)range inString:(NSString *)string orthography:(NSOrthography *)orthography;
 @end
@@ -92,11 +92,6 @@ static WebViewInsertAction kit(EditorInsertAction coreAction)
 
 static const int InvalidCorrectionPanelTag = 0;
 
-#ifdef BUILDING_ON_TIGER
-@interface NSSpellChecker (NotYetPublicMethods)
-- (void)learnWord:(NSString *)word;
-@end
-#endif
 
 @interface WebEditCommand : NSObject
 {
@@ -114,9 +109,7 @@ static const int InvalidCorrectionPanelTag = 0;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)initWithEditCommand:(PassRefPtr<EditCommand>)command
@@ -193,7 +186,7 @@ WebEditorClient::WebEditorClient(WebView *webView)
 
 WebEditorClient::~WebEditorClient()
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     dismissCorrectionPanel(ReasonForDismissingCorrectionPanelIgnored);
 #endif
 }
@@ -210,18 +203,12 @@ void WebEditorClient::toggleContinuousSpellChecking()
 
 bool WebEditorClient::isGrammarCheckingEnabled()
 {
-#ifdef BUILDING_ON_TIGER
-    return false;
-#else
     return [m_webView isGrammarCheckingEnabled];
-#endif
 }
 
 void WebEditorClient::toggleGrammarChecking()
 {
-#ifndef BUILDING_ON_TIGER
     [m_webView toggleGrammarChecking:nil];
-#endif
 }
 
 int WebEditorClient::spellCheckerDocumentTag()
@@ -386,15 +373,8 @@ void WebEditorClient::setInsertionPasteboard(NSPasteboard *pasteboard)
     [m_webView _setInsertionPasteboard:pasteboard];
 }
 
-#ifdef BUILDING_ON_TIGER
-NSArray *WebEditorClient::pasteboardTypesForSelection(Frame* selectedFrame)
-{
-    WebFrame* frame = kit(selectedFrame);
-    return [[[frame frameView] documentView] pasteboardTypesForSelection];
-}
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 void WebEditorClient::uppercaseWord()
 {
     [m_webView uppercaseWord:nil];
@@ -748,7 +728,6 @@ String WebEditorClient::getAutoCorrectSuggestionForMisspelledWord(const String&
 
 void WebEditorClient::checkGrammarOfString(const UChar* text, int length, Vector<GrammarDetail>& details, int* badGrammarLocation, int* badGrammarLength)
 {
-#ifndef BUILDING_ON_TIGER
     NSArray *grammarDetails;
     NSString* textString = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(text) length:length freeWhenDone:NO];
     NSRange range = [[NSSpellChecker sharedSpellChecker] checkGrammarOfString:textString startingAt:0 language:nil wrap:NO inSpellDocumentWithTag:spellCheckerDocumentTag() details:&grammarDetails];
@@ -774,10 +753,9 @@ void WebEditorClient::checkGrammarOfString(const UChar* text, int length, Vector
             grammarDetail.guesses.append(String(guess));
         details.append(grammarDetail);
     }
-#endif
 }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 static Vector<TextCheckingResult> core(NSArray *incomingResults, TextCheckingTypeMask checkingTypes)
 {
     Vector<TextCheckingResult> results;
@@ -860,7 +838,7 @@ static Vector<TextCheckingResult> core(NSArray *incomingResults, TextCheckingTyp
 
 void WebEditorClient::checkTextOfParagraph(const UChar* text, int length, TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results)
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSString *textString = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(text) length:length freeWhenDone:NO];
     NSArray *incomingResults = [[NSSpellChecker sharedSpellChecker] checkString:textString range:NSMakeRange(0, [textString length]) types:(checkingTypes|NSTextCheckingTypeOrthography) options:nil inSpellDocumentWithTag:spellCheckerDocumentTag() orthography:NULL wordCount:NULL];
     [textString release];
@@ -870,7 +848,6 @@ void WebEditorClient::checkTextOfParagraph(const UChar* text, int length, TextCh
 
 void WebEditorClient::updateSpellingUIWithGrammarString(const String& badGrammarPhrase, const GrammarDetail& grammarDetail)
 {
-#ifndef BUILDING_ON_TIGER
     NSMutableArray* corrections = [NSMutableArray array];
     for (unsigned i = 0; i < grammarDetail.guesses.size(); i++) {
         NSString* guess = grammarDetail.guesses[i];
@@ -881,10 +858,9 @@ void WebEditorClient::updateSpellingUIWithGrammarString(const String& badGrammar
     NSMutableDictionary* grammarDetailDict = [NSDictionary dictionaryWithObjectsAndKeys:[NSValue valueWithRange:grammarRange], NSGrammarRange, grammarUserDescription, NSGrammarUserDescription, corrections, NSGrammarCorrections, nil];
     
     [[NSSpellChecker sharedSpellChecker] updateSpellingPanelWithGrammarString:badGrammarPhrase detail:grammarDetailDict];
-#endif
 }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 void WebEditorClient::showCorrectionPanel(CorrectionPanelInfo::PanelType panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
 {
     m_correctionPanel.show(m_webView, panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
@@ -928,7 +904,7 @@ bool WebEditorClient::spellingUIIsShowing()
 
 void WebEditorClient::getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) {
     guesses.clear();
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     NSString* language = nil;
     NSOrthography* orthography = nil;
     NSSpellChecker *checker = [NSSpellChecker sharedSpellChecker];
@@ -958,7 +934,7 @@ void WebEditorClient::setInputMethodState(bool)
 {
 }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 @interface WebEditorSpellCheckResponder : NSObject
 {
     WebCore::SpellChecker* _sender;
@@ -993,7 +969,7 @@ void WebEditorClient::setInputMethodState(bool)
 
 void WebEditorClient::requestCheckingOfString(WebCore::SpellChecker* sender, int sequence, WebCore::TextCheckingTypeMask checkingTypes, const String& text)
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSRange range = NSMakeRange(0, text.length());
     NSRunLoop* currentLoop = [NSRunLoop currentRunLoop];
     [[NSSpellChecker sharedSpellChecker] requestCheckingOfString:text range:range types:NSTextCheckingAllSystemTypes options:0 inSpellDocumentWithTag:0 
index 1b5766a..94340d5 100644 (file)
@@ -2028,9 +2028,7 @@ jobject WebFrameLoaderClient::javaApplet(NSView* view)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)initWithWebCoreFrame:(Frame*)frame
index e701495..6ebfb26 100644 (file)
@@ -233,7 +233,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
     [preferences setTabsToLinks:NO];
     [preferences setMinimumFontSize:0];
     [preferences setMinimumLogicalFontSize:9];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [preferences setFixedFontFamily:@"Menlo"];
     [preferences setDefaultFixedFontSize:11];
 #else
@@ -289,20 +289,16 @@ void WebInspectorFrontendClient::updateWindowTitle() const
 
     NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask);
 
-#ifndef BUILDING_ON_TIGER
     styleMask |= NSTexturedBackgroundWindowMask;
-#endif
 
     window = [[NSWindow alloc] initWithContentRect:NSMakeRect(60.0, 200.0, 750.0, 650.0) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [window setDelegate:self];
     [window setMinSize:NSMakeSize(400.0, 400.0)];
 
-#ifndef BUILDING_ON_TIGER
     [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
     [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
 
     WKNSWindowMakeBottomCornersSquare(window);
-#endif
 
     [self setWindow:window];
     [window release];
index 098aeea..f2c559d 100644 (file)
@@ -103,32 +103,16 @@ void InitWebCoreSystemInterface(void)
     INIT(QTClearMediaDownloadCacheForSite);
     INIT(QTClearMediaDownloadCache);
 
-#ifndef BUILDING_ON_TIGER
     INIT(GetGlyphsForCharacters);
-#else
-    INIT(ClearGlyphVector);
-    INIT(ConvertCharToGlyphs);
-    INIT(CopyFullFontName);
-    INIT(GetATSStyleGroup);
-    INIT(GetCGFontFromNSFont);
-    INIT(GetFontMetrics);
-    INIT(GetGlyphVectorFirstRecord);
-    INIT(GetGlyphVectorNumGlyphs);
-    INIT(GetGlyphVectorRecordSize);
-    INIT(GetNSFontATSUFontId);
-    INIT(InitializeGlyphVector);
-    INIT(ReleaseStyleGroup);
-    INIT(SupportsMultipartXMixedReplace);
-#endif
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
     INIT(GetHyphenationLocationBeforeIndex);
     INIT(GetNSEventMomentumPhase);
 #endif
 
     INIT(CreateCTLineWithUniCharProvider);
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     INIT(IOSurfaceContextCreate);
     INIT(IOSurfaceContextCreateImage);
     INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
index f07b51b..f17bfc7 100644 (file)
@@ -68,9 +68,7 @@ static NSString * const WebSubframeArchivesKey = @"WebSubframeArchives";
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)init
index 280695e..2b4576c 100644 (file)
@@ -51,7 +51,7 @@ using namespace WebCore;
 - (void)_immediateScrollToPoint:(NSPoint)newOrigin;
 @end
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 @interface NSWindow (WebNSWindowDetails)
 - (void)_disableDelayedWindowDisplay;
 - (void)_enableDelayedWindowDisplay;
@@ -104,13 +104,13 @@ using namespace WebCore;
 {
     _isScrolling = YES;
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [[self window] _disableDelayedWindowDisplay];
 #endif
 
     [super _immediateScrollToPoint:newOrigin];
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [[self window] _enableDelayedWindowDisplay];
 #endif
 
index 02dbc2c..81a6866 100644 (file)
@@ -81,9 +81,7 @@ using namespace WebCore;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (void)dealloc
index d5812a4..564f38d 100644 (file)
@@ -42,24 +42,9 @@ WebDocumentLoaderMac::WebDocumentLoaderMac(const ResourceRequest& request, const
 
 static inline bool needsDataLoadWorkaround(WebView *webView)
 {
-#ifdef BUILDING_ON_TIGER
-    // Tiger has to be a little less efficient.
-    id frameLoadDelegate = [webView frameLoadDelegate];
-    if (!frameLoadDelegate)
-        return false;
-
-    NSString *bundleIdentifier = [[NSBundle bundleForClass:[frameLoadDelegate class]] bundleIdentifier];
-
-    if ([bundleIdentifier isEqualToString:@"com.apple.AppKit"])
-        return true;
-    if ([bundleIdentifier isEqualToString:@"com.adobe.Installers.Setup"])
-        return true;
-    return false;
-#else
     static bool needsWorkaround = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_ADOBE_INSTALLER_QUIRK) 
                                   && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.adobe.Installers.Setup"];
     return needsWorkaround;
-#endif
 }
 
 void WebDocumentLoaderMac::setDataSource(WebDataSource *dataSource, WebView *webView)
index 1b245ec..b4840bc 100644 (file)
@@ -194,9 +194,6 @@ struct WebDynamicScrollBarsViewPrivate {
 {
     _private->suppressScrollers = suppressed;
 
-    // This code was originally changes for a Leopard performance imporvement. We decided to 
-    // ifdef it to fix correctness issues on Tiger documented in <rdar://problem/5441823>.
-#ifndef BUILDING_ON_TIGER
     if (suppressed) {
         [[self verticalScroller] setNeedsDisplay:NO];
         [[self horizontalScroller] setNeedsDisplay:NO];
@@ -204,12 +201,6 @@ struct WebDynamicScrollBarsViewPrivate {
 
     if (!suppressed && repaint)
         [super reflectScrolledClipView:[self contentView]];
-#else
-    if (suppressed || repaint) {
-        [[self verticalScroller] setNeedsDisplay:!suppressed];
-        [[self horizontalScroller] setNeedsDisplay:!suppressed];
-    }
-#endif
 }
 
 - (void)adjustForScrollOriginChange
@@ -385,21 +376,9 @@ static const unsigned cMaxUpdateScrollbarsPass = 2;
             [self updateScrollers];
     }
 
-    // This code was originally changed for a Leopard performance imporvement. We decided to 
-    // ifdef it to fix correctness issues on Tiger documented in <rdar://problem/5441823>.
-#ifndef BUILDING_ON_TIGER
     // Update the scrollers if they're not being suppressed.
     if (!_private->suppressScrollers)
         [super reflectScrolledClipView:clipView];
-#else
-    [super reflectScrolledClipView:clipView];
-
-    // Validate the scrollers if they're being suppressed.
-    if (_private->suppressScrollers) {
-        [[self verticalScroller] setNeedsDisplay:NO];
-        [[self horizontalScroller] setNeedsDisplay:NO];
-    }
-#endif
 
     // The call to [NSView reflectScrolledClipView] sets the scrollbar thumb
     // position to 0 (the left) when the view is initially displayed.
@@ -515,7 +494,7 @@ static const unsigned cMaxUpdateScrollbarsPass = 2;
     BOOL isContinuous;
     WKGetWheelEventDeltas(event, &deltaX, &deltaY, &isContinuous);
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     NSEventPhase momentumPhase = [event momentumPhase];
     BOOL isLatchingEvent = momentumPhase & NSEventPhaseBegan || momentumPhase & NSEventPhaseChanged;
 #else
index ab8c34d..c24c9f8 100644 (file)
@@ -393,7 +393,6 @@ WebView *getWebView(WebFrame *webFrame)
     return _private->internalLoadDelegate;
 }
 
-#ifndef BUILDING_ON_TIGER
 - (void)_unmarkAllBadGrammar
 {
     Frame* coreFrame = _private->coreFrame;
@@ -402,7 +401,6 @@ WebView *getWebView(WebFrame *webFrame)
             document->markers()->removeMarkers(DocumentMarker::Grammar);
     }
 }
-#endif
 
 - (void)_unmarkAllMisspellings
 {
index ff382d4..b34aea9 100644 (file)
@@ -103,9 +103,7 @@ WebView *getWebView(WebFrame *webFrame);
 - (void)_updateBackgroundAndUpdatesWhileOffscreen;
 - (void)_setInternalLoadDelegate:(id)internalLoadDelegate;
 - (id)_internalLoadDelegate;
-#ifndef BUILDING_ON_TIGER
 - (void)_unmarkAllBadGrammar;
-#endif
 - (void)_unmarkAllMisspellings;
 
 - (BOOL)_hasSelection;
index 41ac9ed..2da14d4 100644 (file)
@@ -311,7 +311,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
 
 // FIXME: Remove the NSAppKitVersionNumberWithDeferredWindowDisplaySupport check once
 // once AppKit's Deferred Window Display support is available.
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || !defined(NSAppKitVersionNumberWithDeferredWindowDisplaySupport)
+#if defined(BUILDING_ON_LEOPARD) || !defined(NSAppKitVersionNumberWithDeferredWindowDisplaySupport)
         // CoreGraphics deferred updates are disabled if WebKitEnableCoalescedUpdatesPreferenceKey is NO
         // or has no value. For compatibility with Mac OS X 10.5 and lower, deferred updates are off by default.
         if (![[NSUserDefaults standardUserDefaults] boolForKey:WebKitEnableDeferredUpdatesPreferenceKey])
index fd379d2..96cf19f 100644 (file)
@@ -80,7 +80,7 @@ using namespace WebCore;
 #endif
 
 @interface WebFullscreenWindow : NSWindow
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER)
+#ifndef BUILDING_ON_LEOPARD
 <NSAnimationDelegate>
 #endif
 {
@@ -151,14 +151,9 @@ private:
 
 - (void)windowDidLoad
 {
-#ifdef BUILDING_ON_TIGER
-    // WebFullScreenController is not supported on Tiger:
-    ASSERT_NOT_REACHED();
-#else
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
-#endif
 }
 
 #pragma mark -
@@ -183,10 +178,6 @@ private:
 
 - (void)setElement:(PassRefPtr<Element>)element
 {
-#ifdef BUILDING_ON_TIGER
-    // WebFullScreenController is not supported on Tiger:
-    ASSERT_NOT_REACHED();
-#else
     // When a new Element is set as the current full screen element, register event
     // listeners on that Element's window, listening for changes in media play states.
     // We will use these events to determine whether to disable the screensaver and 
@@ -214,7 +205,6 @@ private:
             window->addEventListener(eventNames.endedEvent, _mediaEventListener, true);
         }
     }
-#endif
 }
 
 - (RenderBox*)renderer 
@@ -224,12 +214,7 @@ private:
 
 - (void)setRenderer:(RenderBox*)renderer
 {
-#ifdef BUILDING_ON_TIGER
-    // WebFullScreenController is not supported on Tiger:
-    ASSERT_NOT_REACHED();
-#else
     _renderer = renderer;
-#endif
 }
 
 #pragma mark -
@@ -628,7 +613,7 @@ private:
 - (void)_updateMenuAndDockForFullscreen
 {
     // NSApplicationPresentationOptions is available on > 10.6 only:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
     NSScreen* fullscreenScreen = [[self window] screen];
     
@@ -652,7 +637,6 @@ private:
         SetSystemUIMode(_isFullscreen ? kUIModeNormal : kUIModeAllHidden, 0);
 }
 
-#if !defined(BUILDING_ON_TIGER) // IOPMAssertionCreateWithName not defined on < 10.5
 - (void)_disableIdleDisplaySleep
 {
     if (_idleDisplaySleepAssertion == kIOPMNullAssertionID) 
@@ -707,11 +691,9 @@ private:
 {
     UpdateSystemActivity(OverallAct);
 }
-#endif
 
 - (void)_updatePowerAssertions
 {
-#if !defined(BUILDING_ON_TIGER) 
     BOOL isPlaying = [self _isAnyMoviePlaying];
     
     if (isPlaying && _isFullscreen) {
@@ -723,7 +705,6 @@ private:
         [self _enableIdleDisplaySleep];
         [self _disableTickleTimer];
     }
-#endif
 }
 
 - (void)_requestExit
@@ -776,7 +757,7 @@ private:
 {
     static const CFTimeInterval defaultDuration = 0.5;
     CFTimeInterval duration = defaultDuration;
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSUInteger modifierFlags = [NSEvent modifierFlags];
 #else
     NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
@@ -809,7 +790,7 @@ private:
     [self setAcceptsMouseMovedEvents:YES];
     [self setReleasedWhenClosed:NO];
     [self setHasShadow:YES];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [self setMovable:NO];
 #else
     [self setMovableByWindowBackground:NO];
@@ -826,7 +807,7 @@ private:
     
     _backgroundLayer = [[CALayer alloc] init];
     [contentLayer addSublayer:_backgroundLayer];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [contentLayer setGeometryFlipped:YES];
 #else
     [contentLayer setSublayerTransform:CATransform3DMakeScale(1, -1, 1)];
index fb1d794..fc4cc9e 100644 (file)
@@ -227,7 +227,6 @@ static bool needsCursorRectsSupportAtPoint(NSWindow* window, NSPoint point)
     return true;
 }
 
-#ifndef BUILDING_ON_TIGER
 
 static IMP oldSetCursorForMouseLocationIMP;
 
@@ -238,26 +237,6 @@ static void setCursor(NSWindow *self, SEL cmd, NSPoint point)
         oldSetCursorForMouseLocationIMP(self, cmd, point);
 }
 
-#else
-
-static IMP oldResetCursorRectsIMP;
-static IMP oldSetCursorIMP;
-static BOOL canSetCursor = YES;
-
-static void resetCursorRects(NSWindow* self, SEL cmd)
-{
-    canSetCursor = needsCursorRectsSupportAtPoint(self, [self mouseLocationOutsideOfEventStream]);
-    oldResetCursorRectsIMP(self, cmd);
-    canSetCursor = YES;
-}
-
-static void setCursor(NSCursor* self, SEL cmd)
-{
-    if (canSetCursor)
-        oldSetCursorIMP(self, cmd);
-}
-
-#endif
 
 extern "C" {
 
@@ -404,7 +383,7 @@ static CachedResourceClient* promisedDataClient()
 - (void)_web_clearPrintingModeRecursive;
 @end
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 @interface WebHTMLView (WebHTMLViewTextCheckingInternal)
 - (void)orderFrontSubstitutionsPanel:(id)sender;
@@ -502,9 +481,7 @@ struct WebHTMLViewInterpretKeyEventsParameters {
     BOOL _forceUpdateSecureInputState;
 
     NSPoint lastScrollPosition;
-#ifndef BUILDING_ON_TIGER
     BOOL inScrollPositionChanged;
-#endif
 
     WebPluginController *pluginController;
     
@@ -520,9 +497,6 @@ struct WebHTMLViewInterpretKeyEventsParameters {
 
     NSMutableDictionary *highlighters;
 
-#ifdef BUILDING_ON_TIGER
-    BOOL nextResponderDisabledOnce;
-#endif
     
     WebTextCompletionController *completionController;
     
@@ -574,11 +548,8 @@ static FindOptions coreOptions(WebFindOptions options)
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
     
-#ifndef BUILDING_ON_TIGER
     if (!oldSetCursorForMouseLocationIMP) {
         Method setCursorMethod = class_getInstanceMethod([NSWindow class], @selector(_setCursorForMouseLocation:));
         ASSERT(setCursorMethod);
@@ -595,20 +566,6 @@ static FindOptions coreOptions(WebFindOptions options)
     }
 #endif // USE(ACCELERATED_COMPOSITING)
 
-#else // defined(BUILDING_ON_TIGER)
-    if (!oldSetCursorIMP) {
-        Method setCursorMethod = class_getInstanceMethod([NSCursor class], @selector(set));
-        ASSERT(setCursorMethod);
-        oldSetCursorIMP = method_setImplementation(setCursorMethod, (IMP)setCursor);
-        ASSERT(oldSetCursorIMP);
-    }
-    if (!oldResetCursorRectsIMP) {
-        Method resetCursorRectsMethod = class_getInstanceMethod([NSWindow class], @selector(resetCursorRects));
-        ASSERT(resetCursorRectsMethod);
-        oldResetCursorRectsIMP = method_setImplementation(resetCursorRectsMethod, (IMP)resetCursorRects);
-        ASSERT(oldResetCursorRectsIMP);
-    }
-#endif
 
 }
 
@@ -816,7 +773,7 @@ static NSURL* uniqueURLWithRelativePart(NSString *relativePart)
                                              subresources:0]))
         return fragment;
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if ([types containsObject:NSPICTPboardType] &&
         (fragment = [self _documentFragmentFromPasteboard:pasteboard 
                                                   forType:NSPICTPboardType
@@ -897,7 +854,7 @@ static NSURL* uniqueURLWithRelativePart(NSString *relativePart)
     DOMRange *range = [self _selectedRange];
     Frame* coreFrame = core([self _frame]);
     
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     DOMDocumentFragment *fragment = [self _documentFragmentFromPasteboard:pasteboard inContext:range allowPlainText:allowPlainText];
     if (fragment && [self _shouldInsertFragment:fragment replacingDOMRange:range givenAction:WebViewInsertActionPasted])
         coreFrame->editor()->pasteAsFragment(core(fragment), [self _canSmartReplaceWithPasteboard:pasteboard], false);
@@ -1258,13 +1215,9 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
     if (!NSEqualPoints(_private->lastScrollPosition, origin) && ![scrollView inProgrammaticScroll]) {
         if (Frame* coreFrame = core([self _frame])) {
             if (FrameView* coreView = coreFrame->view()) {
-#ifndef BUILDING_ON_TIGER
                 _private->inScrollPositionChanged = YES;
-#endif
                 coreView->scrollPositionChangedViaPlatformWidget();
-#ifndef BUILDING_ON_TIGER
                 _private->inScrollPositionChanged = NO;
-#endif
             }
         }
     
@@ -1335,21 +1288,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
 }
 #endif
 
-#ifdef BUILDING_ON_TIGER
-
-// This is called when we are about to draw, but before our dirty rect is propagated to our ancestors.
-// That's the perfect time to do a layout, except that ideally we'd want to be sure that we're dirty
-// before doing it. As a compromise, when we're opaque we do the layout only when actually asked to
-// draw, but when we're transparent we do the layout at this stage so views behind us know that they
-// need to be redrawn (in case the layout causes some things to get dirtied).
-- (void)_propagateDirtyRectsToOpaqueAncestors
-{
-    if (![[self _webView] drawsBackground])
-        [self _web_updateLayoutAndStyleIfNeededRecursive];
-    [super _propagateDirtyRectsToOpaqueAncestors];
-}
-
-#else
 
 - (void)viewWillDraw
 {
@@ -1361,7 +1299,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
     [super viewWillDraw];
 }
 
-#endif
 
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView
@@ -1373,14 +1310,11 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
     if (isPrinting) {
         if (!wasInPrintingMode)
             [self _web_setPrintingModeRecursive];
-#ifndef BUILDING_ON_TIGER
         else
             [self _web_updateLayoutAndStyleIfNeededRecursive];
-#endif
     } else if (wasInPrintingMode)
         [self _web_clearPrintingModeRecursive];
 
-#ifndef BUILDING_ON_TIGER
     // There are known cases where -viewWillDraw is not called on all views being drawn.
     // See <rdar://problem/6964278> for example. Performing layout at this point prevents us from
     // trying to paint without layout (which WebCore now refuses to do, instead bailing out without
@@ -1394,11 +1328,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
             [self _web_updateLayoutAndStyleIfNeededRecursive];
         }
     }
-#else
-    // Because Tiger does not have viewWillDraw we need to do layout here.
-    [self _web_updateLayoutAndStyleIfNeededRecursive];
-    [_subviews makeObjectsPerformSelector:@selector(_propagateDirtyRectsToOpaqueAncestors)];
-#endif
 
     [self _setAsideSubviews];
     [super _recursiveDisplayRectIfNeededIgnoringOpacity:rect isVisibleRect:isVisibleRect rectIsVisibleRectForView:visibleView topView:topView];
@@ -1426,28 +1355,11 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
         if (isPrinting) {
             if (!wasInPrintingMode)
                 [self _web_setPrintingModeRecursive];
-#ifndef BUILDING_ON_TIGER
             else
                 [self _web_updateLayoutAndStyleIfNeededRecursive];
-#endif
         } else if (wasInPrintingMode)
             [self _web_clearPrintingModeRecursive];
 
-#ifdef BUILDING_ON_TIGER
-
-        // Because Tiger does not have viewWillDraw we need to do layout here.
-        NSRect boundsBeforeLayout = [self bounds];
-        if (!NSIsEmptyRect(visRect))
-            [self _web_updateLayoutAndStyleIfNeededRecursive];
-
-        // If layout changes the view's bounds, then we need to recompute the visRect.
-        // That's because the visRect passed to us was based on the bounds at the time
-        // we were called. This method is only displayed to draw "all", so it's safe
-        // to just call visibleRect to compute the entire rectangle.
-        if (!NSEqualRects(boundsBeforeLayout, [self bounds]))
-            visRect = [self visibleRect];
-
-#endif
 
         [self _setAsideSubviews];
     }
@@ -1469,10 +1381,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView
 {
-#ifdef BUILDING_ON_TIGER 
-    // Because Tiger does not have viewWillDraw we need to do layout here.
-    [self _web_updateLayoutAndStyleIfNeededRecursive];
-#endif
 
     [self _setAsideSubviews];
     [super _recursive:recurse displayRectIgnoringOpacity:displayRect inContext:context topView:topView];
@@ -1717,7 +1625,7 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
     static NSArray *types = nil;
     if (!types) {
         types = [[NSArray alloc] initWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
             NSPICTPboardType,
 #endif
             NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil];
@@ -2107,7 +2015,7 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
         [resource release];
         return fragment;
     }
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     if (pboardType == NSPICTPboardType) {
         WebResource *resource = [[WebResource alloc] initWithData:[pasteboard dataForType:NSPICTPboardType]
                                                               URL:uniqueURLWithRelativePart(@"image.pict")
@@ -2349,30 +2257,6 @@ static bool matchesExtensionOrEquivalent(NSString *filename, NSString *extension
             && [filename _webkit_hasCaseInsensitiveSuffix:@".jpg"]);
 }
 
-#ifdef BUILDING_ON_TIGER
-
-// The following is a workaround for
-// <rdar://problem/3429631> window stops getting mouse moved events after first tooltip appears
-// The trick is to define a category on NSToolTipPanel that implements setAcceptsMouseMovedEvents:.
-// Since the category will be searched before the real class, we'll prevent the flag from being
-// set on the tool tip panel.
-
-@interface NSToolTipPanel : NSPanel
-@end
-
-@interface NSToolTipPanel (WebHTMLViewFileInternal)
-@end
-
-@implementation NSToolTipPanel (WebHTMLViewFileInternal)
-
-- (void)setAcceptsMouseMovedEvents:(BOOL)flag
-{
-    // Do nothing, preventing the tool tip panel from trying to accept mouse-moved events.
-}
-
-@end
-
-#endif
 
 @implementation WebHTMLView
 
@@ -2382,9 +2266,7 @@ static bool matchesExtensionOrEquivalent(NSString *filename, NSString *extension
                              returnTypes:[[self class] _insertablePasteboardTypes]];
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)initWithFrame:(NSRect)frame
@@ -2687,7 +2569,6 @@ WEBCORE_COMMAND(yankAndSelect)
         return [self _canEdit];
 
     if (action == @selector(showGuessPanel:)) {
-#ifndef BUILDING_ON_TIGER
         // Match OS X AppKit behavior for post-Tiger. Don't change Tiger behavior.
         NSMenuItem *menuItem = (NSMenuItem *)item;
         if ([menuItem isKindOfClass:[NSMenuItem class]]) {
@@ -2696,7 +2577,6 @@ WEBCORE_COMMAND(yankAndSelect)
                 ? UI_STRING_INTERNAL("Hide Spelling and Grammar", "menu item title")
                 : UI_STRING_INTERNAL("Show Spelling and Grammar", "menu item title")];
         }
-#endif
         return [self _canEdit];
     }
     
@@ -2780,7 +2660,6 @@ WEBCORE_COMMAND(yankAndSelect)
     if (action == @selector(stopSpeaking:))
         return [NSApp isSpeaking];
 
-#ifndef BUILDING_ON_TIGER
     if (action == @selector(toggleGrammarChecking:)) {
         // FIXME 4799134: WebView is the bottleneck for this grammar-checking logic, but we must validate 
         // the selector here because we implement it here, and we must implement it here because the AppKit 
@@ -2790,9 +2669,8 @@ WEBCORE_COMMAND(yankAndSelect)
             [menuItem setState:[self isGrammarCheckingEnabled] ? NSOnState : NSOffState];
         return YES;
     }
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     if (action == @selector(orderFrontSubstitutionsPanel:)) {
         NSMenuItem *menuItem = (NSMenuItem *)item;
         if ([menuItem isKindOfClass:[NSMenuItem class]]) {
@@ -3293,7 +3171,6 @@ static void setMenuTargets(NSMenu* menu)
 }
 #endif
 
-#ifndef BUILDING_ON_TIGER
 - (void)setNeedsDisplayInRect:(NSRect)invalidRect
 {
     if (_private->inScrollPositionChanged) {
@@ -3307,7 +3184,6 @@ static void setMenuTargets(NSMenu* menu)
     }
     [super setNeedsDisplayInRect:invalidRect];
 }
-#endif
 
 - (void)setNeedsLayout: (BOOL)flag
 {
@@ -4804,14 +4680,10 @@ NSStrokeColorAttributeName        /* NSColor, default nil: same as foreground co
     }
     
     NSPanel *spellingPanel = [checker spellingPanel];
-#ifndef BUILDING_ON_TIGER
-    // Post-Tiger, this menu item is a show/hide toggle, to match AppKit. Leave Tiger behavior alone
-    // to match rest of OS X.
     if ([spellingPanel isVisible]) {
         [spellingPanel orderOut:sender];
         return;
     }
-#endif
     
     if (Frame* coreFrame = core([self _frame]))
         coreFrame->editor()->advanceToNextMisspelling(true);
@@ -4918,7 +4790,7 @@ NSStrokeColorAttributeName        /* NSColor, default nil: same as foreground co
 
 static BOOL writingDirectionKeyBindingsEnabled()
 {
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     return YES;
 #else
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -4956,7 +4828,7 @@ static BOOL writingDirectionKeyBindingsEnabled()
     [self _changeBaseWritingDirectionTo:NSWritingDirectionRightToLeft];
 }
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 - (void)changeBaseWritingDirectionToLTR:(id)sender
 {
     [self makeBaseWritingDirectionLeftToRight:sender];
@@ -4996,7 +4868,6 @@ static BOOL writingDirectionKeyBindingsEnabled()
 
 #endif
 
-#ifndef BUILDING_ON_TIGER
 
 // Override this so that AppKit will send us arrow keys as key down events so we can
 // support them via the key bindings mechanism.
@@ -5011,76 +4882,6 @@ static BOOL writingDirectionKeyBindingsEnabled()
     return haveWebCoreFrame;
 }
 
-#else
-
-// Super-hack alert.
-// All this code accomplishes the same thing as the _wantsKeyDownForEvent method above.
-
-// Returns a selector only if called while:
-//   1) first responder is self
-//   2) handling a key down event
-//   3) not yet inside keyDown: method
-//   4) key is an arrow key
-// The selector is the one that gets sent by -[NSWindow _processKeyboardUIKey] for this key.
-- (SEL)_arrowKeyDownEventSelectorIfPreprocessing
-{
-    NSWindow *w = [self window];
-    if ([w firstResponder] != self)
-        return NULL;
-    NSEvent *e = [w currentEvent];
-    if ([e type] != NSKeyDown)
-        return NULL;
-    if (e == _private->keyDownEvent)
-        return NULL;
-    NSString *s = [e charactersIgnoringModifiers];
-    if ([s length] == 0)
-        return NULL;
-    switch ([s characterAtIndex:0]) {
-        case NSDownArrowFunctionKey:
-            return @selector(moveDown:);
-        case NSLeftArrowFunctionKey:
-            return @selector(moveLeft:);
-        case NSRightArrowFunctionKey:
-            return @selector(moveRight:);
-        case NSUpArrowFunctionKey:
-            return @selector(moveUp:);
-        default:
-            return NULL;
-    }
-}
-
-// Returns NO instead of YES if called on the selector that the
-// _arrowKeyDownEventSelectorIfPreprocessing method returns.
-// This should only happen inside -[NSWindow _processKeyboardUIKey],
-// and together with the change below should cause that method
-// to return NO rather than handling the key.
-// Also set a 1-shot flag for the nextResponder check below.
-- (BOOL)respondsToSelector:(SEL)selector
-{
-    if (![super respondsToSelector:selector])
-        return NO;
-    SEL arrowKeySelector = [self _arrowKeyDownEventSelectorIfPreprocessing];
-    if (selector != arrowKeySelector)
-        return YES;
-    _private->nextResponderDisabledOnce = YES;
-    return NO;
-}
-
-// Returns nil instead of the next responder if called when the
-// one-shot flag is set, and _arrowKeyDownEventSelectorIfPreprocessing
-// returns something other than NULL. This should only happen inside
-// -[NSWindow _processKeyboardUIKey] and together with the change above
-// should cause that method to return NO rather than handling the key.
-- (NSResponder *)nextResponder
-{
-    BOOL disabled = _private->nextResponderDisabledOnce;
-    _private->nextResponderDisabledOnce = NO;
-    if (disabled && [self _arrowKeyDownEventSelectorIfPreprocessing] != NULL)
-        return nil;
-    return [super nextResponder];
-}
-
-#endif
 
 - (void)_updateControlTints
 {
@@ -5210,7 +5011,6 @@ static BOOL writingDirectionKeyBindingsEnabled()
     return [self _documentFragmentFromPasteboard:pasteboard inContext:nil allowPlainText:NO];
 }
 
-#ifndef BUILDING_ON_TIGER
 
 - (BOOL)isGrammarCheckingEnabled
 {
@@ -5248,9 +5048,8 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     return CGPointMake(point.x, NSMaxY([[screens objectAtIndex:0] frame]) - point.y);
 }
 
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 - (void)orderFrontSubstitutionsPanel:(id)sender
 {
@@ -5380,14 +5179,12 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
 
     NSRect rect = coreFrame->selection()->bounds();
 
-#ifndef BUILDING_ON_TIGER
     NSDictionary *attributes = [attrString fontAttributesInRange:NSMakeRange(0,1)];
     NSFont *font = [attributes objectForKey:NSFontAttributeName];
     if (font)
         rect.origin.y += [font ascender];
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [self showDefinitionForAttributedString:attrString atPoint:rect.origin];
     return;
 #endif
@@ -5396,15 +5193,9 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     // penalty of linking to another framework. This function changed signature as well as framework between Tiger and Leopard,
     // so the two cases are handled separately.
 
-#ifdef BUILDING_ON_TIGER
-    typedef OSStatus (*ServiceWindowShowFunction)(id inWordString, NSRect inWordBoundary, UInt16 inLineDirection);
-    const char *frameworkPath = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/LangAnalysis.framework/LangAnalysis";
-    const char *functionName = "DCMDictionaryServiceWindowShow";
-#else
     typedef void (*ServiceWindowShowFunction)(id unusedDictionaryRef, id inWordString, CFRange selectionRange, id unusedFont, CGPoint textOrigin, Boolean verticalText, id unusedTransform);
     const char *frameworkPath = "/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/HIToolbox";
     const char *functionName = "HIDictionaryWindowShow";
-#endif
 
     static bool lookedForFunction = false;
     static ServiceWindowShowFunction dictionaryServiceWindowShow = NULL;
@@ -5423,18 +5214,6 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
         return;
     }
 
-#ifdef BUILDING_ON_TIGER
-    // FIXME: must check for right-to-left here
-    NSWritingDirection writingDirection = NSWritingDirectionLeftToRight;
-
-    // FIXME: the dictionary API expects the rect for the first line of selection. Passing
-    // the rect for the entire selection, as we do here, positions the pop-up window near
-    // the bottom of the selection rather than at the selected word.
-    rect = [self convertRect:rect toView:nil];
-    rect.origin = [[self window] convertBaseToScreen:rect.origin];
-    NSData *data = [attrString RTFFromRange:NSMakeRange(0, [attrString length]) documentAttributes:nil];
-    dictionaryServiceWindowShow(data, rect, (writingDirection == NSWritingDirectionRightToLeft) ? 1 : 0);
-#else
     // The HIDictionaryWindowShow function requires the origin, in CG screen coordinates, of the first character of text in the selection.
     // FIXME 4945808: We approximate this in a way that works well when a single word is selected, and less well in some other cases
     // (but no worse than we did in Tiger)
@@ -5443,7 +5222,6 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
 
     dictionaryServiceWindowShow(nil, attrString, CFRangeMake(0, [attrString length]), nil, 
                                 coreGraphicsScreenPointForAppKitScreenPoint(screenPoint), false, nil);
-#endif
 }
 
 - (void)_hoverFeedbackSuspendedChanged
@@ -5601,7 +5379,7 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
 {
     if (!_private->layerHostingView) {
         NSView* hostingView = [[NSView alloc] initWithFrame:[self bounds]];
-#if !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
         [hostingView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
 #endif
         [self addSubview:hostingView];
@@ -5613,7 +5391,7 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     // Make a container layer, which will get sized/positioned by AppKit and CA.
     CALayer* viewLayer = [CALayer layer];
 
-#if defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     // Turn off default animations.
     NSNull *nullValue = [NSNull null];
     NSDictionary *actions = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -5630,12 +5408,12 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     [viewLayer setStyle:[NSDictionary dictionaryWithObject:actions forKey:@"actions"]];
 #endif
 
-#if !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     // If we aren't in the window yet, we'll use the screen's scale factor now, and reset the scale 
     // via -viewDidMoveToWindow.
     NSWindow *window = [self window];
     CGFloat scaleFactor;
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#ifndef BUILDING_ON_SNOW_LEOPARD
     if (window)
         scaleFactor = [window backingScaleFactor];
     else
@@ -5667,7 +5445,7 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     if ([[self _webView] _postsAcceleratedCompositingNotifications])
         [[NSNotificationCenter defaultCenter] postNotificationName:_WebViewDidStartAcceleratedCompositingNotification object:[self _webView] userInfo:nil];
     
-#if defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     [viewLayer setSublayerTransform:CATransform3DMakeScale(1, -1, 1)]; // setGeometryFlipped: doesn't exist on Leopard.
     [self _updateLayerHostingViewPosition];
 #else
@@ -5686,7 +5464,7 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     }
 }
 
-#if defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 // This method is necessary on Leopard to work around <rdar://problem/7067892>.
 - (void)_updateLayerHostingViewPosition
 {
@@ -5889,18 +5667,10 @@ static CGPoint coreGraphicsScreenPointForAppKitScreenPoint(NSPoint point)
     return result;
 }
 
-// test for 10.4 because of <rdar://problem/4243463>
-#ifdef BUILDING_ON_TIGER
-- (long)conversationIdentifier
-{
-    return (long)self;
-}
-#else
 - (NSInteger)conversationIdentifier
 {
     return (NSInteger)self;
 }
-#endif
 
 - (BOOL)hasMarkedText
 {
index d38fded..8203370 100644 (file)
@@ -52,11 +52,9 @@ namespace WebCore {
 - (BOOL)_interpretKeyEvent:(WebCore::KeyboardEvent *)event savingCommands:(BOOL)savingCommands;
 - (DOMDocumentFragment *)_documentFragmentFromPasteboard:(NSPasteboard *)pasteboard;
 - (NSEvent *)_mouseDownEvent;
-#ifndef BUILDING_ON_TIGER
 - (BOOL)isGrammarCheckingEnabled;
 - (void)setGrammarCheckingEnabled:(BOOL)flag;
 - (void)toggleGrammarChecking:(id)sender;
-#endif
 - (WebCore::CachedImage*)promisedDragTIFFDataSource;
 - (void)setPromisedDragTIFFDataSource:(WebCore::CachedImage*)source;
 - (void)_web_updateLayoutAndStyleIfNeededRecursive;
index 7651dba..90bb8a0 100644 (file)
@@ -31,7 +31,7 @@
 #import <PDFKit/PDFDocument.h>
 #import <objc/objc-runtime.h>
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 @interface PDFDocument (Internal)
 - (CGPDFDocumentRef)documentRef;
 @end
index 8adae4e..c5f1eed 100644 (file)
@@ -357,7 +357,7 @@ static bool useQuickLookQuirks(void)
         @"0",                           WebKitUseSiteSpecificSpoofingPreferenceKey,
         [NSNumber numberWithInt:WebKitEditableLinkDefaultBehavior], WebKitEditableLinkBehaviorPreferenceKey,
         [NSNumber numberWithInt:WebKitEditingMacBehavior], WebKitEditingBehaviorPreferenceKey,
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
         [NSNumber numberWithInt:WebTextDirectionSubmenuAutomaticallyIncluded],
 #else
         [NSNumber numberWithInt:WebTextDirectionSubmenuNeverIncluded],
index fd02212..bbfc871 100644 (file)
@@ -67,9 +67,7 @@ static NSString * const WebResourceResponseKey =          @"WebResourceResponse"
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)init
index d135197..ba84105 100644 (file)
@@ -29,7 +29,7 @@
 #import "WebResourcePrivate.h"
 #import <wtf/PassRefPtr.h>
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 #define MAIL_THREAD_WORKAROUND 1
 #endif
 
index 2444b98..8dc5543 100644 (file)
@@ -34,7 +34,7 @@
 #define WebNSUInteger NSUInteger
 #endif
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
 typedef int WebSourceId;
 #else
 typedef intptr_t WebSourceId;
index eef0660..36eef54 100644 (file)
@@ -49,9 +49,7 @@ using namespace WebCore;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 @end
index fdf1c88..f9e36d7 100644 (file)
@@ -51,7 +51,7 @@ SOFT_LINK_POINTER(QTKit, QTMovieRateDidChangeNotification, NSString *)
 static const NSTimeInterval tickleTimerInterval = 1.0;
 
 @interface WebVideoFullscreenWindow : NSWindow
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER)
+#ifndef BUILDING_ON_LEOPARD
 <NSAnimationDelegate>
 #endif
 {
@@ -119,10 +119,6 @@ static const NSTimeInterval tickleTimerInterval = 1.0;
 
 - (void)windowDidLoad
 {
-#ifdef BUILDING_ON_TIGER
-    // WebVideoFullscreenController is not supported on Tiger:
-    ASSERT_NOT_REACHED();
-#else
     WebVideoFullscreenWindow *window = [self fullscreenWindow];
     [window setHasShadow:YES]; // This is nicer with a shadow.
     [window setLevel:NSPopUpMenuWindowLevel-1];
@@ -135,7 +131,6 @@ static const NSTimeInterval tickleTimerInterval = 1.0;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
 #endif
-#endif
 }
 
 - (WebCore::HTMLMediaElement*)mediaElement
@@ -145,10 +140,6 @@ static const NSTimeInterval tickleTimerInterval = 1.0;
 
 - (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement
 {
-#ifdef BUILDING_ON_TIGER
-    // WebVideoFullscreenController is not supported on Tiger:
-    ASSERT_NOT_REACHED();
-#else
     _mediaElement = mediaElement;
     if ([self isWindowLoaded]) {
         QTMovieLayer *movieLayer = (QTMovieLayer *)[[[self fullscreenWindow] contentView] layer];
@@ -163,7 +154,6 @@ static const NSTimeInterval tickleTimerInterval = 1.0;
                                                    object:[movieLayer movie]];
 #endif
     }
-#endif
 }
 
 - (id <WebVideoFullscreenControllerDelegate>)delegate
@@ -348,7 +338,7 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
 - (void)updateMenuAndDockForFullscreen
 {
     // NSApplicationPresentationOptions is available on > 10.6 only:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
     NSScreen* fullscreenScreen = [[self window] screen];
 
@@ -372,7 +362,6 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
         SetSystemUIMode(_isEndingFullscreen ? kUIModeNormal : kUIModeAllHidden, 0);
 }
 
-#if !defined(BUILDING_ON_TIGER) // IOPMAssertionCreateWithName not defined on < 10.5
 - (void)_disableIdleDisplaySleep
 {
     if (_idleDisplaySleepAssertion == kIOPMNullAssertionID) 
@@ -427,11 +416,9 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
 {
     UpdateSystemActivity(OverallAct);
 }
-#endif
 
 - (void)updatePowerAssertions
 {
-#if !defined(BUILDING_ON_TIGER) 
     float rate = 0;
     if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType)
         rate = [_mediaElement->platformMedia().media.qtMovie rate];
@@ -445,7 +432,6 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
         [self _enableIdleDisplaySleep];
         [self _disableTickleTimer];
     }
-#endif
 }
 
 // MARK: -
@@ -594,12 +580,10 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
 
 - (void)animationDidEnd:(NSAnimation *)animation
 {
-#if !defined(BUILDING_ON_TIGER) // Animations are never threaded on Tiger.
     if (![NSThread isMainThread]) {
         [self performSelectorOnMainThread:@selector(animationDidEnd:) withObject:animation waitUntilDone:NO];
         return;
     }
-#endif
     if (animation != _fullscreenAnimation)
         return;
 
index a3d74d2..5584241 100644 (file)
@@ -35,9 +35,7 @@ namespace WebCore {
 {
     id <WebVideoFullscreenHUDWindowControllerDelegate> _delegate;
     NSTimer *_timelineUpdateTimer;
-#if !defined(BUILDING_ON_TIGER)
     NSTrackingArea *_area;
-#endif
     BOOL _mouseIsInHUD;
     BOOL _isEndingFullscreen;
     BOOL _isScrubbing;
index 0a5aca4..5866e52 100644 (file)
@@ -42,7 +42,7 @@ static inline CGFloat webkit_CGFloor(CGFloat value)
     return floor(value);
 }
 
-#define HAVE_MEDIA_CONTROL (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
+#define HAVE_MEDIA_CONTROL (!defined(BUILDING_ON_LEOPARD))
 
 @interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
 
@@ -161,9 +161,7 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 - (void)dealloc
 {
     ASSERT(!_timelineUpdateTimer);
-#if !defined(BUILDING_ON_TIGER)
     ASSERT(!_area);
-#endif
     ASSERT(!_isScrubbing);
     [_timeline release];
     [_remainingTimeText release];
@@ -173,7 +171,6 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
     [super dealloc];
 }
 
-#if !defined(BUILDING_ON_TIGER)
 - (void)setArea:(NSTrackingArea *)area
 {
     if (area == _area)
@@ -181,7 +178,6 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
     [_area release];
     _area = [area retain];
 }
-#endif
 
 - (void)keyDown:(NSEvent *)event
 {
@@ -234,11 +230,7 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 
     // Note that this creates a retain cycle between the window and us.
     _timelineUpdateTimer = [[NSTimer timerWithTimeInterval:0.25 target:self selector:@selector(updateTime) userInfo:nil repeats:YES] retain];
-#if defined(BUILDING_ON_TIGER)
-    [[NSRunLoop currentRunLoop] addTimer:_timelineUpdateTimer forMode:(NSString *)kCFRunLoopCommonModes];
-#else
     [[NSRunLoop currentRunLoop] addTimer:_timelineUpdateTimer forMode:NSRunLoopCommonModes];
-#endif
 }
 
 - (void)unscheduleTimeUpdate
@@ -257,11 +249,7 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
         [window setAlphaValue:0];
 
     [window makeKeyAndOrderFront:self];
-#if defined(BUILDING_ON_TIGER)
-    [window setAlphaValue:1];
-#else
     [[window animator] setAlphaValue:1];
-#endif
     [self scheduleTimeUpdate];
 
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
@@ -272,11 +260,7 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 - (void)fadeWindowOut
 {
     [NSCursor setHiddenUntilMouseMoves:YES];
-#if defined(BUILDING_ON_TIGER)
-    [[self window] setAlphaValue:0];
-#else
     [[[self window] animator] setAlphaValue:0];
-#endif
     [self performSelector:@selector(unscheduleTimeUpdate) withObject:nil afterDelay:1];
 }
 
@@ -285,10 +269,8 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
     [self unscheduleTimeUpdate];
     NSWindow *window = [self window];
-#if !defined(BUILDING_ON_TIGER)
     [[window contentView] removeTrackingArea:_area];
     [self setArea:nil];
-#endif
     [window close];
     [window setDelegate:nil];
     [self setWindow:nil];
@@ -364,10 +346,8 @@ static NSTextField *createTimeTextField(NSRect frame)
     NSView *background = [[NSView alloc] init];
 #endif
     [window setContentView:background];
-#if !defined(BUILDING_ON_TIGER)
     _area = [[NSTrackingArea alloc] initWithRect:[background bounds] options:NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways owner:self userInfo:nil];
     [background addTrackingArea:_area];
-#endif
     [background release];    
 
     NSView *contentView = [window contentView];
index 6acf76b..b0d917f 100644 (file)
@@ -448,10 +448,8 @@ NSString *_WebViewDidStartAcceleratedCompositingNotification = @"_WebViewDidStar
 @end
 
 static BOOL continuousSpellCheckingEnabled;
-#ifndef BUILDING_ON_TIGER
 static BOOL grammarCheckingEnabled;
-#endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 static BOOL automaticQuoteSubstitutionEnabled;
 static BOOL automaticLinkDetectionEnabled;
 static BOOL automaticDashSubstitutionEnabled;
@@ -595,9 +593,6 @@ static bool runningLeopardMail()
 
 static bool runningTigerMail()
 {
-#ifdef BUILDING_ON_TIGER
-    return applicationIsAppleMail();
-#endif
     return NO;    
 }
 
@@ -746,11 +741,7 @@ static NSString *leakOutlookQuirksUserScriptContents()
 
     [WebFrame _createMainFrameWithPage:_private->page frameName:frameName frameView:frameView];
 
-#ifndef BUILDING_ON_TIGER
     NSRunLoop *runLoop = [NSRunLoop mainRunLoop];
-#else
-    NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
-#endif
 
     if (WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES))
         [self scheduleInRunLoop:runLoop forMode:(NSString *)kCFRunLoopCommonModes];
@@ -894,8 +885,6 @@ static NSString *leakOutlookQuirksUserScriptContents()
     [super setFrameSize:size];
 }
 
-#if USE(ACCELERATED_COMPOSITING) || !defined(BUILDING_ON_TIGER)
-
 - (void)_viewWillDrawInternal
 {
     Frame* frame = [self _mainCoreFrame];
@@ -903,10 +892,6 @@ static NSString *leakOutlookQuirksUserScriptContents()
         frame->view()->updateLayoutAndStyleIfNeededRecursive();
 }
 
-#endif
-
-#ifndef BUILDING_ON_TIGER
-
 - (void)viewWillDraw
 {
     if (!_private->usesDocumentViews)
@@ -914,7 +899,6 @@ static NSString *leakOutlookQuirksUserScriptContents()
     [super viewWillDraw];
 }
 
-#endif
 
 
 - (void)drawRect:(NSRect)rect
@@ -1546,7 +1530,7 @@ static bool fastDocumentTeardownEnabled()
 #if ENABLE(FULLSCREEN_API)
     settings->setFullScreenEnabled([preferences fullScreenEnabled]);
 #endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     // Asynchronous spell checking API is available for 10.6 or later.
     settings->setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
 #endif
@@ -2905,11 +2889,9 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];    
 
     continuousSpellCheckingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebContinuousSpellCheckingEnabled];
-#ifndef BUILDING_ON_TIGER
     grammarCheckingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebGrammarCheckingEnabled];
-#endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     automaticQuoteSubstitutionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticQuoteSubstitutionEnabled];
     automaticLinkDetectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticLinkDetectionEnabled];
     automaticDashSubstitutionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticDashSubstitutionEnabled];
@@ -2917,7 +2899,7 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
     automaticSpellingCorrectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebAutomaticSpellingCorrectionEnabled];
 #endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticTextReplacementEnabled])
         automaticTextReplacementEnabled = [NSSpellChecker isAutomaticTextReplacementEnabled];
     if (![[NSUserDefaults standardUserDefaults] objectForKey:WebAutomaticSpellingCorrectionEnabled])
@@ -3124,7 +3106,7 @@ static bool clientNeedsWebViewInitThreadWorkaround()
     if ([bundleIdentifier _webkit_hasCaseInsensitivePrefix:@"com.apple.Automator."])
         return true;
 
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     // Mail.
     if ([bundleIdentifier _webkit_isCaseInsensitiveEqualToString:@"com.apple.Mail"])
         return true;
@@ -4386,7 +4368,6 @@ static WebFrame *incrementFrame(WebFrame *frame, WebFindOptions options = 0)
             [menuItem setState:checkMark ? NSOnState : NSOffState];
         }
         return YES;
-#ifndef BUILDING_ON_TIGER
     } else if (action == @selector(toggleGrammarChecking:)) {
         BOOL checkMark = [self isGrammarCheckingEnabled];
         if ([(NSObject *)item isKindOfClass:[NSMenuItem class]]) {
@@ -4394,8 +4375,7 @@ static WebFrame *incrementFrame(WebFrame *frame, WebFindOptions options = 0)
             [menuItem setState:checkMark ? NSOnState : NSOffState];
         }
         return YES;
-#endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     } else if (action == @selector(toggleAutomaticQuoteSubstitution:)) {
         BOOL checkMark = [self isAutomaticQuoteSubstitutionEnabled];
         if ([(NSObject *)item isKindOfClass:[NSMenuItem class]]) {
@@ -5225,14 +5205,9 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 // FIXME: This method should be merged into WebViewEditing when we're not in API freeze
 - (BOOL)isGrammarCheckingEnabled
 {
-#ifdef BUILDING_ON_TIGER
-    return NO;
-#else
     return grammarCheckingEnabled;
-#endif
 }
 
-#ifndef BUILDING_ON_TIGER
 // FIXME: This method should be merged into WebViewEditing when we're not in API freeze
 - (void)setGrammarCheckingEnabled:(BOOL)flag
 {
@@ -5262,7 +5237,6 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 {
     [self setGrammarCheckingEnabled:![self isGrammarCheckingEnabled]];
 }
-#endif
 
 @end
 
@@ -5270,7 +5244,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)isAutomaticQuoteSubstitutionEnabled
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     return NO;
 #else
     return automaticQuoteSubstitutionEnabled;
@@ -5279,7 +5253,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)isAutomaticLinkDetectionEnabled
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     return NO;
 #else
     return automaticLinkDetectionEnabled;
@@ -5288,7 +5262,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)isAutomaticDashSubstitutionEnabled
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     return NO;
 #else
     return automaticDashSubstitutionEnabled;
@@ -5297,7 +5271,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)isAutomaticTextReplacementEnabled
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     return NO;
 #else
     return automaticTextReplacementEnabled;
@@ -5306,14 +5280,14 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 - (BOOL)isAutomaticSpellingCorrectionEnabled
 {
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
     return NO;
 #else
     return automaticSpellingCorrectionEnabled;
 #endif
 }
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 
 - (void)setAutomaticQuoteSubstitutionEnabled:(BOOL)flag
 {
@@ -5387,7 +5361,7 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue jsValu
 
 #endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 - (void)handleCorrectionPanelResult:(NSString*)result
 {
     WebFrame *webFrame = [self _selectedOrMainFrame];
@@ -5687,11 +5661,6 @@ static inline uint64_t roundUpToPowerOf2(uint64_t num)
         ASSERT_NOT_REACHED();
     };
 
-#ifdef BUILDING_ON_TIGER
-    // Don't use a big Foundation disk cache on Tiger because, according to the 
-    // PLT, the Foundation disk cache on Tiger is slower than the network. 
-    nsurlCacheDiskCapacity = [nsurlCache diskCapacity];
-#endif
 
     // Don't shrink a big disk cache, since that would cause churn.
     nsurlCacheDiskCapacity = max(nsurlCacheDiskCapacity, [nsurlCache diskCapacity]);
@@ -5872,7 +5841,7 @@ static inline uint64_t roundUpToPowerOf2(uint64_t num)
     if (![selectedString length])
         return;
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [[NSWorkspace sharedWorkspace] showSearchResultsForQueryString:selectedString];
 #else
     (void)HISearchWindowShow((CFStringRef)selectedString, kNilOptions);
index e74c7a1..91f52fd 100644 (file)
@@ -46,9 +46,7 @@ int pluginDatabaseClientCount = 0;
 {
     JSC::initializeThreading();
     WTF::initializeMainThreadToProcessMainThread();
-#ifndef BUILDING_ON_TIGER
     WebCoreObjCFinalizeOnMainThread(self);
-#endif
 }
 
 - (id)init 
@@ -73,11 +71,7 @@ int pluginDatabaseClientCount = 0;
     dashboardBehaviorAllowWheelScrolling = YES;
 #endif
 
-#if !defined(BUILDING_ON_TIGER)
     shouldCloseWithWindow = objc_collectingEnabled();
-#else
-    shouldCloseWithWindow = NO;
-#endif
 
     smartInsertDeleteEnabled = ![[NSUserDefaults standardUserDefaults] objectForKey:WebSmartInsertDeleteEnabled]
         || [[NSUserDefaults standardUserDefaults] boolForKey:WebSmartInsertDeleteEnabled];
index a185667..fb2d6aa 100644 (file)
@@ -43,7 +43,7 @@ using namespace WebCore;
 - (NSTextInputContext *)inputContext;
 @end
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 @interface NSObject (NSTextInputContextDetails)
 - (BOOL)wantsToHandleMouseEvents;
 - (BOOL)handleMouseEvent:(NSEvent *)event;
index fa4844f..10f62c5 100644 (file)
@@ -638,12 +638,10 @@ Could be worth adding to the API.
 
 // FIXME: These two methods should be merged into WebViewEditing when we're not in API freeze
 - (BOOL)isGrammarCheckingEnabled;
-#ifndef BUILDING_ON_TIGER
 - (void)setGrammarCheckingEnabled:(BOOL)flag;
 
 // FIXME: This method should be merged into WebIBActions when we're not in API freeze
 - (void)toggleGrammarChecking:(id)sender;
-#endif
 
 @end
 
@@ -654,7 +652,7 @@ Could be worth adding to the API.
 - (BOOL)isAutomaticDashSubstitutionEnabled;
 - (BOOL)isAutomaticTextReplacementEnabled;
 - (BOOL)isAutomaticSpellingCorrectionEnabled;
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
 - (void)setAutomaticQuoteSubstitutionEnabled:(BOOL)flag;
 - (void)toggleAutomaticQuoteSubstitution:(id)sender;
 - (void)setAutomaticLinkDetectionEnabled:(BOOL)flag;
@@ -666,7 +664,7 @@ Could be worth adding to the API.
 - (void)setAutomaticSpellingCorrectionEnabled:(BOOL)flag;
 - (void)toggleAutomaticSpellingCorrection:(id)sender;
 #endif
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 - (void)handleCorrectionPanelResult:(NSString*)result;
 #endif
 @end
index 6eadb21..ada86e5 100644 (file)
@@ -58,9 +58,7 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
     self = [super init];
     if (!self)
         return nil;
-#ifndef BUILDING_ON_TIGER
     [self setAnimationBlockingMode:NSAnimationNonblockingThreaded];
-#endif
     [self setFrameRate:60.];
     return self;
 }
@@ -112,11 +110,7 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
     [super setCurrentProgress:progress];
 
     NSRect currentRect = [self currentFrame];
-#ifndef BUILDING_ON_TIGER
     WKWindowSetScaledFrame(_window, currentRect, _realFrame);
-#else
-    [_window setFrame:currentRect display:YES];
-#endif
     [_subAnimation setCurrentProgress:progress];
 }
 
@@ -174,9 +168,7 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
     self = [super init];
     if (!self)
         return nil;
-#ifndef BUILDING_ON_TIGER
     [self setAnimationBlockingMode:NSAnimationNonblockingThreaded];
-#endif
     [self setFrameRate:60];
     [self setAnimationCurve:NSAnimationEaseInOut];
     return self;
@@ -211,11 +203,7 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
     ASSERT(_window);
     [super setCurrentProgress:progress];
 
-#ifndef BUILDING_ON_TIGER
     WKWindowSetAlpha(_window, [self currentAlpha]);
-#else
-    [_window setAlphaValue:[self currentAlpha]];
-#endif
 }
 
 - (void)setWindow:(NSWindow*)window
index 28df29b..26cc6dc 100644 (file)
@@ -44,7 +44,7 @@ static inline NSArray *retain(NSArray *array)
 NSArray* PasteboardTypes::forEditing()
 {
     static NSArray *types = retain([NSArray arrayWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
-#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
+#ifdef BUILDING_ON_LEOPARD
         NSPICTPboardType,
 #endif
         NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil]);
index 09c582d..f7259aa 100644 (file)
@@ -380,7 +380,7 @@ using namespace WebCore;
 - (void)_updateMenuAndDockForFullScreen
 {
     // NSApplicationPresentationOptions is available on > 10.6 only:
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
     NSScreen* fullScreenScreen = [[self window] screen];
     
@@ -404,7 +404,6 @@ using namespace WebCore;
         SetSystemUIMode(_isFullScreen ? kUIModeNormal : kUIModeAllHidden, 0);
 }
 
-#if !defined(BUILDING_ON_TIGER) // IOPMAssertionCreateWithName not defined on < 10.5
 - (void)_disableIdleDisplaySleep
 {
     if (_idleDisplaySleepAssertion == kIOPMNullAssertionID) 
@@ -459,11 +458,9 @@ using namespace WebCore;
 {
     UpdateSystemActivity(OverallAct);
 }
-#endif
 
 - (void)_updatePowerAssertions
 {
-#if !defined(BUILDING_ON_TIGER) 
     if (_isPlaying && _isFullScreen) {
         [self _disableIdleSystemSleep];
         [self _disableIdleDisplaySleep];
@@ -473,7 +470,6 @@ using namespace WebCore;
         [self _enableIdleDisplaySleep];
         [self _disableTickleTimer];
     }
-#endif
 }
 
 - (WebFullScreenManagerProxy*)_manager
@@ -518,7 +514,7 @@ using namespace WebCore;
 {
     static const CFTimeInterval defaultDuration = 0.5;
     CFTimeInterval duration = defaultDuration;
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     NSUInteger modifierFlags = [NSEvent modifierFlags];
 #else
     NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
@@ -551,7 +547,7 @@ using namespace WebCore;
     [self setAcceptsMouseMovedEvents:YES];
     [self setReleasedWhenClosed:NO];
     [self setHasShadow:YES];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#ifndef BUILDING_ON_LEOPARD
     [self setMovable:NO];
 #else
     [self setMovableByWindowBackground:NO];
index e770d5b..c303cf7 100644 (file)
@@ -56,15 +56,11 @@ String WebContext::applicationCacheDirectory()
     NSString *cacheDir = [defaults objectForKey:WebKitLocalCacheDefaultsKey];
 
     if (!cacheDir || ![cacheDir isKindOfClass:[NSString class]]) {
-#ifdef BUILDING_ON_TIGER
-        cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
-#else
         char cacheDirectory[MAXPATHLEN];
         size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
     
         if (cacheDirectoryLen)
             cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
-#endif
     }
 
     return [cacheDir stringByAppendingPathComponent:appName];