git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2228884)
Fix a mistake in render_box.cpp.
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Apr 2005 10:51:49 +0000 (10:51 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Apr 2005 10:51:49 +0000 (10:51 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/khtml/rendering/render_box.cpp patch | blob | history

diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index dc4aef3f98e896dd9310fa2634bf7601a35441f3..a2fa0b4f2cf0a83e68aeee91c71a95742e376585 100644 (file)
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -99,8 +99,7 @@ void RenderBox::setStyle(RenderStyle *_style)
     // FIXME: Note that we restrict overflow to blocks for now.  One day table bodies and cells 
     // will need to support overflow.
     // We also handle <body> and <html>, whose overflow applies to the viewport.
-    if (_style->overflow() != OVISIBLE && isBlockFlow() && !isTableCell() && !isRoot() &&
-        (!isBody() || !document()->isHTMLDocument() || !(parent() && parent()->style()->overflow() == OVISIBLE)))
+    if (_style->overflow() != OVISIBLE && isBlockFlow() && !isTableCell() && !isRoot() && (!isBody() || !document()->isHTMLDocument()))
         setHasOverflowClip();
 
     if (requiresLayer()) {
Mirror of the WebKit open source project from svn.webkit.org.