[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:14:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b6fe457984470afd3539259b30136fbc064a31d5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 21 20:48:47 2002 +0000
WebFoundation:
Fix for 2925907 - [IFURLHandle resourceData] returns nil until load is complete
* CacheLoader.subproj/IFURLHandle.m:
(-[IFURLHandle resourceData]):
WebKit:
Content policy can now be sent at a later time to avoid blocking.
* WebView.subproj/IFMainURLHandleClient.h:
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient initWithDataSource:part:]):
(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cffab64..8b20663 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
2002-05-21 Chris Blumenberg <cblu at apple.com>
+ Content policy can now be sent at a later time to avoid blocking.
+
+ * WebView.subproj/IFMainURLHandleClient.h:
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient initWithDataSource:part:]):
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+2002-05-21 Chris Blumenberg <cblu at apple.com>
+
Move the tracking rect after the view has moved.
* Plugins.subproj/IFPluginView.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cffab64..8b20663 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-05-21 Chris Blumenberg <cblu at apple.com>
+ Content policy can now be sent at a later time to avoid blocking.
+
+ * WebView.subproj/IFMainURLHandleClient.h:
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient initWithDataSource:part:]):
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+2002-05-21 Chris Blumenberg <cblu at apple.com>
+
Move the tracking rect after the view has moved.
* Plugins.subproj/IFPluginView.mm:
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.h b/WebKit/WebView.subproj/IFMainURLHandleClient.h
index 8873d3a..ce00ea8 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.h
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.h
@@ -20,7 +20,7 @@ class KHTMLPart;
{
id dataSource;
KHTMLPart *part;
- BOOL sentFakeDocForNonHTMLContentType, examinedInitialData, downloadStarted, loadFinished, sentInitialData;
+ BOOL sentFakeDocForNonHTMLContentType, processedBufferedData, downloadStarted, loadFinished, examinedInitialData;
IFMIMEHandler *mimeHandler;
IFMIMEHandlerType handlerType;
IFDownloadHandler *downloadHandler;
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 1d3257a..865d9c0 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -35,10 +35,10 @@
part = p;
part->ref();
sentFakeDocForNonHTMLContentType = NO;
- examinedInitialData = NO;
downloadStarted = NO;
loadFinished = NO;
- sentInitialData = NO;
+ examinedInitialData = NO;
+ processedBufferedData = NO;
contentPolicy = IFContentPolicyNone;
return self;
}
@@ -118,7 +118,6 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// Check the mime type and ask the client for the content policy.
- // This only happens once.
if(!examinedInitialData){
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", [[sender contentType] cString]);
[[dataSource _locationChangeHandler] requestContentPolicyForMIMEType:[sender contentType]];
@@ -133,13 +132,10 @@
}
if(contentPolicy != IFContentPolicyNone && contentPolicy != IFContentPolicyIgnore){
- if(!sentInitialData){
- // process all data that has been received
- //[self processData:[sender resourceData] isComplete:NO];
-
- //FIXME: Need we still depend on the content policy being set immediately because of 2925907.
- [self processData:data isComplete:NO];
- sentInitialData = YES;
+ if(!processedBufferedData){
+ // process all data that has been received now that we have a content policy
+ [self processData:[sender resourceData] isComplete:NO];
+ processedBufferedData = YES;
}else{
[self processData:data isComplete:NO];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 8873d3a..ce00ea8 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -20,7 +20,7 @@ class KHTMLPart;
{
id dataSource;
KHTMLPart *part;
- BOOL sentFakeDocForNonHTMLContentType, examinedInitialData, downloadStarted, loadFinished, sentInitialData;
+ BOOL sentFakeDocForNonHTMLContentType, processedBufferedData, downloadStarted, loadFinished, examinedInitialData;
IFMIMEHandler *mimeHandler;
IFMIMEHandlerType handlerType;
IFDownloadHandler *downloadHandler;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1d3257a..865d9c0 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -35,10 +35,10 @@
part = p;
part->ref();
sentFakeDocForNonHTMLContentType = NO;
- examinedInitialData = NO;
downloadStarted = NO;
loadFinished = NO;
- sentInitialData = NO;
+ examinedInitialData = NO;
+ processedBufferedData = NO;
contentPolicy = IFContentPolicyNone;
return self;
}
@@ -118,7 +118,6 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// Check the mime type and ask the client for the content policy.
- // This only happens once.
if(!examinedInitialData){
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", [[sender contentType] cString]);
[[dataSource _locationChangeHandler] requestContentPolicyForMIMEType:[sender contentType]];
@@ -133,13 +132,10 @@
}
if(contentPolicy != IFContentPolicyNone && contentPolicy != IFContentPolicyIgnore){
- if(!sentInitialData){
- // process all data that has been received
- //[self processData:[sender resourceData] isComplete:NO];
-
- //FIXME: Need we still depend on the content policy being set immediately because of 2925907.
- [self processData:data isComplete:NO];
- sentInitialData = YES;
+ if(!processedBufferedData){
+ // process all data that has been received now that we have a content policy
+ [self processData:[sender resourceData] isComplete:NO];
+ processedBufferedData = YES;
}else{
[self processData:data isComplete:NO];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 8873d3a..ce00ea8 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -20,7 +20,7 @@ class KHTMLPart;
{
id dataSource;
KHTMLPart *part;
- BOOL sentFakeDocForNonHTMLContentType, examinedInitialData, downloadStarted, loadFinished, sentInitialData;
+ BOOL sentFakeDocForNonHTMLContentType, processedBufferedData, downloadStarted, loadFinished, examinedInitialData;
IFMIMEHandler *mimeHandler;
IFMIMEHandlerType handlerType;
IFDownloadHandler *downloadHandler;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1d3257a..865d9c0 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -35,10 +35,10 @@
part = p;
part->ref();
sentFakeDocForNonHTMLContentType = NO;
- examinedInitialData = NO;
downloadStarted = NO;
loadFinished = NO;
- sentInitialData = NO;
+ examinedInitialData = NO;
+ processedBufferedData = NO;
contentPolicy = IFContentPolicyNone;
return self;
}
@@ -118,7 +118,6 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// Check the mime type and ask the client for the content policy.
- // This only happens once.
if(!examinedInitialData){
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", [[sender contentType] cString]);
[[dataSource _locationChangeHandler] requestContentPolicyForMIMEType:[sender contentType]];
@@ -133,13 +132,10 @@
}
if(contentPolicy != IFContentPolicyNone && contentPolicy != IFContentPolicyIgnore){
- if(!sentInitialData){
- // process all data that has been received
- //[self processData:[sender resourceData] isComplete:NO];
-
- //FIXME: Need we still depend on the content policy being set immediately because of 2925907.
- [self processData:data isComplete:NO];
- sentInitialData = YES;
+ if(!processedBufferedData){
+ // process all data that has been received now that we have a content policy
+ [self processData:[sender resourceData] isComplete:NO];
+ processedBufferedData = YES;
}else{
[self processData:data isComplete:NO];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list