Reviewed by John.
- consolidated OS version checks into prefix header
* WebCorePrefix.h:
* khtml/rendering/render_canvasimage.cpp:
* kwq/KWQAccObject.mm:
(-[KWQAccObject roleDescription]):
(-[KWQAccObject accessibilityActionDescription:]):
* kwq/KWQComboBox.mm:
(QComboBox::QComboBox):
* kwq/KWQFoundationExtras.h:
WebKit:
Reviewed by John.
- consolidated OS version checks into prefix header
* Misc.subproj/WebFileDatabase.m:
(-[WebFileDatabase _createLRUList:]):
(+[WebFileDatabase _syncLoop:]):
* Misc.subproj/WebKitErrors.m:
(registerErrors):
* Misc.subproj/WebNSObjectExtras.h:
(WebNSRetainCFRelease):
* Misc.subproj/WebNSPasteboardExtras.m:
(-[NSPasteboard _web_declareAndWriteDragImage:URL:title:archive:source:]):
* Misc.subproj/WebUnicode.m:
(_unicodeDirection):
* WebCoreSupport.subproj/WebImageData.h:
* WebCoreSupport.subproj/WebImageRenderer.h:
* WebCoreSupport.subproj/WebKeyGenerator.h:
* WebCoreSupport.subproj/WebNewKeyGeneration.c:
* WebKitPrefix.h:
* WebView.subproj/WebDataSource.m:
(+[WebDataSource _repTypesAllowImageTypeOmission:]):
(-[WebDataSource isLoading]):
* WebView.subproj/WebFrameView.m:
(+[WebFrameView _viewTypesAllowImageTypeOmission:]):
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebPDFRepresentation.h:
* WebView.subproj/WebPDFRepresentation.m:
* WebView.subproj/WebPDFView.h:
* WebView.subproj/WebPDFView.m:
WebBrowser:
Reviewed by John.
- consolidated OS version checks into prefix header
* AddressBarContentsManager.h:
* AddressBarContentsManager.m:
* AddressBarController.m:
* AppController.m:
(-[AppController applicationDidFinishLaunching:]):
* BookmarkCollections.m:
* BookmarksController.h:
* BookmarksController.m:
* BookmarksViewController.m:
* BrowserDocument.h:
* BrowserDocument.m:
* BrowserDocumentController.h:
* BrowserDocumentController.m:
* BrowserNSNetServiceExtras.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWebViewPrinting.m:
* BrowserWindow.m:
(-[BrowserWindow performKeyEquivalent:]):
* BrowserWindowController.h:
* BrowserWindowController.m:
(-[BrowserWindowController locationField]):
(-[BrowserWindowController searchField]):
(-[BrowserWindowController locationBarIsShowing]):
(-[BrowserWindowController setUpLocationBar]):
(-[BrowserWindowController isShowingBar:]):
(-[BrowserWindowController updateKeyboardLoop]):
(-[BrowserWindowController windowDidLoad]):
(-[BrowserWindowController dealloc]):
(-[BrowserWindowController setDocument:]):
(-[BrowserWindowController showLocationBarTemporarilyIfHidden]):
(-[BrowserWindowController makeLocationBarPermanentIfTemporary]):
(-[BrowserWindowController hideLocationBarIfTemporary]):
(-[BrowserWindowController selectSearchField:]):
(-[BrowserWindowController canShowInputFields]):
(-[BrowserWindowController updateStopAndReloadButton]):
(-[BrowserWindowController toggleLocationBar:]):
(-[BrowserWindowController setToolbarsVisible:]):
(-[BrowserWindowController closeTab:]):
(-[BrowserWindowController fixFocusRingAroundLocationField]):
(-[BrowserWindowController validateMenuItem:]):
(-[BrowserWindowController showWindow:]):
* ContextMenuHandler.m:
* Debug/DebugUtilities.m:
* DownloadProgressEntry.m:
(-[NSFileManager setMetadataURL:referrer:atPath:]):
* InternetConfigUtilities.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* NetworkController.h:
* NetworkController.m:
* OutlineViewPlus.h:
* OutlineViewPlus.m:
* Preferences.subproj/ISyncController.h:
* Preferences.subproj/RSSPreferences.h:
* Preferences.subproj/RSSPreferences.m:
* Preferences.subproj/SecurityPreferences.m:
* Preferences.subproj/WBPreferences.m:
* PrintingAccessoryViewController.m:
* SyndicationController.m:
* TableViewPlus.m:
* Test/PageLoadTestRunner.m:
(-[PageLoadTestRunner setSingleTestURL:]):
* ToolbarController.h:
* ToolbarController.m:
* WebBookmark.h:
* WebBookmark.m:
* WebBookmarkGroup.h:
* WebBookmarkGroup.m:
* WebBookmarkGroupPrivate.h:
* WebBookmarkLeaf.m:
* WebBookmarkList.m:
* WebBookmarkPrivate.h:
* WebBrowserPrefix.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7730
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2004-09-29 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by John.
+
+ - consolidated OS version checks into prefix header
+
+ * WebCorePrefix.h:
+ * khtml/rendering/render_canvasimage.cpp:
+ * kwq/KWQAccObject.mm:
+ (-[KWQAccObject roleDescription]):
+ (-[KWQAccObject accessibilityActionDescription:]):
+ * kwq/KWQComboBox.mm:
+ (QComboBox::QComboBox):
+ * kwq/KWQFoundationExtras.h:
+
2004-09-29 David Hyatt <hyatt@apple.com>
Make sure <br>s always get line boxes. Also prevent the creation of RenderTexts for whitespace normal/nowrap nodes
#define KHTML_NO_XBL 1
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#define BUILDING_ON_PANTHER 1
+#endif
+
+#if BUILDING_ON_PANTHER
+#define OMIT_TIGER_FEATURES 1
+#endif
+
+#ifndef OMIT_TIGER_FEATURES
#define KHTML_XSLT
#endif
// To be public in Tiger. Test on tiger and add conditional.
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
CG_EXTERN_C_BEGIN
CG_EXTERN CGImageRef CGBitmapContextCreateImage(CGContextRef c);
CG_EXTERN_C_END
-(NSString*)roleDescription
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if OMIT_TIGER_FEATURES
// We don't need role descriptions on Panther and we don't have the call
// to get at localized ones anyway. At some point we may want to conditionally
// compile this entire file instead, but this is OK too.
- (NSString *)accessibilityActionDescription:(NSString *)action
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if OMIT_TIGER_FEATURES
// We don't need action descriptions on Panther and we don't have the call
// to get at localized ones anyway. At some point we may want to conditionally
// compile this entire file instead, but this is OK too.
[button release];
KWQPopUpButtonCell *cell = [[KWQPopUpButtonCell alloc] initWithQComboBox:this];
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
// Work around problem where the pop-up menu gets a "..." in it
// by turning off the default "ellipsizing" behavior.
[cell setLineBreakMode:NSLineBreakByClipping];
// Definitions for GC-specific methods for Panther.
// The finalize method simply won't be called.
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
@interface NSObject (KWQFoundationExtras)
- (void)finalize;
+2004-09-29 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by John.
+
+ - consolidated OS version checks into prefix header
+
+ * Misc.subproj/WebFileDatabase.m:
+ (-[WebFileDatabase _createLRUList:]):
+ (+[WebFileDatabase _syncLoop:]):
+ * Misc.subproj/WebKitErrors.m:
+ (registerErrors):
+ * Misc.subproj/WebNSObjectExtras.h:
+ (WebNSRetainCFRelease):
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ (-[NSPasteboard _web_declareAndWriteDragImage:URL:title:archive:source:]):
+ * Misc.subproj/WebUnicode.m:
+ (_unicodeDirection):
+ * WebCoreSupport.subproj/WebImageData.h:
+ * WebCoreSupport.subproj/WebImageRenderer.h:
+ * WebCoreSupport.subproj/WebKeyGenerator.h:
+ * WebCoreSupport.subproj/WebNewKeyGeneration.c:
+ * WebKitPrefix.h:
+ * WebView.subproj/WebDataSource.m:
+ (+[WebDataSource _repTypesAllowImageTypeOmission:]):
+ (-[WebDataSource isLoading]):
+ * WebView.subproj/WebFrameView.m:
+ (+[WebFrameView _viewTypesAllowImageTypeOmission:]):
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebPDFRepresentation.h:
+ * WebView.subproj/WebPDFRepresentation.m:
+ * WebView.subproj/WebPDFView.h:
+ * WebView.subproj/WebPDFView.m:
+
2004-09-29 Ken Kocienda <kocienda@apple.com>
Reviewed by Hyatt
LOG(FileDatabaseActivity, "lru list created");
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
[pool release];
#else
[pool drain];
END_EXCEPTION_HANDLER
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
[pool release];
#else
[pool drain];
[NSError _web_addErrorsWithCodesAndDescriptions:dict inDomain:WebKitErrorDomain];
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
[pool release];
#else
[pool drain];
static inline id WebNSRetainCFRelease(CFTypeRef obj)
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
return (id)obj;
#else
return (id)CFMakeCollectable(obj);
#endif
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
@interface NSObject (WebExtras)
- (void)finalize;
#import <HIServices/CoreTranslationFlavorTypeNames.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
-#define BUILT_ON_TIGER_OR_LATER
-#endif
-
NSString *WebURLPboardType = nil;
NSString *WebURLNamePboardType = nil;
}
NSArray *extensions = [NSArray arrayWithObject:extension];
-#ifdef BUILT_ON_TIGER_OR_LATER
- [self setPropertyList:extensions forType:NSFilesPromisePboardType];
- return source;
-#else
+#ifdef OMIT_TIGER_FEATURES
id dragSource = [[NSFilePromiseDragSource alloc] initWithSource:source];
[dragSource setTypes:extensions onPasteboard:self];
return dragSource;
+#else
+ [self setPropertyList:extensions forType:NSFilesPromisePboardType];
+ return source;
#endif
}
static WebCoreUnicodeDirection _unicodeDirection(UChar32 c)
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#ifdef BUILDING_ON_PANTHER
// Panther gets the direction of the hyphen wrong. It returns "ET" (European Terminator) when
// it should return "ES" (European Separator).
if (c == '-')
/* WebImageData.h
Copyright 2004, Apple, Inc. All rights reserved.
*/
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
#import <Cocoa/Cocoa.h>
@protocol WebCoreImageRenderer;
-//#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+//#ifndef OMIT_TIGER_FEATURES
//#define USE_CGIMAGEREF YES
//#endif
// Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
//
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef BUILDING_ON_PANTHER
#define USE_NEW_KEY_GENERATION
#endif
/*
- * WebNewKeyGeneration.cpp
+ * WebNewKeyGeneration.c
* WebKit
*
* Created by Chris Blumenberg on Mon Aug 23 2004.
#endif
#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#define BUILDING_ON_PANTHER 1
+#endif
+
+#if BUILDING_ON_PANTHER
+#define OMIT_TIGER_FEATURES 1
+#endif
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
#import <WebKit/WebPDFRepresentation.h>
#endif
#import <WebKit/WebResourceLoadDelegate.h>
[WebHTMLRepresentation class], @"application/x-webarchive",
[WebTextRepresentation class], @"text/",
[WebTextRepresentation class], @"application/x-javascript",
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
[WebPDFRepresentation class], @"application/pdf",
#endif
nil];
}
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#if BUILDING_ON_PANTHER
[pool release];
#else
[pool drain];
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guaranteed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
#import <WebKit/WebPDFView.h>
#endif
#import <WebKit/WebTextRendererFactory.h>
[WebHTMLView class], @"application/x-webarchive",
[WebTextView class], @"text/",
[WebTextView class], @"application/x-javascript",
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
[WebPDFView class], @"application/pdf",
#endif
nil];
#define DRAG_LINK_LABEL_FONT_SIZE 11.0
#define DRAG_LINK_URL_FONT_SIZE 10.0
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
#define USE_APPKIT_FOR_ATTRIBUTED_STRINGS
#endif
WebPDFRepresentation.h
Copyright 2004, Apple, Inc. All rights reserved.
*/
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guaranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+
+#ifndef OMIT_TIGER_FEATURES
#import <Foundation/Foundation.h>
}
@end
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#endif // OMIT_TIGER_FEATURES
WebPDFRepresentation.m
Copyright 2004, Apple, Inc. All rights reserved.
*/
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guaranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+
+#ifndef OMIT_TIGER_FEATURES
#import <Quartz/Quartz.h>
@end
-#endif
+#endif // OMIT_TIGER_FEATURES
WebPDFView.h
Copyright 2004, Apple, Inc. All rights reserved.
*/
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guaranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#ifndef OMIT_TIGER_FEATURES
#import <Quartz/Quartz.h>
}
@end
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#endif // OMIT_TIGER_FEATURES
WebPDFView.m
Copyright 2004, Apple, Inc. All rights reserved.
*/
-// Assume we'll only ever compile this on Panther or greater, so
-// MAC_OS_X_VERSION_10_3 is guaranateed to be defined.
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+
+#ifndef OMIT_TIGER_FEATURES
#import <Foundation/NSString_NSURLExtras.h>
@end
-#endif //MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#endif // OMIT_TIGER_FEATURES