[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:46:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4adaa614c92b909da781ba33a06bb93530587944
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 9 17:40:16 2003 +0000
top level:
Reviewed by John.
* .cvsignore: Add autom4te.cache to the list.
* configure.in: Removed JAGUAR_OR_EARLIER define, not needed since we
no longer support building TOT on Jaguar.
WebCore:
Reviewed by John.
- removed Jaguar-specific code
* kwq/KWQComboBox.mm: Remove fudge factor used to move text down and work
around problem where pop-up menu text draws too high, bug 3030474.
* kwq/KWQTextCodec.mm: (KWQTextDecoder::convertUsingTEC): Remove hack used
to work around the lack of TECSetBasicOptions in Jaguar, bug 3201405.
* config.h: The people with Foundation source trees slug it out with the people
without Foundation trees, as one line of this file changes back and forth.
WebKit:
Reviewed by John.
- fixed 3125264 -- nuke NSImage workaround when we drop Jaguar support
* Misc.subproj/WebNSImageExtras.m: Removed the workaround.
- removed other Jaguar-specific code
* WebCoreSupport.subproj/WebImageRenderer.m: Remove workaround for improper
handling of GIF animation loops with no loop counting, bug 3090341.
* WebView.subproj/WebHTMLViewPrivate.m: Remove workaround for problem extracting
scroll wheel events without also getting all others, which caused jumping around
if you used the scroll wheel while moving the mouse, bug 3245425.
* Misc.subproj/WebKitErrorsPrivate.h: Remove Jaguar-only import of <NSError.h>.
* Plugins.subproj/WebNetscapePluginPackage.m: Remove Jaguar-only side of #if.
* Plugins.subproj/WebNetscapePluginRepresentation.m: Remove Jaguar-only import
of <NSError.h>.
* WebKit/Plugins.subproj/WebPluginPackage.m: Remove unnecessary import of <NSError.h>.
* Plugins.subproj/WebPluginPackage.m: Remove Jaguar-only side of #if.
* WebCoreSupport.subproj/WebSubresourceClient.m: Remove Jaguar-only import
of <NSError.h>.
* WebView.subproj/WebDefaultFrameLoadDelegate.m: Remove Jaguar-only import
of <NSError.h>.
* WebView.subproj/WebImageRepresentation.m: Remove Jaguar-only import
of <NSError.h>.
* WebKit/English.lproj/StringsNotToBeLocalized.txt: Updated for this and other recent changes.
WebBrowser:
Reviewed by John.
- removed Jaguar-specific code
* AppController.m: (-[AppController applicationDidFinishLaunching:]):
Remove workaround for problem with menu items that have backslash as the key
equivalent for Japanese users, bug 3144133.
* BrowserDocument.m:
(-[BrowserDocument validModesForFontPanel:]): Take this method out of a
Panther #if.
(-[BrowserDocument validateUserInterfaceItem:]): Remove workaround for the
hang in Preview when you preview printed bookmarks, bug 3267767.
* BrowserNSErrorExtras.h: Remove import of NSError.h for Jaguar-only.
* BrowserNSNetServiceExtras.m: Remove Jaguar-specific includes.
* BrowserWindow.m: (-[BrowserWindow displayTitle]): Remove Panther #if
around some code.
* BugReportController.m: Remove import of NSError.h for Jaguar-only.
* DownloadProgressEntry.m: Remove Panther #if around some code.
* ListView.m: (+[ListView stripeColorForRow:]): Remove Jaguar compatibility
code that always returns white.
* LocationFieldEditor.m: (-[LocationFieldEditor validModesForFontPanel:]):
* Preferences.subproj/AppearancePreferences.m: (-[AppearancePreferences validModesForFontPanel:]):
* Preferences.subproj/WBPreferences.h:
* Preferences.subproj/WBPreferences.m: (-[WBPreferences validModesForFontPanel:]):
Take validModesForFontPanel: methods out of Panther #if.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 999b980..01564d5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-07-08 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - removed Jaguar-specific code
+
+ * kwq/KWQComboBox.mm: Remove fudge factor used to move text down and work
+ around problem where pop-up menu text draws too high, bug 3030474.
+
+ * kwq/KWQTextCodec.mm: (KWQTextDecoder::convertUsingTEC): Remove hack used
+ to work around the lack of TECSetBasicOptions in Jaguar, bug 3201405.
+
+ * config.h: The people with Foundation source trees slug it out with the people
+ without Foundation trees, as one line of this file changes back and forth.
+
2003-07-08 Dave Hyatt <hyatt at apple.com>
Make sure that the contents width and height of the view are
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 999b980..01564d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-07-08 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - removed Jaguar-specific code
+
+ * kwq/KWQComboBox.mm: Remove fudge factor used to move text down and work
+ around problem where pop-up menu text draws too high, bug 3030474.
+
+ * kwq/KWQTextCodec.mm: (KWQTextDecoder::convertUsingTEC): Remove hack used
+ to work around the lack of TECSetBasicOptions in Jaguar, bug 3201405.
+
+ * config.h: The people with Foundation source trees slug it out with the people
+ without Foundation trees, as one line of this file changes back and forth.
+
2003-07-08 Dave Hyatt <hyatt at apple.com>
Make sure that the contents width and height of the view are
diff --git a/WebCore/config.h b/WebCore/config.h
index 4d49268..daec459 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -720,7 +720,7 @@ int mkstemps (char* _template, int suffix_len); /* defined in fakes.c */
#define HAVE_FORK 1
/* Define if Foundation source tree exists */
-/* #undef HAVE_FOUNDATION_SOURCES */
+#define HAVE_FOUNDATION_SOURCES 1
/* Define if you have finite */
#define HAVE_FUNC_FINITE 1
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 9f40c9f..933a1dc 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -40,12 +40,6 @@ using khtml::RenderWidget;
#define LEFT_MARGIN 3
#define RIGHT_MARGIN 3
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-#define TEXT_VERTICAL_NUDGE 1
-#else
-#define TEXT_VERTICAL_NUDGE 0
-#endif
-
// This is the 2-pixel CELLOFFSET for bordered cells from NSCell.
#define VERTICAL_FUDGE_FACTOR 2
@@ -170,8 +164,7 @@ int QComboBox::baselinePosition() const
{
// Menu text is at the top.
KWQPopUpButton *button = (KWQPopUpButton *)getView();
- return (int)ceil(-TOP_MARGIN + VERTICAL_FUDGE_FACTOR
- + TEXT_VERTICAL_NUDGE + [[button font] ascender]);
+ return (int)ceil(-TOP_MARGIN + VERTICAL_FUDGE_FACTOR + [[button font] ascender]);
}
void QComboBox::clear()
@@ -265,17 +258,6 @@ void QComboBox::itemSelected()
return result;
}
-#if TEXT_VERTICAL_NUDGE
-
-- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
- cellFrame.origin.y += TEXT_VERTICAL_NUDGE;
- cellFrame.size.height -= TEXT_VERTICAL_NUDGE;
- [super drawInteriorWithFrame:cellFrame inView:controlView];
-}
-
-#endif
-
- (QWidget *)widget
{
return widget;
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index 987352a..089bcf5 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -30,17 +30,6 @@
const UniChar BOM = 0xFEFF;
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-
-struct TECObjectPeek {
- UInt32 skip1;
- UInt32 skip2;
- UInt32 skip3;
- OptionBits optionsControlFlags;
-};
-
-#endif
-
class KWQTextDecoder : public QTextDecoder {
public:
KWQTextDecoder(CFStringEncoding, KWQEncodingFlags);
@@ -323,12 +312,7 @@ QString KWQTextDecoder::convertUsingTEC(const UInt8 *chs, int len, bool flush)
return QString();
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
- // Workaround for missing TECSetBasicOptions call.
- reinterpret_cast<TECObjectPeek **>(_converter)[0]->optionsControlFlags = kUnicodeForceASCIIRangeMask;
-#else
TECSetBasicOptions(_converter, kUnicodeForceASCIIRangeMask);
-#endif
}
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 87254f6..5aed245 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,35 @@
+2003-07-08 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3125264 -- nuke NSImage workaround when we drop Jaguar support
+
+ * Misc.subproj/WebNSImageExtras.m: Removed the workaround.
+
+ - removed other Jaguar-specific code
+
+ * WebCoreSupport.subproj/WebImageRenderer.m: Remove workaround for improper
+ handling of GIF animation loops with no loop counting, bug 3090341.
+
+ * WebView.subproj/WebHTMLViewPrivate.m: Remove workaround for problem extracting
+ scroll wheel events without also getting all others, which caused jumping around
+ if you used the scroll wheel while moving the mouse, bug 3245425.
+
+ * Misc.subproj/WebKitErrorsPrivate.h: Remove Jaguar-only import of <NSError.h>.
+ * Plugins.subproj/WebNetscapePluginPackage.m: Remove Jaguar-only side of #if.
+ * Plugins.subproj/WebNetscapePluginRepresentation.m: Remove Jaguar-only import
+ of <NSError.h>.
+ * WebKit/Plugins.subproj/WebPluginPackage.m: Remove unnecessary import of <NSError.h>.
+ * Plugins.subproj/WebPluginPackage.m: Remove Jaguar-only side of #if.
+ * WebCoreSupport.subproj/WebSubresourceClient.m: Remove Jaguar-only import
+ of <NSError.h>.
+ * WebView.subproj/WebDefaultFrameLoadDelegate.m: Remove Jaguar-only import
+ of <NSError.h>.
+ * WebView.subproj/WebImageRepresentation.m: Remove Jaguar-only import
+ of <NSError.h>.
+
+ * WebKit/English.lproj/StringsNotToBeLocalized.txt: Updated for this and other recent changes.
+
2003-07-08 Chris Blumenberg <cblu at apple.com>
Fixed: <rdar://problem/3134494>: no progressive loading for standalone images
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 50ff478..7c532e8 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -23,7 +23,6 @@
"/tmp/WebKitPlugInStreamXXXXXX"
"/tmp/XXXXXX.tiff"
"0x0"
-"1"
"1.0.0"
"1.00"
"1000"
@@ -34,6 +33,7 @@
"4096"
"4194304"
"7"
+"9"
";"
"<!--framePath "
"="
@@ -43,7 +43,6 @@
"=================\nERROR: "
"=================\nFATAL ERROR: "
"=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n"
-"ANIMEXTS1"
"Apple Chancery"
"AppleFontSmoothing"
"BP_CreatePluginMIMETypesPreferences"
@@ -90,7 +89,6 @@
"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT) AppleWebKit/%@"
"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko) %@"
"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko)"
-"NETSCAPE2"
"NP_GetEntryPoints"
"NP_Initialize"
"NP_Shutdown"
@@ -127,14 +125,6 @@
"WebElementLinkTitle"
"WebElementLinkURL"
"WebElementTargetFrame"
-"WebFrameLoadTypeBack"
-"WebFrameLoadTypeForward"
-"WebFrameLoadTypeIndexedBackForward"
-"WebFrameLoadTypeInternal"
-"WebFrameLoadTypeReload"
-"WebFrameLoadTypeReloadAllowingStaleData"
-"WebFrameLoadTypeSame"
-"WebFrameLoadTypeStandard"
"WebFrameStateChangedNotification"
"WebFrameStateCommittedPage"
"WebFrameStateComplete"
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
index c47f0b7..2970e40 100644
--- a/WebKit/Misc.subproj/WebKitErrorsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -7,10 +7,6 @@
#import <WebKit/WebKitErrors.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
@interface NSError (WebKitExtras)
+ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
diff --git a/WebKit/Misc.subproj/WebNSImageExtras.m b/WebKit/Misc.subproj/WebNSImageExtras.m
index cb50876..a061198 100644
--- a/WebKit/Misc.subproj/WebNSImageExtras.m
+++ b/WebKit/Misc.subproj/WebNSImageExtras.m
@@ -10,36 +10,8 @@
#import <WebKit/WebKitLogging.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-
-// see +load for details
- at interface NSBitmapImageRep (SPINeededForJagGreen)
-+ (void)_setEnableFlippedImageFix:(BOOL)f;
- at end
-static BOOL AKBugIsFixed = NO;
-
-#endif
-
@implementation NSImage (WebExtras)
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-
-+ (void)load
-{
- // See 3094525, 3065097, 2767424. We need to call this SPI to get it fixed in JagGreen.
- // Pre-green we're SOL. In Panther the fix is always on.
- //
- // FIXME 3125264: We can nuke this code, the category above, and half the code in
- // _web_dissolveToFraction when we drop Jag support.
- //
- if ([[NSBitmapImageRep class] respondsToSelector:@selector(_setEnableFlippedImageFix:)]) {
- [NSBitmapImageRep _setEnableFlippedImageFix:YES];
- AKBugIsFixed = YES;
- }
-}
-
-#endif
-
- (void)_web_scaleToMaxSize:(NSSize)size
{
float heightResizeDelta = 0.0, widthResizeDelta = 0.0, resizeDelta = 0.0;
@@ -68,39 +40,18 @@ static BOOL AKBugIsFixed = NO;
{
NSImage *dissolvedImage = [[NSImage alloc] initWithSize:[self size]];
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
- if (AKBugIsFixed) {
-#endif
- NSPoint point = [self isFlipped] ? NSMakePoint(0, [self size].height) : NSZeroPoint;
-
- // In this case the dragging image is always correct.
- [dissolvedImage setFlipped:[self isFlipped]];
-
- [dissolvedImage lockFocus];
- [self dissolveToPoint:point fraction: delta];
- [dissolvedImage unlockFocus];
-
- [self lockFocus];
- [dissolvedImage compositeToPoint:point operation:NSCompositeCopy];
- [self unlockFocus];
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
- } else {
- // In this case Thousands mode will have an inverted drag image. Millions is OK.
- // FIXME 3125264: this branch of code can go when we drop Jaguar support.
- BOOL isFlipped = [self isFlipped];
- [self setFlipped:NO];
-
- [dissolvedImage lockFocus];
- [self dissolveToPoint:NSZeroPoint fraction: delta];
- [dissolvedImage unlockFocus];
+ NSPoint point = [self isFlipped] ? NSMakePoint(0, [self size].height) : NSZeroPoint;
+
+ // In this case the dragging image is always correct.
+ [dissolvedImage setFlipped:[self isFlipped]];
- [self lockFocus];
- [dissolvedImage compositeToPoint:NSZeroPoint operation:NSCompositeCopy];
- [self unlockFocus];
+ [dissolvedImage lockFocus];
+ [self dissolveToPoint:point fraction: delta];
+ [dissolvedImage unlockFocus];
- [self setFlipped:isFlipped];
- }
-#endif
+ [self lockFocus];
+ [dissolvedImage compositeToPoint:point operation:NSCompositeCopy];
+ [self unlockFocus];
[dissolvedImage release];
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index f62d78b..eb3c58a 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -9,13 +9,7 @@
#import <CoreFoundation/CFBundlePriv.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-// header containing private NSBundle declarations on Jaguar
-#import <Foundation/NSBundle_Private.h>
-#else
-// header containing private NSBundle declarations on Panther
#import <Foundation/NSPrivateDecls.h>
-#endif
typedef void (* FunctionPointer) (void);
typedef void (* TransitionVector) (void);
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index bd906db..df351f9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -13,10 +13,6 @@
#import <WebKit/WebAssertions.h>
#import <Foundation/NSError_NSURLExtras.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
@implementation WebNetscapePluginRepresentation
- (void)dealloc
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index efc6320..c42f15d 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -11,7 +11,6 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <Foundation/NSError.h>
#import <Foundation/NSURL_NSURLExtras.h>
static NSImage *image = nil;
diff --git a/WebKit/Plugins.subproj/WebPluginPackage.m b/WebKit/Plugins.subproj/WebPluginPackage.m
index a3e38de..855ae45 100644
--- a/WebKit/Plugins.subproj/WebPluginPackage.m
+++ b/WebKit/Plugins.subproj/WebPluginPackage.m
@@ -10,13 +10,7 @@
#import <WebKit/WebKitLogging.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-// header containing private NSBundle declarations on Jaguar
-#import <Foundation/NSBundle_Private.h>
-#else
-// header containing private NSBundle declarations on Panther
#import <Foundation/NSPrivateDecls.h>
-#endif
@implementation WebPluginPackage
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 43b9732..23df268 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -29,68 +29,6 @@ static NSMutableArray *activeImageRenderers;
}
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-
-// Part of the workaround for bug 3090341.
-- (BOOL)blockHasGIFExtensionSignature:(const char *)block length:(int)length
-{
- int i;
- for (i = 0; i < length - 10; i++) {
- if (block[i + 9] == '.' && block[i + 10] == '0') {
- if (memcmp(block + i, "NETSCAPE2", 9) == 0 || memcmp(block + i, "ANIMEXTS1", 9) == 0) {
- return YES;
- }
- }
- }
- return NO;
-}
-
-// Part of the workaround for bug 3090341.
-- (void)checkDataForGIFExtensionSignature:(NSData *)data
-{
- if (sawGIFExtensionSignature) {
- return;
- }
-
- const char *dataBytes = [data bytes];
- int dataLength = [data length];
-
- if (GIFExtensionBufferLength) {
- char leadingEdgeBuffer[20];
- memcpy(leadingEdgeBuffer, GIFExtensionBuffer, GIFExtensionBufferLength);
- int dataForLeadingEdgeBufferLength = dataLength;
- if (dataForLeadingEdgeBufferLength > 10) {
- dataForLeadingEdgeBufferLength = 10;
- }
- memcpy(leadingEdgeBuffer + GIFExtensionBufferLength, dataBytes, dataForLeadingEdgeBufferLength);
- if ([self blockHasGIFExtensionSignature:leadingEdgeBuffer
- length:GIFExtensionBufferLength + dataForLeadingEdgeBufferLength]) {
- sawGIFExtensionSignature = YES;
- return;
- }
- }
-
- if ([self blockHasGIFExtensionSignature:dataBytes length:dataLength]) {
- sawGIFExtensionSignature = YES;
- return;
- }
-
- if (dataLength < 10) {
- int keepLength = 10 - dataLength;
- if (keepLength > GIFExtensionBufferLength) {
- keepLength = GIFExtensionBufferLength;
- }
- memmove(GIFExtensionBuffer + GIFExtensionBufferLength - keepLength, GIFExtensionBuffer, keepLength);
- memcpy(GIFExtensionBuffer + keepLength, dataBytes, dataLength);
- GIFExtensionBufferLength = keepLength + dataLength;
- } else {
- memcpy(GIFExtensionBuffer, dataBytes + dataLength - 10, 10);
- GIFExtensionBufferLength = 10;
- }
-}
-
-#endif
-
- (id)initWithMIMEType:(NSString *)MIME
{
self = [super init];
@@ -106,9 +44,6 @@ static NSMutableArray *activeImageRenderers;
{
self = [super initWithData:data];
if (self != nil) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
- [self checkDataForGIFExtensionSignature:data];
-#endif
MIMEType = [MIME copy];
if ([data length] > 0)
isNull = NO;
@@ -165,11 +100,6 @@ static NSMutableArray *activeImageRenderers;
NSBitmapImageRep *imageRep = [[self representations] objectAtIndex:0];
NSData *data = [[NSData alloc] initWithBytes:bytes length:length];
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
- // Part of the workaround for bug 3090341.
- [self checkDataForGIFExtensionSignature:data];
-#endif
-
loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
[data release];
switch (loadStatus) {
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index e7f6ff7..31150ab 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -17,10 +17,6 @@
#import <WebKit/WebAssertions.h>
#import <Foundation/NSError_NSURLExtras.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
#import <WebCore/WebCoreResourceLoader.h>
@implementation WebSubresourceClient
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index e7f6ff7..31150ab 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -17,10 +17,6 @@
#import <WebKit/WebAssertions.h>
#import <Foundation/NSError_NSURLExtras.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
#import <WebCore/WebCoreResourceLoader.h>
@implementation WebSubresourceClient
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index e8662ff..7b95939 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
@@ -6,10 +6,6 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
@implementation WebDefaultFrameLoadDelegate
static WebDefaultFrameLoadDelegate *sharedDelegate = nil;
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index e365555..bed7199 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -735,32 +735,6 @@ static BOOL inNSTextViewDrawRect;
[super sendEvent:event];
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-
-// Workaround for bug 3245425 - nextEventMatchingMask:NSScrollWheelMask allows any kind of event.
-- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)deqFlag
-{
- if (mask == NSScrollWheelMask) {
- NSEvent *event = [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:NO];
- if (event == nil || [event type] != NSScrollWheel) {
- return nil;
- }
- if (!deqFlag) {
- return event;
- }
- }
-
- NSEvent *event = [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:deqFlag];
-
- // This assertion double-checks that we only get the right types of events from the superclass.
- // This is part of how I caught bug 3245425 in the act.
- ASSERT(event == nil || ((1 << [event type]) & mask));
-
- return event;
-}
-
-#endif // version <= 10.2
-
@end
@implementation NSMutableDictionary (WebHTMLViewExtras)
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index ecef129..92f58ea 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -12,10 +12,6 @@
#import <Foundation/NSURLRequest.h>
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <Foundation/NSError.h>
-#endif
-
@implementation WebImageRepresentation
- (void)dealloc
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list