[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:21:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 641f755bb8549cb3da09cd7be2c22b36d029f87d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 25 20:18:48 2002 +0000
Enabled progressive image loading code.
* WebCoreSupport.subproj/IFImageRenderer.h:
* WebCoreSupport.subproj/IFImageRenderer.m:
(-[IFImageRenderer initWithSize:]):
(-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
* WebCoreSupport.subproj/IFImageRendererFactory.m:
(-[IFImageRendererFactory imageRenderer]):
Enabled progressive image loading code.
* khtml/misc/loader.cpp:
(CachedImage::data):
* kwq/KWQPixmap.mm:
(QPixmap::QPixmap):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1432 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5f7d179..4d6a08b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-25 Richard Williamson <rjw at apple.com>
+
+ Enabled progressive image loading code.
+
+ * khtml/misc/loader.cpp:
+ (CachedImage::data):
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-25 Darin Adler <darin at apple.com>
Removed remaining uses of BORROWED defines.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5f7d179..4d6a08b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-06-25 Richard Williamson <rjw at apple.com>
+
+ Enabled progressive image loading code.
+
+ * khtml/misc/loader.cpp:
+ (CachedImage::data):
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-25 Darin Adler <darin at apple.com>
Removed remaining uses of BORROWED defines.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5f7d179..4d6a08b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-06-25 Richard Williamson <rjw at apple.com>
+
+ Enabled progressive image loading code.
+
+ * khtml/misc/loader.cpp:
+ (CachedImage::data):
+ * kwq/KWQPixmap.mm:
+ (QPixmap::QPixmap):
+
2002-06-25 Darin Adler <darin at apple.com>
Removed remaining uses of BORROWED defines.
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index ade8dd0..1c0831c 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -851,7 +851,6 @@ void CachedImage::data ( QBuffer &_buffer, bool eof )
#ifdef APPLE_CHANGES
bool canDraw = false;
-#ifdef APPLE_PROGRESSIVE_LOADING_WORKS
if (!eof) {
// If we didn't get all the data for the image we will always
// attempt to load the image incrementally. If the AppKit is
@@ -864,8 +863,6 @@ void CachedImage::data ( QBuffer &_buffer, bool eof )
if (p)
canDraw = p->receivedData (_buffer.buffer(), eof);
-#endif
-
// If we're at eof and don't have a pixmap yet, the data
// must have arrived in one chunk. This avoids the attempt
// to perform incremental decoding.
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index aa35e0f..1866854 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -32,11 +32,7 @@
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 072697b..2f310be 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
2002-06-25 Richard Williamson <rjw at apple.com>
+ Enabled progressive image loading code.
+
+ * WebCoreSupport.subproj/IFImageRenderer.h:
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer initWithSize:]):
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+ * WebCoreSupport.subproj/IFImageRendererFactory.m:
+ (-[IFImageRendererFactory imageRenderer]):
+
+2002-06-25 Richard Williamson <rjw at apple.com>
+
Extended our text measurement rounding work-around for integer-float
mismatch to round on word boundaries as well as spaces.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 072697b..2f310be 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
2002-06-25 Richard Williamson <rjw at apple.com>
+ Enabled progressive image loading code.
+
+ * WebCoreSupport.subproj/IFImageRenderer.h:
+ * WebCoreSupport.subproj/IFImageRenderer.m:
+ (-[IFImageRenderer initWithSize:]):
+ (-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+ * WebCoreSupport.subproj/IFImageRendererFactory.m:
+ (-[IFImageRendererFactory imageRenderer]):
+
+2002-06-25 Richard Williamson <rjw at apple.com>
+
Extended our text measurement rounding work-around for integer-float
mismatch to round on word boundaries as well as spaces.
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.h b/WebKit/WebCoreSupport.subproj/IFImageRenderer.h
index 846c73a..28b548b 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.h
@@ -11,9 +11,6 @@
NSView *frameView;
NSRect imageRect;
NSRect targetRect;
- int lastStatus;
- unsigned lastLength;
- BOOL lastReturn;
NSColor *patternColor;
}
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index c7cb288..83c523c 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -26,7 +26,6 @@ static NSMutableArray *activeImageRenderers;
- initWithSize:(NSSize)size
{
- lastStatus = -9999;
return [super initWithSize:size];
}
@@ -44,47 +43,39 @@ static NSMutableArray *activeImageRenderers;
- (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];
NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
int status;
- lastLength = length;
- lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
+ status = [imageRep incrementalLoadFromData:data complete:isComplete];
[data release];
switch (status){
case NSImageRepLoadStatusUnknownType: // not enough data to determine image format. please feed me more data
- printf ("NSImageRepLoadStatusUnknownType size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusUnknownType size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusReadingHeader: // image format known, reading header. not yet valid. more data needed
- printf ("NSImageRepLoadStatusReadingHeader size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusReadingHeader size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusWillNeedAllData: // can't read incrementally. will wait for complete data to become avail.
- printf ("NSImageRepLoadStatusWillNeedAllData size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusWillNeedAllData size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusInvalidData: // image decompression encountered error.
- printf ("NSImageRepLoadStatusInvalidData size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusInvalidData size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusUnexpectedEOF: // ran out of data before full image was decompressed.
- printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusCompleted: // all is well, the full pixelsHigh image is valid.
- printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
+ //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
// Force the image to use the pixel size and ignore the dpi.
[imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
- return (lastReturn = YES);
+ return YES;
default:
- printf ("incrementalLoadFromData:complete: returned %d, size %d, isComplete %d (wide %d, hight %d)\n", status, length, isComplete, [imageRep pixelsWide], [imageRep pixelsHigh]);
- return (lastReturn = YES);
+ return NO;
}
- return (lastReturn = NO);
-#else
- [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
- return 0;
-#endif
+
+ return NO;
}
- (void)dealloc
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
index ce0cb61..86da1be 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
@@ -46,11 +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
+
[imageRenderer setScalesWhenResized: NO];
return [imageRenderer autorelease];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
index 846c73a..28b548b 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
@@ -11,9 +11,6 @@
NSView *frameView;
NSRect imageRect;
NSRect targetRect;
- int lastStatus;
- unsigned lastLength;
- BOOL lastReturn;
NSColor *patternColor;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index c7cb288..83c523c 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -26,7 +26,6 @@ static NSMutableArray *activeImageRenderers;
- initWithSize:(NSSize)size
{
- lastStatus = -9999;
return [super initWithSize:size];
}
@@ -44,47 +43,39 @@ static NSMutableArray *activeImageRenderers;
- (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];
NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
int status;
- lastLength = length;
- lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
+ status = [imageRep incrementalLoadFromData:data complete:isComplete];
[data release];
switch (status){
case NSImageRepLoadStatusUnknownType: // not enough data to determine image format. please feed me more data
- printf ("NSImageRepLoadStatusUnknownType size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusUnknownType size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusReadingHeader: // image format known, reading header. not yet valid. more data needed
- printf ("NSImageRepLoadStatusReadingHeader size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusReadingHeader size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusWillNeedAllData: // can't read incrementally. will wait for complete data to become avail.
- printf ("NSImageRepLoadStatusWillNeedAllData size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusWillNeedAllData size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusInvalidData: // image decompression encountered error.
- printf ("NSImageRepLoadStatusInvalidData size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusInvalidData size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusUnexpectedEOF: // ran out of data before full image was decompressed.
- printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
- return (lastReturn = NO);
+ //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
+ return NO;
case NSImageRepLoadStatusCompleted: // all is well, the full pixelsHigh image is valid.
- printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
+ //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
// Force the image to use the pixel size and ignore the dpi.
[imageRep setSize:NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh])];
- return (lastReturn = YES);
+ return YES;
default:
- printf ("incrementalLoadFromData:complete: returned %d, size %d, isComplete %d (wide %d, hight %d)\n", status, length, isComplete, [imageRep pixelsWide], [imageRep pixelsHigh]);
- return (lastReturn = YES);
+ return NO;
}
- return (lastReturn = NO);
-#else
- [NSException raise: @"TEMPORARY!! This code will be removed." format: @"foo"];
- return 0;
-#endif
+
+ return NO;
}
- (void)dealloc
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index ce0cb61..86da1be 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -46,11 +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
+
[imageRenderer setScalesWhenResized: NO];
return [imageRenderer autorelease];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list