[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:16:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8beb4ca9303a86ad2b9a845eb1d3f37190d10704
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 4 22:49:45 2002 +0000
More exclusion for pre 6C48.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ae9f970..b6bb1a7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ More exclusion for pre 6C48.
+
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-04 Kenneth Kocienda <kocienda at apple.com>
* kwq/kwqdebug.h: Added a line of stderr output into the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ae9f970..b6bb1a7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ More exclusion for pre 6C48.
+
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-04 Kenneth Kocienda <kocienda at apple.com>
* kwq/kwqdebug.h: Added a line of stderr output into the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ae9f970..b6bb1a7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ More exclusion for pre 6C48.
+
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-04 Kenneth Kocienda <kocienda at apple.com>
* kwq/kwqdebug.h: Added a line of stderr output into the
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index fec54fa..2799c02 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -32,7 +32,11 @@
QPixmap::QPixmap()
{
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
imageRenderer = [[[WebCoreImageRendererFactory sharedFactory] imageRenderer] retain];
+#else
+ imageRenderer = nil;
+#endif
needCopyOnWrite = false;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dd5b3a8..a004acf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ More exclusion for pre 6C48.
+
+ * ChangeLog:
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+ * WebCoreSupport.subproj/IFImageRendererFactory.m:
+ (-[IFImageRendererFactory imageRenderer]):
+
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ Oops, excluded even more code for < 6C48.
+
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+
2002-06-04 Kenneth Kocienda <kocienda at apple.com>
* Misc.subproj/WebKitDebug.h: Added a line of stderr output into
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index dd5b3a8..a004acf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ More exclusion for pre 6C48.
+
+ * ChangeLog:
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+ * WebCoreSupport.subproj/IFImageRendererFactory.m:
+ (-[IFImageRendererFactory imageRenderer]):
+
+2002-06-04 Richard Williamson <rjw at apple.com>
+
+ Oops, excluded even more code for < 6C48.
+
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+
2002-06-04 Kenneth Kocienda <kocienda at apple.com>
* Misc.subproj/WebKitDebug.h: Added a line of stderr output into
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 124862d..8a070ee 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -18,6 +18,8 @@
- (BOOL)incrementalLoadWithBytes: (const void *)bytes length:(unsigned)length complete:(BOOL)isComplete
{
+// FIXME: This won't compile unless you have > 6C48.
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
//NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
@@ -25,13 +27,7 @@
int status;
lastLength = length;
-// FIXME: This won't compile unless you have > 6C48.
-#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
-#else
- lastStatus = status = 0;
- [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
-#endif
[data release];
switch (status){
case NSImageRepLoadStatusUnknownType: // not enough data to determine image format. please feed me more data
@@ -59,6 +55,10 @@
return (lastReturn = YES);
}
return (lastReturn = NO);
+#else
+ [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
+ return 0;
+#endif
}
- (void)dealloc
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
index 8573655..bb93f8e 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
@@ -46,9 +46,11 @@
- (id <WebCoreImageRenderer>)imageRenderer
{
NSImage *imageRenderer = [[IFImageRenderer alloc] init];
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initForIncrementalLoad];
[imageRenderer addRepresentation: rep];
[imageRenderer setFlipped: YES];
+#endif
return [imageRenderer autorelease];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 124862d..8a070ee 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -18,6 +18,8 @@
- (BOOL)incrementalLoadWithBytes: (const void *)bytes length:(unsigned)length complete:(BOOL)isComplete
{
+// FIXME: This won't compile unless you have > 6C48.
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
//NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
@@ -25,13 +27,7 @@
int status;
lastLength = length;
-// FIXME: This won't compile unless you have > 6C48.
-#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
-#else
- lastStatus = status = 0;
- [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
-#endif
[data release];
switch (status){
case NSImageRepLoadStatusUnknownType: // not enough data to determine image format. please feed me more data
@@ -59,6 +55,10 @@
return (lastReturn = YES);
}
return (lastReturn = NO);
+#else
+ [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
+ return 0;
+#endif
}
- (void)dealloc
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index 8573655..bb93f8e 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -46,9 +46,11 @@
- (id <WebCoreImageRenderer>)imageRenderer
{
NSImage *imageRenderer = [[IFImageRenderer alloc] init];
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initForIncrementalLoad];
[imageRenderer addRepresentation: rep];
[imageRenderer setFlipped: YES];
+#endif
return [imageRenderer autorelease];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list