[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 06:03:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9489a583247f7160af6b20a18d87bcb4a49bfee0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 5 19:05:41 2002 +0000
WebFoundation:
* CacheLoader.subproj/IFURLHandle.h: Eliminated [availableResourceData]
in favor of the new [resourceData], which is nil until load is complete.
* CacheLoader.subproj/IFURLHandle.m: (-[IFURLHandle loadInForeground:]):
Wean from availableResourceData; use resourceData instead.
(-[IFURLHandle resourceData]): New name, now returns nil unless statusCode
is IFURLHandleStatusLoadComplete.
* CacheLoader.subproj/IFURLHandleC.h:
* CacheLoader.subproj/IFURLHandleC.m: (IFURLHandleGetResourceData):
Replace IFURLHandleGetAvailableResourceData with IFURLHandleGetResourceData.
* WebFoundation.pbproj/project.pbxproj: The battle of the Project Builder
versions.
WebCore:
* src/kwq/KWQKloader.mm:
(-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
Use contentLengthReceived rather than getting the length of
availableResourceData to determine how much data has arrived.
WebKit:
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
Use contentLengthReceived rather than getting the length of
availableResourceData to determine how much data has arrived.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@974 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7c7849e..e59eb84 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-05 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm:
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Use contentLengthReceived rather than getting the length of
+ availableResourceData to determine how much data has arrived.
+
2002-04-05 Richard Williamson <rjw at apple.com>
More bulletproofing to deal with cleanup during deallocation.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7c7849e..e59eb84 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-04-05 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm:
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Use contentLengthReceived rather than getting the length of
+ availableResourceData to determine how much data has arrived.
+
2002-04-05 Richard Williamson <rjw at apple.com>
More bulletproofing to deal with cleanup during deallocation.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7c7849e..e59eb84 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-04-05 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm:
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Use contentLengthReceived rather than getting the length of
+ availableResourceData to determine how much data has arrived.
+
2002-04-05 Richard Williamson <rjw at apple.com>
More bulletproofing to deal with cleanup during deallocation.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index df45291..5218561 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1117,7 +1117,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
m_loader->slotFinished(job);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index df45291..5218561 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1117,7 +1117,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
m_loader->slotFinished(job);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index df45291..5218561 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1117,7 +1117,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
m_loader->slotFinished(job);
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index df45291..5218561 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1117,7 +1117,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
m_loader->slotFinished(job);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a1bd2e7..c146e1d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-05 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Use contentLengthReceived rather than getting the length of
+ availableResourceData to determine how much data has arrived.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Implemented the same lazily deallocation scheme on frame as in controller
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a1bd2e7..c146e1d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-05 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Use contentLengthReceived rather than getting the length of
+ availableResourceData to determine how much data has arrived.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Implemented the same lazily deallocation scheme on frame as in controller
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index aa3ec65..2d61d80 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -143,7 +143,7 @@ static void loadImageDocumentTemplate()
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index aa3ec65..2d61d80 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -143,7 +143,7 @@ static void loadImageDocumentTemplate()
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index aa3ec65..2d61d80 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -143,7 +143,7 @@ static void loadImageDocumentTemplate()
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
- loadProgress->bytesSoFar = [[sender availableResourceData] length];
+ loadProgress->bytesSoFar = [sender contentLengthReceived];
IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list