Changeset 20870 for S60/trunk/WebCore

Timestamp:

04/13/07 05:59:03 (21 months ago)

Author:

zbujtas

Message:

anapatil <anand.1.patil@nokia.com>

Reviewed by zbujtas@gmail.com
DESC: Fix for : Browser - extra content seen when browsing www.kartta.ouka.fi

http://bugs.webkit.org/show_bug.cgi?id=13308
TSW ID : MRAA-6X4FVQ

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/rendering/render_frames.cpp:

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/rendering/render_frames.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+anapatil <anand.1.patil@nokia.com>
+
+        Reviewed by zbujtas@gmail.com
+        DESC: Fix for : Browser - extra content seen when browsing www.kartta.ouka.fi 
+         http://bugs.webkit.org/show_bug.cgi?id=13308
+         TSW ID : MRAA-6X4FVQ
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/rendering/render_frames.cpp:
+
 w3liu, reviewed by <yongjun.zhang@nokia.com>
  DESC: [S60]  LXUU-6Z4HBB: GCF-AE-Browsing-S60-SPPR50.31: Fail in GCF test case: 45.15.30 Encoding Priority 1

S60/trunk/WebCore/khtml/rendering/render_frames.cpp

@@ -428 +428 @@
       child->layout();
 
-      if (highest<child->height())
+      if (highest<child->height() && m_gridLayout[0][r] > 0)
         highest = child->height();