[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:35:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 58589100d98ef195bd470ab5e4a393bde1ca2ddd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 8 03:36:52 2003 +0000
WebCore:
Fix for 3220988. Cancel frame load if it's detached before
finished loading.
Reviewed by Maciej.
* khtml/html/html_baseimpl.cpp:
(HTMLFrameElementImpl::detach):
* khtml/khtml_part.h:
* kwq/KWQKHTMLPart.mm:
(KHTMLPart::frameDetached):
* kwq/WebCoreBridge.h:
WebKit:
Fix for 3220988. Cancel frame load if it's detached before
finished loading.
Reviewed by Maciej.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge frameDetached]):
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _removeChild:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4040 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e8d1c1b..4c07807 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-04-07 Richard Williamson <rjw at apple.com>
+
+ Fix for 3220988. Cancel frame load if it's detached before
+ finished loading.
+
+ Reviewed by Maciej.
+
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLFrameElementImpl::detach):
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::frameDetached):
+ * kwq/WebCoreBridge.h:
+
2003-04-07 David Hyatt <hyatt at apple.com>
Fix for 3220395. nearestFloatBottom() mistakenly returned 0
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8d1c1b..4c07807 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-04-07 Richard Williamson <rjw at apple.com>
+
+ Fix for 3220988. Cancel frame load if it's detached before
+ finished loading.
+
+ Reviewed by Maciej.
+
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLFrameElementImpl::detach):
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::frameDetached):
+ * kwq/WebCoreBridge.h:
+
2003-04-07 David Hyatt <hyatt at apple.com>
Fix for 3220395. nearestFloatBottom() mistakenly returned 0
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index ea2b5b2..e9b0cd6 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -429,6 +429,8 @@ void HTMLFrameElementImpl::detach()
if (m_render) {
KHTMLView* w = getDocument()->view();
w->part()->decrementFrameCount();
+ KHTMLPart *framePart = w->part()->findFrame( name.string() );
+ framePart->frameDetached();
}
HTMLElementImpl::detach();
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 415cdc4..903b2e8 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1101,6 +1101,7 @@ public:
bool didOpenURL(const KURL &);
void setStatusBarText(const QString &);
void started(KIO::Job *);
+ void frameDetached();
#endif
int frameCount;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 45f86a3..6b75ad6 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -468,6 +468,11 @@ void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *
write(bytes, length);
}
+void KHTMLPart::frameDetached()
+{
+ [KWQ(this)->bridge() frameDetached];
+}
+
void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
{
[_bridge loadURL:url.url().getNSString()
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 0a334e1..0ce5695 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -220,6 +220,7 @@ enum FrameBorderStyle {
- (WebCoreBridge *)findFrameNamed:(NSString *)name;
/* Creates a name for an frame unnamed in the HTML. It should produce repeatable results for loads of the same frameset. */
- (NSString *)generateFrameName;
+- (void)frameDetached;
- (void)loadURL:(NSString *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bfe6e5f..f57b68c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-07 Richard Williamson <rjw at apple.com>
+
+ Fix for 3220988. Cancel frame load if it's detached before
+ finished loading.
+
+ Reviewed by Maciej.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge frameDetached]):
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _removeChild:]):
+
2003-04-07 Maciej Stachowiak <mjs at apple.com>
Reviewed by Richard.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 7c0ee1e..10351c9 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -877,4 +877,10 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
return [formDelegate(self) control:control textView:textView doCommandBySelector:commandSelector inFrame:frame];
}
+- (void)frameDetached
+{
+ [frame stopLoading];
+ [[frame parent] _removeChild:frame];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 054e156..244792b 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -61,7 +61,7 @@
- (void)loadRequest:(NSURLRequest *)request;
/*!
- @method loadData:baseURL:
+ @method loadData:encodingName:baseURL:
@param data The data to use for the main page of the document.
@param encodingName The encoding of the data.
@param URL The base URL to apply to relative URLs within the document.
@@ -69,7 +69,7 @@
- (void)loadData:(NSData *)data encodingName: (NSString *)encodingName baseURL:(NSURL *)URL;
/*!
- @method loadData:baseURL:
+ @method loadString:baseURL:
@param string The string to use for the main page of the document.
@param URL The base URL to apply to relative URLs within the document.
*/
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 7ee4de1..fbffc5d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -154,6 +154,7 @@ typedef enum {
- (void)_reloadAllowingStaleDataWithOverrideEncoding:(NSString *)encoding;
- (void)_addChild:(WebFrame *)child;
+- (void)_removeChild:(WebFrame *)child;
- (NSString *)_generateFrameName;
- (NSDictionary *)_actionInformationForNavigationType:(WebNavigationType)navigationType event:(NSEvent *)event originalURL:(NSURL *)URL;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f7527ad..d7ade3e 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1802,6 +1802,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[[child dataSource] _setOverrideEncoding:[[self dataSource] _overrideEncoding]];
}
+- (void)_removeChild:(WebFrame *)child
+{
+ [_private->children removeObject: child];
+}
+
- (void)_addFramePathToString:(NSMutableString *)path
{
if ([_private->name hasPrefix:@"<!--framePath "]) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list