[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9649027ad95de076fa4abacb6661f34cee090bd0
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 1 17:14:59 2002 +0000
2002-02-01 Kenneth Kocienda <kocienda at apple.com>
At Richard's urging, I made some changes to the API of WKMutableData. I cleaned
up the API, and hid the extra no-copy functionality so that it is not visible
outside of this framework. Everything should be functionally equivalent with
these changes.
* CacheLoader.subproj/WKURLHandle.m: (-[WKURLHandle notifyClientsDidLoadData]):
* Misc.subproj/WKMutableDataPrivate.h:
* Misc.subproj/WKMutableDataPrivate.m: (WKDataCheckBound), (-[WKMutableData
dataObjectsGreaterThanMatchedOffset:]), (+[WKByteBlockData dataWithByteBlock:]),
(-[WKByteBlockData initWithByteBlock:]), (-[WKByteBlockData length]),
(-[WKByteBlockData getBytes:]), (-[WKByteBlockData getBytes:length:]),
(-[WKByteBlockData getBytes:range:]), (-[WKByteBlockData subdataWithRange:]),
(-[WKByteBlockData copyWithZone:]), (-[WKByteBlockData dealloc]):
Made some cleanups to the no-copy NSData API, and those changes
make the use of the no-copy functionality in this client code
much cleaner.
* include/WCURLHandle.h:
* src/kwq/KWQKloader.mm: (-[URLLoadClient
WCURLHandle:resourceDataDidBecomeAvailable:offset:length:userData:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e6d6f35..8397557 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ Made some cleanups to the no-copy NSData API, and those changes
+ make the use of the no-copy functionality in this client code
+ much cleaner.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:offset:length:userData:]):
+
2002-01-31 Richard Williamson <rjw at apple.com>
Added QString constructor, fixed javascript at head of document bug.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e6d6f35..8397557 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ Made some cleanups to the no-copy NSData API, and those changes
+ make the use of the no-copy functionality in this client code
+ much cleaner.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:offset:length:userData:]):
+
2002-01-31 Richard Williamson <rjw at apple.com>
Added QString constructor, fixed javascript at head of document bug.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e6d6f35..8397557 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ Made some cleanups to the no-copy NSData API, and those changes
+ make the use of the no-copy functionality in this client code
+ much cleaner.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:offset:length:userData:]):
+
2002-01-31 Richard Williamson <rjw at apple.com>
Added QString constructor, fixed javascript at head of document bug.
diff --git a/WebCore/include/WCURLHandle.h b/WebCore/include/WCURLHandle.h
index cfeb4bb..3090819 100644
--- a/WebCore/include/WCURLHandle.h
+++ b/WebCore/include/WCURLHandle.h
@@ -21,15 +21,6 @@
-(NSString *)responseHeaderForKey:(NSString *)key;
@end
- at protocol WCMutableData
--(NSArray *)byteBlocksForRange:(NSRange)range;
- at end
-
- at protocol WCByteBlock
--(const void *)bytes;
--(unsigned)byteLength;
- at end
-
#if defined(__cplusplus)
extern "C" {
#endif
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 3e40085..c6f5558 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -943,35 +943,15 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
{
- NSArray *byteBlocks;
char *bytes;
- int byteBlockCount;
- id object;
- id <WCByteBlock> byteBlock;
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
-
- byteBlocks = nil;
- if ([data respondsToSelector:@selector(byteBlocksForRange:)]) {
- object = data;
- byteBlocks = [object byteBlocksForRange:NSMakeRange(offset, length)];
- }
- if (byteBlocks) {
- byteBlockCount = [byteBlocks count];
- for (int i = 0; i < byteBlockCount; i++) {
- byteBlock = [byteBlocks objectAtIndex:i];
- m_loader->slotData(job, (const char *)[byteBlock bytes], [byteBlock byteLength]);
- }
- }
- else {
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
- }
-
+ bytes = ((char *)[data bytes]) + offset;
+ m_loader->slotData(job, (const char *)bytes, length);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 3e40085..c6f5558 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -943,35 +943,15 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
{
- NSArray *byteBlocks;
char *bytes;
- int byteBlockCount;
- id object;
- id <WCByteBlock> byteBlock;
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
-
- byteBlocks = nil;
- if ([data respondsToSelector:@selector(byteBlocksForRange:)]) {
- object = data;
- byteBlocks = [object byteBlocksForRange:NSMakeRange(offset, length)];
- }
- if (byteBlocks) {
- byteBlockCount = [byteBlocks count];
- for (int i = 0; i < byteBlockCount; i++) {
- byteBlock = [byteBlocks objectAtIndex:i];
- m_loader->slotData(job, (const char *)[byteBlock bytes], [byteBlock byteLength]);
- }
- }
- else {
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
- }
-
+ bytes = ((char *)[data bytes]) + offset;
+ m_loader->slotData(job, (const char *)bytes, length);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 3e40085..c6f5558 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -943,35 +943,15 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
{
- NSArray *byteBlocks;
char *bytes;
- int byteBlockCount;
- id object;
- id <WCByteBlock> byteBlock;
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
-
- byteBlocks = nil;
- if ([data respondsToSelector:@selector(byteBlocksForRange:)]) {
- object = data;
- byteBlocks = [object byteBlocksForRange:NSMakeRange(offset, length)];
- }
- if (byteBlocks) {
- byteBlockCount = [byteBlocks count];
- for (int i = 0; i < byteBlockCount; i++) {
- byteBlock = [byteBlocks objectAtIndex:i];
- m_loader->slotData(job, (const char *)[byteBlock bytes], [byteBlock byteLength]);
- }
- }
- else {
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
- }
-
+ bytes = ((char *)[data bytes]) + offset;
+ m_loader->slotData(job, (const char *)bytes, length);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 3e40085..c6f5558 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -943,35 +943,15 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
{
- NSArray *byteBlocks;
char *bytes;
- int byteBlockCount;
- id object;
- id <WCByteBlock> byteBlock;
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
-
- byteBlocks = nil;
- if ([data respondsToSelector:@selector(byteBlocksForRange:)]) {
- object = data;
- byteBlocks = [object byteBlocksForRange:NSMakeRange(offset, length)];
- }
- if (byteBlocks) {
- byteBlockCount = [byteBlocks count];
- for (int i = 0; i < byteBlockCount; i++) {
- byteBlock = [byteBlocks objectAtIndex:i];
- m_loader->slotData(job, (const char *)[byteBlock bytes], [byteBlock byteLength]);
- }
- }
- else {
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
- }
-
+ bytes = ((char *)[data bytes]) + offset;
+ m_loader->slotData(job, (const char *)bytes, length);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list