Changeset 19368 for S60/trunk/WebCore

Timestamp:

02/02/07 11:47:58 (2 years ago)

Author:

brmorris

Message:

bujtas, Reviewed by yongjun.

DESC: browser crashes on www.tays.fi. when multiple layers are referring to the same background image, the render_object does not do proper deref on the image.
fix: loop through the background layers and defer background images
http://bugs.webkit.org/show_bug.cgi?id=12543

Location:

S60/trunk/WebCore

Files:

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

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+bujtas, Reviewed by yongjun.
+        DESC: browser crashes on www.tays.fi. when multiple layers are referring to the same background image, the render_object does not do proper deref on the image.
+        fix: loop through the background layers and defer background images
+        http://bugs.webkit.org/show_bug.cgi?id=12543
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::arenaDelete):
+
 brmorris, Reviewed by zalan
  DESC: Updated def file

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

@@ -1862 +1862 @@
 void RenderObject::arenaDelete(RenderArena *arena, void *)
 {
-    if (m_style->backgroundImage())
-        m_style->backgroundImage()->deref(this);
+    for (const BackgroundLayer* layer = m_style->backgroundLayers(); layer; layer = layer->next())
+        if (layer->backgroundImage())
+            layer->backgroundImage()->deref(this);
+
     if (m_style)
         m_style->deref(arena);