[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:19:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8e54d28d73c8e548494e07808088b12e857d1b4e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jun 16 04:03:27 2002 +0000
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
Added a lot of assertions that I had used while debugging.
(-[IFWebCoreBridge didRedirectWithHandle:fromURL:]):
Commented out the line of code that calls [serverRedirectTo:forDataSource:].
Our old code was sending this to the web controller (that was a bug).
But if we send it to the location change handler, then we confuse Alexander.
We may return to this later, uncomment it, and change the interface so the
client can tell what is being redirected. We'll need to do that if we want
the activity window to show redirected URLs at the time of the redirect.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1380 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 03a004c..2631116 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,11 +1,14 @@
-2002-06-15 Richard Williamson <rjw at apple.com>
+2002-06-15 Darin Adler <darin at apple.com>
- * ChangeLog:
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
- (-[IFWebFrame _bridge]):
- (-[IFWebCoreBridge children]):
- * WebView.subproj/IFWebFramePrivate.mm:
- (-[IFWebFrame _isLoadComplete]):
+ Added a lot of assertions that I had used while debugging.
+ (-[IFWebCoreBridge didRedirectWithHandle:fromURL:]):
+ Commented out the line of code that calls [serverRedirectTo:forDataSource:].
+ Our old code was sending this to the web controller (that was a bug).
+ But if we send it to the location change handler, then we confuse Alexander.
+ We may return to this later, uncomment it, and change the interface so the
+ client can tell what is being redirected. We'll need to do that if we want
+ the activity window to show redirected URLs at the time of the redirect.
2002-06-15 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 03a004c..2631116 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,11 +1,14 @@
-2002-06-15 Richard Williamson <rjw at apple.com>
+2002-06-15 Darin Adler <darin at apple.com>
- * ChangeLog:
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
- (-[IFWebFrame _bridge]):
- (-[IFWebCoreBridge children]):
- * WebView.subproj/IFWebFramePrivate.mm:
- (-[IFWebFrame _isLoadComplete]):
+ Added a lot of assertions that I had used while debugging.
+ (-[IFWebCoreBridge didRedirectWithHandle:fromURL:]):
+ Commented out the line of code that calls [serverRedirectTo:forDataSource:].
+ Our old code was sending this to the web controller (that was a bug).
+ But if we send it to the location change handler, then we confuse Alexander.
+ We may return to this later, uncomment it, and change the interface so the
+ client can tell what is being redirected. We'll need to do that if we want
+ the activity window to show redirected URLs at the time of the redirect.
2002-06-15 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index 58f4425..d2672c4 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -53,6 +53,7 @@
- (IFWebFrame *)frame
{
+ WEBKIT_ASSERT(dataSource);
return [dataSource webFrame];
}
@@ -73,19 +74,21 @@
- (WebCoreBridge *)parent
{
+ WEBKIT_ASSERT(dataSource);
return [[dataSource parent] _bridge];
}
- (NSArray *)children
{
+ WEBKIT_ASSERT(dataSource);
NSArray *frames = [dataSource children];
NSEnumerator *e = [frames objectEnumerator];
NSMutableArray *children = [NSMutableArray arrayWithCapacity:[frames count]];
IFWebFrame *frame;
while ((frame = [e nextObject])) {
- IFWebCoreBridge *aBridge = [frame _bridge];
- if (aBridge)
- [children addObject:aBridge];
+ IFWebCoreBridge *bridge = [frame _bridge];
+ if (bridge)
+ [children addObject:bridge];
}
return children;
}
@@ -123,6 +126,8 @@
withURL:(NSURL *)URL renderPart:(khtml::RenderPart *)renderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
{
+ WEBKIT_ASSERT(dataSource);
+
IFWebFrame *frame = [[self controller] createFrameNamed:frameName for:nil inParent:dataSource allowsScrolling:allowsScrolling];
if (frame == nil) {
return NO;
@@ -145,6 +150,7 @@
- (void)setTitle:(NSString *)title
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _setTitle:title];
}
@@ -160,6 +166,7 @@
- (KHTMLView *)widget
{
+ WEBKIT_ASSERT([self HTMLView]);
KHTMLView *widget = [[self HTMLView] _provisionalWidget];
if (widget) {
return widget;
@@ -181,11 +188,13 @@
- (void)addHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _addURLHandle:handle];
}
- (void)removeHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _removeURLHandle:handle];
}
@@ -197,6 +206,7 @@
- (void)receivedProgressWithHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
forResourceHandle:handle fromDataSource:dataSource];
}
@@ -209,6 +219,7 @@
- (void)didCancelLoadingWithHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedProgress:[IFLoadProgress progress]
forResourceHandle:handle fromDataSource:dataSource];
[[self controller] _didStopLoading:[handle url]];
@@ -216,12 +227,14 @@
- (void)didFailBeforeLoadingWithError:(IFError *)error
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedError:error forResourceHandle:nil
partialProgress:nil fromDataSource:dataSource];
}
- (void)didFailToLoadWithHandle:(IFURLHandle *)handle error:(IFError *)error
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedError:error forResourceHandle:handle
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
[[self controller] _didStopLoading:[handle url]];
@@ -229,6 +242,8 @@
- (void)didRedirectWithHandle:(IFURLHandle *)handle fromURL:(NSURL *)fromURL
{
+ WEBKIT_ASSERT(dataSource);
+
NSURL *toURL = [handle redirectedURL];
[[self controller] _didStopLoading:fromURL];
@@ -236,7 +251,7 @@
[dataSource _setFinalURL:toURL];
[self setURL:toURL];
- [[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
+ //[[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
[[self controller] _didStartLoading:toURL];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 58f4425..d2672c4 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -53,6 +53,7 @@
- (IFWebFrame *)frame
{
+ WEBKIT_ASSERT(dataSource);
return [dataSource webFrame];
}
@@ -73,19 +74,21 @@
- (WebCoreBridge *)parent
{
+ WEBKIT_ASSERT(dataSource);
return [[dataSource parent] _bridge];
}
- (NSArray *)children
{
+ WEBKIT_ASSERT(dataSource);
NSArray *frames = [dataSource children];
NSEnumerator *e = [frames objectEnumerator];
NSMutableArray *children = [NSMutableArray arrayWithCapacity:[frames count]];
IFWebFrame *frame;
while ((frame = [e nextObject])) {
- IFWebCoreBridge *aBridge = [frame _bridge];
- if (aBridge)
- [children addObject:aBridge];
+ IFWebCoreBridge *bridge = [frame _bridge];
+ if (bridge)
+ [children addObject:bridge];
}
return children;
}
@@ -123,6 +126,8 @@
withURL:(NSURL *)URL renderPart:(khtml::RenderPart *)renderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
{
+ WEBKIT_ASSERT(dataSource);
+
IFWebFrame *frame = [[self controller] createFrameNamed:frameName for:nil inParent:dataSource allowsScrolling:allowsScrolling];
if (frame == nil) {
return NO;
@@ -145,6 +150,7 @@
- (void)setTitle:(NSString *)title
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _setTitle:title];
}
@@ -160,6 +166,7 @@
- (KHTMLView *)widget
{
+ WEBKIT_ASSERT([self HTMLView]);
KHTMLView *widget = [[self HTMLView] _provisionalWidget];
if (widget) {
return widget;
@@ -181,11 +188,13 @@
- (void)addHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _addURLHandle:handle];
}
- (void)removeHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[dataSource _removeURLHandle:handle];
}
@@ -197,6 +206,7 @@
- (void)receivedProgressWithHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
forResourceHandle:handle fromDataSource:dataSource];
}
@@ -209,6 +219,7 @@
- (void)didCancelLoadingWithHandle:(IFURLHandle *)handle
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedProgress:[IFLoadProgress progress]
forResourceHandle:handle fromDataSource:dataSource];
[[self controller] _didStopLoading:[handle url]];
@@ -216,12 +227,14 @@
- (void)didFailBeforeLoadingWithError:(IFError *)error
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedError:error forResourceHandle:nil
partialProgress:nil fromDataSource:dataSource];
}
- (void)didFailToLoadWithHandle:(IFURLHandle *)handle error:(IFError *)error
{
+ WEBKIT_ASSERT(dataSource);
[[self controller] _receivedError:error forResourceHandle:handle
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
[[self controller] _didStopLoading:[handle url]];
@@ -229,6 +242,8 @@
- (void)didRedirectWithHandle:(IFURLHandle *)handle fromURL:(NSURL *)fromURL
{
+ WEBKIT_ASSERT(dataSource);
+
NSURL *toURL = [handle redirectedURL];
[[self controller] _didStopLoading:fromURL];
@@ -236,7 +251,7 @@
[dataSource _setFinalURL:toURL];
[self setURL:toURL];
- [[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
+ //[[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
[[self controller] _didStartLoading:toURL];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list