[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 05:55:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c5e3966b42d354e74ef2e910f6a3fa0bda19125d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 7 02:00:52 2002 +0000
Fixed allocation problems.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@597 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c1dbdb0..06dc3d2 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-02-06 Richard Williamson <rjw at apple.com>
+
+ Fixed allocation problems.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame):
+
2002-02-05 Richard Williamson <rjw at apple.com>
Updated part to use 'official' controller APIs.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c1dbdb0..06dc3d2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-02-06 Richard Williamson <rjw at apple.com>
+
+ Fixed allocation problems.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame):
+
2002-02-05 Richard Williamson <rjw at apple.com>
Updated part to use 'official' controller APIs.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c1dbdb0..06dc3d2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-02-06 Richard Williamson <rjw at apple.com>
+
+ Fixed allocation problems.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame):
+
2002-02-05 Richard Williamson <rjw at apple.com>
Updated part to use 'official' controller APIs.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 6135e95..6ac3163 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -80,6 +80,7 @@
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
+- (void)_setParent: (IFWebDataSource *)p;
@end
// This should not be allowed here. data source should not reference view
@@ -91,6 +92,9 @@
@interface IFWebFrame: NSObject
- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
+- (IFWebDataSource *)dataSource;
+- (void)_setRenderFramePart: (void *)p;
+- (void *)_renderFramePart;
@end
@@ -1297,8 +1301,18 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
dataSource = getDataSource();
frame = [dataSource frame];
controller = [dataSource controller];
+
+ // FIXME: Factor this into a function.
if ([controller locationWillChangeTo: url forFrame: frame]){
[controller changeLocationTo: url forFrame: frame];
+
+ // This introduces a nasty dependency on the view.
+ khtml::RenderPart *renderPartFrame = [frame _renderFramePart];
+ if (renderPartFrame)
+ renderPartFrame->setWidget ([[frame view] _widget]);
+
+ [[frame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: frame];
}
@@ -1568,6 +1582,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
dataSource = getDataSource();
controller = [dataSource controller];
newFrame = [controller createFrameNamed: nsframeName for: nil inParent: dataSource];
+ [newFrame _setRenderFramePart: frame];
if ([controller locationWillChangeTo: childURL forFrame: newFrame]){
@@ -1576,6 +1591,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
// This introduces a nasty dependency on the view.
frame->setWidget ([[newFrame view] _widget]);
+ [[newFrame dataSource] _setParent: dataSource];
+
+ [[newFrame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: newFrame];
}
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 6135e95..6ac3163 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -80,6 +80,7 @@
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
+- (void)_setParent: (IFWebDataSource *)p;
@end
// This should not be allowed here. data source should not reference view
@@ -91,6 +92,9 @@
@interface IFWebFrame: NSObject
- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
+- (IFWebDataSource *)dataSource;
+- (void)_setRenderFramePart: (void *)p;
+- (void *)_renderFramePart;
@end
@@ -1297,8 +1301,18 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
dataSource = getDataSource();
frame = [dataSource frame];
controller = [dataSource controller];
+
+ // FIXME: Factor this into a function.
if ([controller locationWillChangeTo: url forFrame: frame]){
[controller changeLocationTo: url forFrame: frame];
+
+ // This introduces a nasty dependency on the view.
+ khtml::RenderPart *renderPartFrame = [frame _renderFramePart];
+ if (renderPartFrame)
+ renderPartFrame->setWidget ([[frame view] _widget]);
+
+ [[frame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: frame];
}
@@ -1568,6 +1582,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
dataSource = getDataSource();
controller = [dataSource controller];
newFrame = [controller createFrameNamed: nsframeName for: nil inParent: dataSource];
+ [newFrame _setRenderFramePart: frame];
if ([controller locationWillChangeTo: childURL forFrame: newFrame]){
@@ -1576,6 +1591,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
// This introduces a nasty dependency on the view.
frame->setWidget ([[newFrame view] _widget]);
+ [[newFrame dataSource] _setParent: dataSource];
+
+ [[newFrame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: newFrame];
}
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 6135e95..6ac3163 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -80,6 +80,7 @@
- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
+- (void)_setParent: (IFWebDataSource *)p;
@end
// This should not be allowed here. data source should not reference view
@@ -91,6 +92,9 @@
@interface IFWebFrame: NSObject
- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
+- (IFWebDataSource *)dataSource;
+- (void)_setRenderFramePart: (void *)p;
+- (void *)_renderFramePart;
@end
@@ -1297,8 +1301,18 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
dataSource = getDataSource();
frame = [dataSource frame];
controller = [dataSource controller];
+
+ // FIXME: Factor this into a function.
if ([controller locationWillChangeTo: url forFrame: frame]){
[controller changeLocationTo: url forFrame: frame];
+
+ // This introduces a nasty dependency on the view.
+ khtml::RenderPart *renderPartFrame = [frame _renderFramePart];
+ if (renderPartFrame)
+ renderPartFrame->setWidget ([[frame view] _widget]);
+
+ [[frame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: frame];
}
@@ -1568,6 +1582,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
dataSource = getDataSource();
controller = [dataSource controller];
newFrame = [controller createFrameNamed: nsframeName for: nil inParent: dataSource];
+ [newFrame _setRenderFramePart: frame];
if ([controller locationWillChangeTo: childURL forFrame: newFrame]){
@@ -1576,6 +1591,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
// This introduces a nasty dependency on the view.
frame->setWidget ([[newFrame view] _widget]);
+ [[newFrame dataSource] _setParent: dataSource];
+
+ [[newFrame dataSource] startLoading: YES];
+
[controller locationChangeStartedForFrame: newFrame];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list