[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:34:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d5180bc3bf67777e1a24714b0810edaadfc411d7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 3 22:48:35 2003 +0000
Reviewed by Ken.
- remove spoof entries as decided in meeting with Don, Dave, Mark Malone
* WebView.subproj/WebUserAgentSpoofTable.gperf: Remove battle.net because it's only there to
make Darin happy, and the site works fine without it. Remove pier1.com and disney.go.com because
we want to try evangelism first in both those cases, and having a released version where the
site works weakens our evangelism efforts.
* WebView.subproj/WebUserAgentSpoofTable.c: Regenerated.
- disable workaround for Panther bug in Panther builds
* Misc.subproj/WebNSImageExtras.m: (-[NSImage _web_dissolveToFraction:]): Add ifdefs.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4014 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ebaca91..622c924 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-04-03 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - remove spoof entries as decided in meeting with Don, Dave, Mark Malone
+
+ * WebView.subproj/WebUserAgentSpoofTable.gperf: Remove battle.net because it's only there to
+ make Darin happy, and the site works fine without it. Remove pier1.com and disney.go.com because
+ we want to try evangelism first in both those cases, and having a released version where the
+ site works weakens our evangelism efforts.
+
+ * WebView.subproj/WebUserAgentSpoofTable.c: Regenerated.
+
+ - disable workaround for Panther bug in Panther builds
+
+ * Misc.subproj/WebNSImageExtras.m: (-[NSImage _web_dissolveToFraction:]): Add ifdefs.
+
2003-04-02 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
diff --git a/WebKit/Misc.subproj/WebNSImageExtras.m b/WebKit/Misc.subproj/WebNSImageExtras.m
index f4dcf9a..cb50876 100644
--- a/WebKit/Misc.subproj/WebNSImageExtras.m
+++ b/WebKit/Misc.subproj/WebNSImageExtras.m
@@ -6,18 +6,24 @@
// Copyright (c) 2002 Apple Computer Inc. All rights reserved.
//
-#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNSImageExtras.h>
+#import <WebKit/WebKitLogging.h>
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+
// see +load for details
@interface NSBitmapImageRep (SPINeededForJagGreen)
+ (void)_setEnableFlippedImageFix:(BOOL)f;
@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.
@@ -32,6 +38,8 @@ static BOOL AKBugIsFixed = NO;
}
}
+#endif
+
- (void)_web_scaleToMaxSize:(NSSize)size
{
float heightResizeDelta = 0.0, widthResizeDelta = 0.0, resizeDelta = 0.0;
@@ -60,7 +68,9 @@ 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.
@@ -73,6 +83,7 @@ static BOOL AKBugIsFixed = NO;
[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.
@@ -89,6 +100,8 @@ static BOOL AKBugIsFixed = NO;
[self setFlipped:isFlipped];
}
+#endif
+
[dissolvedImage release];
}
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 536c1fa..b16abe4 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -677,6 +677,8 @@ static BOOL inNSTextViewDrawRect;
- (BOOL)resignFirstResponder
{
+ NSLog(@"WebTextView resignFirstResponder");
+
bool resign = [super resignFirstResponder];
if (![self _web_inHTMLView]) {
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
index 472f74b..f18b1e6 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
@@ -1,7 +1,7 @@
/* ANSI-C code produced by gperf version 2.7.2 */
/* Command-line: gperf -CEot -L ANSI-C -k '*' -N _web_findSpoofTableEntry -F ,0 WebView.subproj/WebUserAgentSpoofTable.gperf */
struct UserAgentSpoofTableEntry { const char *name; UserAgentStringType type; };
-/* maximum key range = 27, duplicates = 0 */
+/* maximum key range = 21, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -15,32 +15,32 @@ hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
{
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 5, 0, 36, 36, 15,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 0, 0, 0,
- 0, 0, 10, 0, 0, 0, 10, 36, 0, 0,
- 0, 0, 0, 36, 0, 0, 0, 0, 5, 0,
- 36, 15, 0, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 0, 0, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 0, 10, 0,
+ 0, 0, 0, 0, 0, 0, 0, 27, 0, 0,
+ 0, 0, 0, 27, 0, 0, 10, 0, 0, 0,
+ 27, 5, 0, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+ 27, 27, 27, 27, 27, 27
};
register int hval = len;
@@ -100,41 +100,35 @@ _web_findSpoofTableEntry (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 18,
+ TOTAL_KEYWORDS = 15,
MIN_WORD_LENGTH = 6,
MAX_WORD_LENGTH = 20,
- MIN_HASH_VALUE = 9,
- MAX_HASH_VALUE = 35
+ MIN_HASH_VALUE = 6,
+ MAX_HASH_VALUE = 26
};
static const struct UserAgentSpoofTableEntry wordlist[] =
{
- {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
- {"",0}, {"",0},
- {"watch.com", MacIE},
- {"battle.net", MacIE},
+ {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
+ {"nj.com", MacIE},
+ {"",0}, {"",0}, {"",0},
+ {"jaguar.com", MacIE},
{"porsche.com", MacIE},
{"mazdausa.com", MacIE},
{"hondacars.com", MacIE},
- {"abcnews.go.com", WinIE},
+ {"oregonlive.com", MacIE},
{"",0},
- {"nj.com", MacIE},
+ {"olympic.org", MacIE},
{"",0},
{"hondaredriders.com", MacIE},
- {"oregonlive.com", MacIE},
- {"jaguar.com", MacIE},
+ {"watch.com", MacIE},
+ {"",0},
{"freebsd.org", MacIE},
{"firstusa.com", MacIE},
{"microsoft.com", MacIE},
- {"pier1.com", MacIE},
- {"",0},
- {"olympic.org", MacIE},
- {"",0},
- {"disney.go.com", MacIE},
- {"",0}, {"",0},
- {"bang-olufsen.com", MacIE},
- {"",0}, {"",0}, {"",0},
- {"wap.sonyericsson.com", MacIE}
+ {"abcnews.go.com", WinIE},
+ {"wap.sonyericsson.com", MacIE},
+ {"bang-olufsen.com", MacIE}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
index 8e0f8f8..bc9d42a 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
@@ -9,7 +9,6 @@ hondacars.com, MacIE
hondaredriders.com, MacIE
jaguar.com, MacIE
mazdausa.com, MacIE
-pier1.com, MacIE
porsche.com, MacIE
wap.sonyericsson.com, MacIE
#
@@ -25,14 +24,8 @@ firstusa.com, MacIE
microsoft.com, MacIE
olympic.org, MacIE
#
-# pretend to be Mac IE to get the cool animation on the battle.net/war3 page that Darin likes
-battle.net, MacIE
-#
# pretend to be Mac IE to avoid gzipped HTML which we don't support yet
freebsd.org, MacIE
#
# pretend to be Win IE to get the smaller font sizes the site gives for Windows
abcnews.go.com, WinIE
-#
-# pretend to be Mac IE to avoid 500 Internal Server Error on disneyland.disney.go.com
-disney.go.com, MacIE
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list