Changeset 18949 in webkit

Timestamp:

Jan 18, 2007 1:01:23 PM (17 years ago)

Author:

brmorris

Message:

2007-01-17 w3liu <​wei.liu@nokia.com>

Reviewed by ​yongjun.zhang@nokia.com.
DESC: [S60] TSW ID: PNIO-6X4H9N: S60 A3.1 wk50_004: www.lookcyclesusa.com crashes browser
​http://bugs.webkit.org/show_bug.cgi?id=12304

• khtml/rendering/render_box.cpp: (RenderBox::paintBoxDecorations):

Location:

S60/trunk/WebCore

Files:

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

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-17  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by yongjun.zhang@nokia.com.
+        DESC: [S60] TSW ID: PNIO-6X4H9N: S60 A3.1 wk50_004: www.lookcyclesusa.com crashes browser
+        http://bugs.webkit.org/show_bug.cgi?id=12304
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBoxDecorations):
+
 2007-01-14  sareen  <shyam.sareen@nokia.com>
 

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

@@ -341 +341 @@
     // independent of the body.  Go through the DOM to get to the root element's render object,
     // since the root could be inline and wrapped in an anonymous block.
-    if (!isBody() || !document()->isHTMLDocument() || document()->documentElement()->renderer()->style()->hasBackground())
+    if (!isBody() || !document()->isHTMLDocument() || 
+        ( document()->documentElement()->renderer() && 
+          document()->documentElement()->renderer()->style()->hasBackground() ) )
         paintBackgrounds(i.p, style()->backgroundColor(), style()->backgroundLayers(), my, mh, _tx, _ty, w, h);