[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:22:31 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 05eeb89c6535c2468a791bcc080293597bd3c1eb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 1 21:17:18 2002 +0000
Ken fixed the load message sequencing problem in WebFoundation, so now we can
go back to the original versions of the asserts.
* WebCoreSupport.subproj/IFResourceURLHandleClient.m:
(-[IFResourceURLHandleClient dealloc]):
(-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
(-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient dealloc]):
(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
Roll out the stuff that's ifdef'd and marked with bug 2954901.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4d57c7d..e23bea4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
2002-07-01 Darin Adler <darin at apple.com>
+ Ken fixed the load message sequencing problem in WebFoundation, so now we can
+ go back to the original versions of the asserts.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient dealloc]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient dealloc]):
+ (-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ Roll out the stuff that's ifdef'd and marked with bug 2954901.
+
+2002-07-01 Darin Adler <darin at apple.com>
+
* WebView.subproj/IFDynamicScrollBarsView.m:
(-[IFDynamicScrollBarsView updateScrollers]): After a closer reading of
the NSScrollView source code, I see that we don't need to explicitly do
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4d57c7d..e23bea4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-07-01 Darin Adler <darin at apple.com>
+ Ken fixed the load message sequencing problem in WebFoundation, so now we can
+ go back to the original versions of the asserts.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient dealloc]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient dealloc]):
+ (-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ Roll out the stuff that's ifdef'd and marked with bug 2954901.
+
+2002-07-01 Darin Adler <darin at apple.com>
+
* WebView.subproj/IFDynamicScrollBarsView.m:
(-[IFDynamicScrollBarsView updateScrollers]): After a closer reading of
the NSScrollView source code, I see that we don't need to explicitly do
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
index e6146c0..649554a 100644
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
@@ -48,13 +48,7 @@
- (void)dealloc
{
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(currentURL == nil);
-#else
- if (currentURL) {
- [self didStopLoading];
- }
-#endif
[loader release];
[dataSource release];
@@ -115,13 +109,7 @@
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
{
- // FIXME Radar 2954901: Replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
@@ -156,13 +144,7 @@
- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
{
- // FIXME: This assert starting firing, so I made it lenient like the cancel one above.
- // I don't know what's going on.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index e6146c0..649554a 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -48,13 +48,7 @@
- (void)dealloc
{
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(currentURL == nil);
-#else
- if (currentURL) {
- [self didStopLoading];
- }
-#endif
[loader release];
[dataSource release];
@@ -115,13 +109,7 @@
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
{
- // FIXME Radar 2954901: Replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
@@ -156,13 +144,7 @@
- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
{
- // FIXME: This assert starting firing, so I made it lenient like the cancel one above.
- // I don't know what's going on.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index e6146c0..649554a 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -48,13 +48,7 @@
- (void)dealloc
{
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(currentURL == nil);
-#else
- if (currentURL) {
- [self didStopLoading];
- }
-#endif
[loader release];
[dataSource release];
@@ -115,13 +109,7 @@
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
{
- // FIXME Radar 2954901: Replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
@@ -156,13 +144,7 @@
- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
{
- // FIXME: This assert starting firing, so I made it lenient like the cancel one above.
- // I don't know what's going on.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#else
- WEBKIT_ASSERT(currentURL == nil || [currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-#endif
[loader cancel];
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 5951d6c..715a345 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -40,12 +40,7 @@
- (void)dealloc
{
- // FIXME Radar 2954901: Changed this not to leak because cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(url == nil);
-#else
- [url release];
-#endif
[dataSource release];
[super dealloc];
}
@@ -70,13 +65,7 @@
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
- // FIXME Radar 2954901: I replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#else
- WEBKIT_ASSERT(url == nil || [url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#endif
[[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
forResourceHandle:sender fromDataSource: dataSource complete: YES];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 5951d6c..715a345 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -40,12 +40,7 @@
- (void)dealloc
{
- // FIXME Radar 2954901: Changed this not to leak because cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(url == nil);
-#else
- [url release];
-#endif
[dataSource release];
[super dealloc];
}
@@ -70,13 +65,7 @@
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
- // FIXME Radar 2954901: I replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#else
- WEBKIT_ASSERT(url == nil || [url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#endif
[[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
forResourceHandle:sender fromDataSource: dataSource complete: YES];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 5951d6c..715a345 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -40,12 +40,7 @@
- (void)dealloc
{
- // FIXME Radar 2954901: Changed this not to leak because cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT(url == nil);
-#else
- [url release];
-#endif
[dataSource release];
[super dealloc];
}
@@ -70,13 +65,7 @@
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
- // FIXME Radar 2954901: I replaced the assertion below with a more lenient one,
- // since cancel messages are sometimes sent before begin.
-#ifdef WEBFOUNDATION_LOAD_MESSAGES_FIXED
WEBKIT_ASSERT([url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#else
- WEBKIT_ASSERT(url == nil || [url isEqual:[sender redirectedURL] ? [sender redirectedURL] : [sender url]]);
-#endif
[[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
forResourceHandle:sender fromDataSource: dataSource complete: YES];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list