[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:29:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 72e0c92ce2360b823702e49e0459f035c3b1ae31
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 6 06:04:05 2002 +0000
WebCore:
Fixed crashers and leaks that come up when changing the view
associated with a part.
* khtml/khtmlview.cpp:
(KHTMLView::~KHTMLView): Don't zero out the part's view, because
that will mess up setting a new one.
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
Destroy the old view if we own it.
WebKit:
fixed 2974993 - window.open does not return the right window object
fixed 3017140 - WebKit creates a new KHTMLPart per page; should
reuse it like KHTML does
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation setDataSource:]): Don't swap the part at
this point. Now it gets reused.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1746 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1196166..e2b8c0d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed crashers and leaks that come up when changing the view
+ associated with a part.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::~KHTMLView): Don't zero out the part's view, because
+ that will mess up setting a new one.
+
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+ Destroy the old view if we own it.
+
2002-08-05 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPartImpl.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1196166..e2b8c0d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed crashers and leaks that come up when changing the view
+ associated with a part.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::~KHTMLView): Don't zero out the part's view, because
+ that will mess up setting a new one.
+
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+ Destroy the old view if we own it.
+
2002-08-05 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPartImpl.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1196166..e2b8c0d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Fixed crashers and leaks that come up when changing the view
+ associated with a part.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::~KHTMLView): Don't zero out the part's view, because
+ that will mess up setting a new one.
+
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+ Destroy the old view if we own it.
+
2002-08-05 Darin Adler <darin at apple.com>
* kwq/KWQKHTMLPartImpl.mm:
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index e1e39a5..0a1abc4 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -138,6 +138,7 @@
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
OTHER_LDFLAGS = "-seg1addr 0x02200000 -no-c++filt";
+ PREBINDING = NO;
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebCorePrefix.h;
PRODUCT_NAME = WebCore;
@@ -3639,8 +3640,8 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
- i386 = YES;
SKIP_INSTALL = YES;
+ i386 = YES;
};
isa = PBXBuildStyle;
name = DeploymentFat;
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 1903b80..43ae568 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -245,7 +245,6 @@ KHTMLView::~KHTMLView()
killTimer(d->repaintTimerId);
d->timerId = 0;
d->repaintTimerId = 0;
- m_part->impl->setView(0);
m_part->deref();
#endif
}
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 8abfc10..0ece8df 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -114,6 +114,12 @@ using namespace khtml;
width:(int)width height:(int)height
marginWidth:(int)mw marginHeight:(int)mh
{
+ // If we own the view, delete the old one - otherwise the render
+ // widget should take care of deleting the view
+ if (bridgeOwnsKHTMLView) {
+ delete part->impl->getView();
+ }
+
KHTMLView *kview = new KHTMLView(part, 0);
part->impl->setView(kview);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f19a533..2a95ed0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ fixed 2974993 - window.open does not return the right window object
+ fixed 3017140 - WebKit creates a new KHTMLPart per page; should
+ reuse it like KHTML does
+
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation setDataSource:]): Don't swap the part at
+ this point. Now it gets reused.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
* WebKit.pbproj/project.pbxproj: Fix tyops that broke Development
build.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f19a533..2a95ed0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
2002-08-05 Maciej Stachowiak <mjs at apple.com>
+ fixed 2974993 - window.open does not return the right window object
+ fixed 3017140 - WebKit creates a new KHTMLPart per page; should
+ reuse it like KHTML does
+
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation setDataSource:]): Don't swap the part at
+ this point. Now it gets reused.
+
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
* WebKit.pbproj/project.pbxproj: Fix tyops that broke Development
build.
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index cca17b5..a397feb 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -49,7 +49,6 @@
- (void)setDataSource:(WebDataSource *)dataSource
{
- [[dataSource webFrame] _changeBridge];
_private->bridge = [[dataSource webFrame] _bridge];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list