[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:21:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 42e0c675edac61256af30fbeb71e459e9ad7def4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 24 23:21:21 2002 +0000
* WebView.subproj/IFWebFramePrivate.mm:
(-[IFWebFrame _transitionProvisionalToCommitted]): Take ownership before
doing the setWidget. The other way the widget was getting deleted.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 432b7bd..a244a4a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-24 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _transitionProvisionalToCommitted]): Take ownership before
+ doing the setWidget. The other way the widget was getting deleted.
+
2002-06-24 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPlugin.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 432b7bd..a244a4a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-24 Darin Adler <darin at apple.com>
+
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _transitionProvisionalToCommitted]): Take ownership before
+ doing the setWidget. The other way the widget was getting deleted.
+
2002-06-24 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPlugin.h:
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 56780c3..3aa4f91 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -231,8 +231,8 @@ static const char * const stateNames[6] = {
khtml::RenderPart *renderPartFrame = [self _renderFramePart];
if (renderPartFrame && isDocumentHTML) {
// Setting the widget will delete the previous KHTMLView associated with the frame.
- renderPartFrame->setWidget([documentView _widget]);
[documentView _takeOwnershipOfWidget];
+ renderPartFrame->setWidget([documentView _widget]);
}
// Now that the provisional data source is committed, release it.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 56780c3..3aa4f91 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -231,8 +231,8 @@ static const char * const stateNames[6] = {
khtml::RenderPart *renderPartFrame = [self _renderFramePart];
if (renderPartFrame && isDocumentHTML) {
// Setting the widget will delete the previous KHTMLView associated with the frame.
- renderPartFrame->setWidget([documentView _widget]);
[documentView _takeOwnershipOfWidget];
+ renderPartFrame->setWidget([documentView _widget]);
}
// Now that the provisional data source is committed, release it.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list