[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 06:20:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2e8e08998e942dd3757a0608b60b94c852b3b74f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 18 20:49:10 2002 +0000
2002-06-18 Kenneth Kocienda <kocienda at apple.com>
Fix for this bug:
Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
* WebCore/khtml/misc/loader.cpp:
(DocLoader::requestImage): Added APPLE_CHANGES call to the KWQCheckCacheObjectStatus function
described below
(DocLoader::requestStyleSheet): ditto
(DocLoader::requestScript): ditto
* WebCore/kwq/KWQKloader.mm:
(KWQCheckCacheObjectStatus): New function that informs WebKit of the
fact that a URL was loaded from the WebCore/khtml cache.
* WebCore/kwq/KWQLoaderImpl.h: Added prototype for KWQCheckCacheObjectStatus
* WebCore/kwq/WebCoreBridge.h: Added KWQCheckCacheObjectStatus to WebCoreBridge protocol
* WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm:
(-[IFWebCoreBridge objectLoadedFromCache:size:]): New method that sends the appropriate progress indication.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index bc54892..24be631 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-06-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Fix for this bug:
+
+ Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
+
+ * khtml/misc/loader.cpp:
+ (DocLoader::requestImage): Added APPLE_CHANGES call to the KWQCheckCacheObjectStatus function
+ described below
+ (DocLoader::requestStyleSheet): ditto
+ (DocLoader::requestScript): ditto
+ * kwq/KWQKloader.mm:
+ (KWQCheckCacheObjectStatus): New function that informs WebKit of the
+ fact that a URL was loaded from the WebCore/khtml cache.
+ * kwq/KWQLoaderImpl.h: Added prototype for KWQCheckCacheObjectStatus
+ * kwq/WebCoreBridge.h: Added KWQCheckCacheObjectStatus to WebCoreBridge protocol
+
2002-06-18 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::~KWQKHTMLPartImpl):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bc54892..24be631 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2002-06-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Fix for this bug:
+
+ Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
+
+ * khtml/misc/loader.cpp:
+ (DocLoader::requestImage): Added APPLE_CHANGES call to the KWQCheckCacheObjectStatus function
+ described below
+ (DocLoader::requestStyleSheet): ditto
+ (DocLoader::requestScript): ditto
+ * kwq/KWQKloader.mm:
+ (KWQCheckCacheObjectStatus): New function that informs WebKit of the
+ fact that a URL was loaded from the WebCore/khtml cache.
+ * kwq/KWQLoaderImpl.h: Added prototype for KWQCheckCacheObjectStatus
+ * kwq/WebCoreBridge.h: Added KWQCheckCacheObjectStatus to WebCoreBridge protocol
+
2002-06-18 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::~KWQKHTMLPartImpl):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bc54892..24be631 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2002-06-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Fix for this bug:
+
+ Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
+
+ * khtml/misc/loader.cpp:
+ (DocLoader::requestImage): Added APPLE_CHANGES call to the KWQCheckCacheObjectStatus function
+ described below
+ (DocLoader::requestStyleSheet): ditto
+ (DocLoader::requestScript): ditto
+ * kwq/KWQKloader.mm:
+ (KWQCheckCacheObjectStatus): New function that informs WebKit of the
+ fact that a URL was loaded from the WebCore/khtml cache.
+ * kwq/KWQLoaderImpl.h: Added prototype for KWQCheckCacheObjectStatus
+ * kwq/WebCoreBridge.h: Added KWQCheckCacheObjectStatus to WebCoreBridge protocol
+
2002-06-18 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::~KWQKHTMLPartImpl):
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 2bcae7a..ade8dd0 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -985,7 +985,13 @@ CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
bool reload = needReload(fullURL);
+#if APPLE_CHANGES
+ CachedImage *cachedObject = Cache::requestImage(this, url, reload, m_expireDate);
+ KWQCheckCacheObjectStatus(this, cachedObject);
+ return cachedObject;
+#else
return Cache::requestImage(this, url, reload, m_expireDate);
+#endif
}
CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, const QString& charset)
@@ -995,7 +1001,13 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
bool reload = needReload(fullURL);
+#if APPLE_CHANGES
+ CachedCSSStyleSheet *cachedObject = Cache::requestStyleSheet(this, url, reload, m_expireDate, charset);
+ KWQCheckCacheObjectStatus(this, cachedObject);
+ return cachedObject;
+#else
return Cache::requestStyleSheet(this, url, reload, m_expireDate, charset);
+#endif
}
CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString& charset)
@@ -1005,7 +1017,13 @@ CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString
bool reload = needReload(fullURL);
+#if APPLE_CHANGES
+ CachedScript *cachedObject = Cache::requestScript(this, url, reload, m_expireDate, charset);
+ KWQCheckCacheObjectStatus(this, cachedObject);
+ return cachedObject;
+#else
return Cache::requestScript(this, url, reload, m_expireDate, charset);
+#endif
}
void DocLoader::setAutoloadImages( bool enable )
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index b7522a9..ae4be7f 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -35,6 +35,8 @@
#import <kwqdebug.h>
+using khtml::CachedObject;
+using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
using KIO::TransferJob;
@@ -99,3 +101,15 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
[resourceLoader release];
}
+
+void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
+{
+ CachedObject::Status status = cachedObject->status();
+ if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
+ WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+ NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
+ unsigned size = abs(cachedObject->size());
+ [bridge objectLoadedFromCache:nsURL size:size];
+ [nsURL release];
+ }
+}
\ No newline at end of file
diff --git a/WebCore/kwq/KWQLoader.h b/WebCore/kwq/KWQLoader.h
index d57e2e9..4d127e9 100644
--- a/WebCore/kwq/KWQLoader.h
+++ b/WebCore/kwq/KWQLoader.h
@@ -24,6 +24,8 @@
*/
namespace khtml {
+ class CachedObject;
+ class DocLoader;
class Loader;
class Request;
}
@@ -33,3 +35,4 @@ namespace KIO {
}
void KWQServeRequest(khtml::Loader *, khtml::Request *, KIO::TransferJob *);
+void KWQCheckCacheObjectStatus(khtml::DocLoader *, khtml::CachedObject *);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index b7522a9..ae4be7f 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -35,6 +35,8 @@
#import <kwqdebug.h>
+using khtml::CachedObject;
+using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
using KIO::TransferJob;
@@ -99,3 +101,15 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
[resourceLoader release];
}
+
+void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
+{
+ CachedObject::Status status = cachedObject->status();
+ if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
+ WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+ NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
+ unsigned size = abs(cachedObject->size());
+ [bridge objectLoadedFromCache:nsURL size:size];
+ [nsURL release];
+ }
+}
\ No newline at end of file
diff --git a/WebCore/kwq/KWQLoaderImpl.h b/WebCore/kwq/KWQLoaderImpl.h
index d57e2e9..4d127e9 100644
--- a/WebCore/kwq/KWQLoaderImpl.h
+++ b/WebCore/kwq/KWQLoaderImpl.h
@@ -24,6 +24,8 @@
*/
namespace khtml {
+ class CachedObject;
+ class DocLoader;
class Loader;
class Request;
}
@@ -33,3 +35,4 @@ namespace KIO {
}
void KWQServeRequest(khtml::Loader *, khtml::Request *, KIO::TransferJob *);
+void KWQCheckCacheObjectStatus(khtml::DocLoader *, khtml::CachedObject *);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index b7522a9..ae4be7f 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -35,6 +35,8 @@
#import <kwqdebug.h>
+using khtml::CachedObject;
+using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
using KIO::TransferJob;
@@ -99,3 +101,15 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
[resourceLoader release];
}
+
+void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
+{
+ CachedObject::Status status = cachedObject->status();
+ if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
+ WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+ NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
+ unsigned size = abs(cachedObject->size());
+ [bridge objectLoadedFromCache:nsURL size:size];
+ [nsURL release];
+ }
+}
\ No newline at end of file
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 16c7fe7..54fb1d3 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -109,6 +109,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL;
+- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes;
+
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 661b55d..643d6a5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Fix for this bug:
+
+ Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge objectLoadedFromCache:size:]): New method that sends the appropriate progress indication.
+
2002-06-17 Richard Williamson <rjw at apple.com>
Fixed window.open regression.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 661b55d..643d6a5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Fix for this bug:
+
+ Radar 2928483 (activity viewer does not show all the pieces of a web page when the page is cached)
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge objectLoadedFromCache:size:]): New method that sends the appropriate progress indication.
+
2002-06-17 Richard Williamson <rjw at apple.com>
Fixed window.open regression.
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index 4b4449d..a2e34c0 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -12,9 +12,12 @@
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebFramePrivate.h>
#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/IFLoadProgress.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFURLHandle.h>
+
@implementation IFWebDataSource (IFWebCoreBridge)
- (IFWebCoreBridge *)_bridge
@@ -129,6 +132,18 @@
return [IFResourceURLHandleClient startLoadingResource:resourceLoader withURL:URL dataSource:dataSource];
}
+- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes
+{
+ IFURLHandle *handle;
+ IFLoadProgress *loadProgress;
+
+ handle = [[IFURLHandle alloc] initWithURL:URL];
+ loadProgress = [[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
+ [[dataSource controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource: dataSource complete:YES];
+ [loadProgress release];
+ [handle release];
+}
+
- (void)setDataSource: (IFWebDataSource *)ds
{
// FIXME: non-retained because data source owns representation owns bridge
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 4b4449d..a2e34c0 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -12,9 +12,12 @@
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebFramePrivate.h>
#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/IFLoadProgress.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFURLHandle.h>
+
@implementation IFWebDataSource (IFWebCoreBridge)
- (IFWebCoreBridge *)_bridge
@@ -129,6 +132,18 @@
return [IFResourceURLHandleClient startLoadingResource:resourceLoader withURL:URL dataSource:dataSource];
}
+- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes
+{
+ IFURLHandle *handle;
+ IFLoadProgress *loadProgress;
+
+ handle = [[IFURLHandle alloc] initWithURL:URL];
+ loadProgress = [[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
+ [[dataSource controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource: dataSource complete:YES];
+ [loadProgress release];
+ [handle release];
+}
+
- (void)setDataSource: (IFWebDataSource *)ds
{
// FIXME: non-retained because data source owns representation owns bridge
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list