[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:58:46 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 62fdd60aca18b3ef0ea298de804e3ef42465e6ab
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 26 02:52:01 2002 +0000
Removed conditional check that prevent layout of iframes. I don't
understand why the check was being done.
Tweaks to force layout of frames and iframes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5ad6893..9d8aeb9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-25 Richard Williamson <rjw at apple.com>
+
+ Removed conditional check that prevent layout of iframes. I don't
+ understand why the check was being done.
+
+ * src/kdelibs/khtml/rendering/render_flow.cpp: (RenderFlow::layout):
+
2002-03-25 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5ad6893..9d8aeb9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-25 Richard Williamson <rjw at apple.com>
+
+ Removed conditional check that prevent layout of iframes. I don't
+ understand why the check was being done.
+
+ * src/kdelibs/khtml/rendering/render_flow.cpp: (RenderFlow::layout):
+
2002-03-25 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5ad6893..9d8aeb9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-25 Richard Williamson <rjw at apple.com>
+
+ Removed conditional check that prevent layout of iframes. I don't
+ understand why the check was being done.
+
+ * src/kdelibs/khtml/rendering/render_flow.cpp: (RenderFlow::layout):
+
2002-03-25 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 6483302..b606775 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -413,7 +413,7 @@ void KHTMLView::layout()
if (document->isHTMLDocument()) {
NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
- if(body && body->renderer() && body->id() == ID_FRAMESET) {
+ if(body && body->renderer() && body->id() == ID_FRAMESET) {
QScrollView::setVScrollBarMode(AlwaysOff);
QScrollView::setHScrollBarMode(AlwaysOff);
body->renderer()->setLayouted(false);
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index b78d5ed..9b136d2 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -265,7 +265,9 @@ void RenderFlow::layout()
// kdDebug( 6040 ) << "childrenInline()=" << childrenInline() << endl;
if(childrenInline()) {
// ### make bidi resumeable so that we can get rid of this ugly hack
+#ifndef APPLE_CHANGES
if (!m_blockBidi)
+#endif
layoutInlineChildren();
}
else
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.cpp b/WebCore/src/kdelibs/khtml/khtmlview.cpp
index 6483302..b606775 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.cpp
+++ b/WebCore/src/kdelibs/khtml/khtmlview.cpp
@@ -413,7 +413,7 @@ void KHTMLView::layout()
if (document->isHTMLDocument()) {
NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
- if(body && body->renderer() && body->id() == ID_FRAMESET) {
+ if(body && body->renderer() && body->id() == ID_FRAMESET) {
QScrollView::setVScrollBarMode(AlwaysOff);
QScrollView::setHScrollBarMode(AlwaysOff);
body->renderer()->setLayouted(false);
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_flow.cpp b/WebCore/src/kdelibs/khtml/rendering/render_flow.cpp
index b78d5ed..9b136d2 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_flow.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_flow.cpp
@@ -265,7 +265,9 @@ void RenderFlow::layout()
// kdDebug( 6040 ) << "childrenInline()=" << childrenInline() << endl;
if(childrenInline()) {
// ### make bidi resumeable so that we can get rid of this ugly hack
+#ifndef APPLE_CHANGES
if (!m_blockBidi)
+#endif
layoutInlineChildren();
}
else
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7e91811..b84d719 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-25 Richard Williamson <rjw at apple.com>
+
+ Tweaks to force layout of frames and iframes.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
2002-03-25 Maciej Stachowiak <mjs at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7e91811..b84d719 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-25 Richard Williamson <rjw at apple.com>
+
+ Tweaks to force layout of frames and iframes.
+
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
2002-03-25 Maciej Stachowiak <mjs at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 464642c..89fce86 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -233,11 +233,14 @@ char *stateNames[5] = {
[[self dataSource] _part]->end();
- //if ([[self controller] mainFrame] == self){
- [[self view] setNeedsLayout: YES];
- [[self view] layout];
- [[self view] display];
- //}
+ [[[[self controller] mainFrame] view] setNeedsLayout: YES];
+ [[self view] setNeedsLayout: YES];
+ [[self view] setNeedsDisplay: YES];
+
+ if ([[self controller] mainFrame] == self){
+ [[[[self controller] mainFrame] view] layout];
+ [[[[self controller] mainFrame] view] display];
+ }
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 464642c..89fce86 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -233,11 +233,14 @@ char *stateNames[5] = {
[[self dataSource] _part]->end();
- //if ([[self controller] mainFrame] == self){
- [[self view] setNeedsLayout: YES];
- [[self view] layout];
- [[self view] display];
- //}
+ [[[[self controller] mainFrame] view] setNeedsLayout: YES];
+ [[self view] setNeedsLayout: YES];
+ [[self view] setNeedsDisplay: YES];
+
+ if ([[self controller] mainFrame] == self){
+ [[[[self controller] mainFrame] view] layout];
+ [[[[self controller] mainFrame] view] display];
+ }
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list