Changeset 19637 in webkit

Timestamp:

Feb 14, 2007 9:51:11 PM (17 years ago)

Author:

bdash

Message:

2007-02-14 Mitz Pettel <​mitz@webkit.org>

Reviewed by Sam Weinig!

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12773 REGRESSION (r19490): Crash on ipx-server.de

• manual-tests/background-image-change-in-page-cache.html: Added.
• rendering/RenderBox.cpp: (WebCore::RenderBox::imageChanged): Bail out if the object is not in a view, which can happen if the document is in the page cache and the same cached image used for its background is also being used in another document that is currently in view.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/background-image-change-in-page-cache.html (added)
• rendering/RenderBox.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-14  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Sam Weinig!
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12773
+          REGRESSION (r19490): Crash on ipx-server.de
+
+        * manual-tests/background-image-change-in-page-cache.html: Added.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::imageChanged): Bail out if the object is not in a view,
+        which can happen if the document is in the page cache and the same cached
+        image used for its background is also being used in another document that
+        is currently in view.
+
 2007-02-14  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -428 +428 @@
 void RenderBox::imageChanged(CachedImage* image)
 {
-    if (!image || !image->canRender() || !parent())
+    if (!image || !image->canRender() || !parent() || !view())
         return;
 
@@ -440 +440 @@
     RenderBox* backgroundRenderer;
 
-    if (view() && (isBody() || isRoot())) {
+    if (isBody() || isRoot()) {
         // Our background propagates to the root.
         backgroundRenderer = view();