[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:59:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7ac7d657d9ff615faa1da6356b6166b696f6bcf3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 26 23:05:40 2002 +0000
i Try to ensure that display needed bits are correctly set.
Fixed leak of decoder. This caused us to leak the entire
document text for every load!
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@862 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a72f10c..38caf8f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-26 Richard Williamson <rjw at apple.com>
+
+ Fixed leak of decoder. This caused us to leak the entire
+ document text for every load!
+
+ * src/kwq/KWQKHTMLPart.mm:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a72f10c..38caf8f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-26 Richard Williamson <rjw at apple.com>
+
+ Fixed leak of decoder. This caused us to leak the entire
+ document text for every load!
+
+ * src/kwq/KWQKHTMLPart.mm:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a72f10c..38caf8f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-26 Richard Williamson <rjw at apple.com>
+
+ Fixed leak of decoder. This caused us to leak the entire
+ document text for every load!
+
+ * src/kwq/KWQKHTMLPart.mm:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 38ae8e3..a881b0b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -204,6 +204,8 @@ public:
~KHTMLPartPrivate()
{
delete m_settings;
+ if (m_decoder)
+ delete m_decoder;
}
};
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 38ae8e3..a881b0b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -204,6 +204,8 @@ public:
~KHTMLPartPrivate()
{
delete m_settings;
+ if (m_decoder)
+ delete m_decoder;
}
};
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 38ae8e3..a881b0b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -204,6 +204,8 @@ public:
~KHTMLPartPrivate()
{
delete m_settings;
+ if (m_decoder)
+ delete m_decoder;
}
};
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c9c84eb..17a29ce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-26 Richard Williamson <rjw at apple.com>
+
+ Try to ensure that display needed bits are correctly set.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
2002-03-26 Darin Adler <darin at apple.com>
* Misc.subproj/IFError.m: (+[IFError initialize]): Fix a typo where
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c9c84eb..17a29ce 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-26 Richard Williamson <rjw at apple.com>
+
+ Try to ensure that display needed bits are correctly set.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
2002-03-26 Darin Adler <darin at apple.com>
* Misc.subproj/IFError.m: (+[IFError initialize]): Fix a typo where
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 89fce86..7e77e20 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -228,19 +228,31 @@ char *stateNames[5] = {
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
if (![[self dataSource] isLoading]){
[self _setState: IFWEBFRAMESTATE_COMPLETE];
+ id mainView = [[[self controller] mainFrame] view];
+ id thisView = [self view];
WEBKIT_ASSERT ([self dataSource] != nil);
[[self dataSource] _part]->end();
- [[[[self controller] mainFrame] view] setNeedsLayout: YES];
- [[self view] setNeedsLayout: YES];
- [[self view] setNeedsDisplay: YES];
+ // May need to relayout each time a frame is completely
+ // loaded.
+ [mainView setNeedsLayout: YES];
+
+ // Layout this view (eventually).
+ [thisView setNeedsLayout: YES];
+
+ // Draw this view (eventually), and it's scroll view
+ // (eventually).
+ [thisView setNeedsDisplay: YES];
+ if ([thisView _frameScrollView])
+ [[thisView _frameScrollView] setNeedsDisplay: YES];
if ([[self controller] mainFrame] == self){
- [[[[self controller] mainFrame] view] layout];
- [[[[self controller] mainFrame] view] display];
+ [mainView layout];
+ [mainView display];
}
+
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 89fce86..7e77e20 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -228,19 +228,31 @@ char *stateNames[5] = {
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
if (![[self dataSource] isLoading]){
[self _setState: IFWEBFRAMESTATE_COMPLETE];
+ id mainView = [[[self controller] mainFrame] view];
+ id thisView = [self view];
WEBKIT_ASSERT ([self dataSource] != nil);
[[self dataSource] _part]->end();
- [[[[self controller] mainFrame] view] setNeedsLayout: YES];
- [[self view] setNeedsLayout: YES];
- [[self view] setNeedsDisplay: YES];
+ // May need to relayout each time a frame is completely
+ // loaded.
+ [mainView setNeedsLayout: YES];
+
+ // Layout this view (eventually).
+ [thisView setNeedsLayout: YES];
+
+ // Draw this view (eventually), and it's scroll view
+ // (eventually).
+ [thisView setNeedsDisplay: YES];
+ if ([thisView _frameScrollView])
+ [[thisView _frameScrollView] setNeedsDisplay: YES];
if ([[self controller] mainFrame] == self){
- [[[[self controller] mainFrame] view] layout];
- [[[[self controller] mainFrame] view] display];
+ [mainView layout];
+ [mainView display];
}
+
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list