[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:55:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1af5d866c463f2ed864b4e48644fcfb915f5928b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Feb 2 05:06:39 2002 +0000
2002-02-01 Kenneth Kocienda <kocienda at apple.com>
More cleanups to the no-copy NSData API.
This time the callback from the cache/loader has been
simplified from:
- (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(UInt8 *)bytes offset:(unsigned)offset length:(unsigned)length;
to:
- (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data;
This was made possible by some rearrangement in the private API.
Changed name of WKByteBlockData to WKData.
* include/WCURLHandle.h:
* src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
* src/kwq/KWQKloader.mm: (-[URLLoadClient
WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
* CacheLoader.subproj/WCURLHandleGlue.m: (-[WCURLHandleClientProxy
WKURLHandle:resourceDataDidBecomeAvailable:]):
* CacheLoader.subproj/WKURLHandle.m: (-[WKURLHandleSynchronousClient
WKURLHandle:resourceDataDidBecomeAvailable:]), (-[WKURLHandle
notifyClientsDidLoadData]):
* CacheLoader.subproj/WKURLHandleCGlue.h:
* CacheLoader.subproj/WKURLHandleCGlue.m: (-[WKURLHandleCGlueClient
WKURLHandle:resourceDataDidBecomeAvailable:]):
* CacheLoader.subproj/WKURLHandleClient.h:
* Misc.subproj/WKMutableDataPrivate.h:
* Misc.subproj/WKMutableDataPrivate.m: (-[WKMutableData
dataObjectsGreaterThanMatchedOffset:]), (+[WKData dataWithByteBlock:]), (-[WKData
subdataWithRange:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d324779..871a790 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ More cleanups to the no-copy NSData API.
+ This time the callback from the cache/loader has been
+ simplified from:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(UInt8 *)bytes offset:(unsigned)offset length:(unsigned)length;
+ to:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data;
+ This was made possible by some rearrangement in the private API.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+
2002-02-01 Richard Williamson <rjw at apple.com>
Added support for dynamic scrolling frames. Also added first callback for
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d324779..871a790 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ More cleanups to the no-copy NSData API.
+ This time the callback from the cache/loader has been
+ simplified from:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(UInt8 *)bytes offset:(unsigned)offset length:(unsigned)length;
+ to:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data;
+ This was made possible by some rearrangement in the private API.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+
2002-02-01 Richard Williamson <rjw at apple.com>
Added support for dynamic scrolling frames. Also added first callback for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d324779..871a790 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-02-01 Kenneth Kocienda <kocienda at apple.com>
+
+ More cleanups to the no-copy NSData API.
+ This time the callback from the cache/loader has been
+ simplified from:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(UInt8 *)bytes offset:(unsigned)offset length:(unsigned)length;
+ to:
+ - (void)WKURLHandle:(WKURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data;
+ This was made possible by some rearrangement in the private API.
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+
2002-02-01 Richard Williamson <rjw at apple.com>
Added support for dynamic scrolling frames. Also added first callback for
diff --git a/WebCore/include/WCURLHandle.h b/WebCore/include/WCURLHandle.h
index 3090819..1e0c120 100644
--- a/WebCore/include/WCURLHandle.h
+++ b/WebCore/include/WCURLHandle.h
@@ -12,7 +12,7 @@
- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData;
- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData;
- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData;
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData;
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData;
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData;
@end
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 476f92a..fd8d562 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -143,17 +143,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->closeURL();
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
-
- bytes = ((char *)[data bytes]) + offset;
-
- m_part->slotData(sender, (const char *)bytes, length);
+ m_part->slotData(sender, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 476f92a..fd8d562 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -143,17 +143,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->closeURL();
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
-
- bytes = ((char *)[data bytes]) + offset;
-
- m_part->slotData(sender, (const char *)bytes, length);
+ m_part->slotData(sender, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index c6f5558..f576eef 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -941,17 +941,14 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
+ m_loader->slotData(job, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index c6f5558..f576eef 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -941,17 +941,14 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
+ m_loader->slotData(job, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index c6f5558..f576eef 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -941,17 +941,14 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
+ m_loader->slotData(job, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 476f92a..fd8d562 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -143,17 +143,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->closeURL();
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
-
- bytes = ((char *)[data bytes]) + offset;
-
- m_part->slotData(sender, (const char *)bytes, length);
+ m_part->slotData(sender, (const char *)[data bytes], [data 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 c6f5558..f576eef 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -941,17 +941,14 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data offset:(int)offset length:(int)length userData:(void *)userData
+- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
{
- char *bytes;
-
if (!m_data) {
m_data = [data retain];
}
KIO::Job *job = static_cast<KIO::Job *>(userData);
- bytes = ((char *)[data bytes]) + offset;
- m_loader->slotData(job, (const char *)bytes, length);
+ m_loader->slotData(job, (const char *)[data bytes], [data length]);
}
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list