2006-10-01 Mitz Pettel <opendarwin.org@mitzpettel.com>

        Reviewed by Darin.

        Fix for http://bugs.webkit.org/show_bug.cgi?id=10190
        REGRESSION: Repro crash when navigating away from an image document that hasn't finished loading

        No test case added (probably requires new DumpRenderTree functionality)

        * rendering/RenderImage.cpp:
        (WebCore::RenderImage::imageChanged): Added early return if the document is
        being destroyed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c12c0c8a43cdc6c9b456b03ad9c0330d56b7b03f..ef848217fe074763ee74a05cb433ba3b47d48bf6 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,7 +2,7 @@
 
         Reviewed by Hyatt.
         
-        Test for http://bugzilla.opendarwin.org/show_bug.cgi?id=10842
+        Test for http://bugs.webkit.org/show_bug.cgi?id=10842
         REGRESSION (r15418): contenteditable div truncates rightmost Japanese character
 
         * fast/text/line-breaks-after-white-space-expected.checksum: Added.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3ae16d37b7c42c12c1e6c5cfcff482f48f84e134..78e2f841ca3a1eb58a030d84fd518262f26076a1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,8 +1,21 @@
+2006-10-01  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Darin.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=10190
+        REGRESSION: Repro crash when navigating away from an image document that hasn't finished loading
+
+        No test case added (probably requires new DumpRenderTree functionality)
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageChanged): Added early return if the document is
+        being destroyed.
+
 2006-10-01  Graham Dennis  <graham.dennis@gmail.com>
 
         Reviewed by Hyatt.
 
-        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=10842
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=10842
         REGRESSION (r15418): contenteditable div truncates rightmost Japanese character
         
         Make sure we only break after a space (and not any other valid line-break) if

diff --git a/WebCore/rendering/RenderImage.cpp b/WebCore/rendering/RenderImage.cpp
index 4a77450613e359177f95b22a6c20a62fc1579255..cbdb418744f171259b8fa9557aa348ef45bd2dfc 100644 (file)
--- a/WebCore/rendering/RenderImage.cpp
+++ b/WebCore/rendering/RenderImage.cpp
@@ -96,6 +96,9 @@ void RenderImage::setCachedImage(CachedImage* newImage)
 
 void RenderImage::imageChanged(CachedImage* o)
 {
+    if (documentBeingDestroyed())
+        return;
+
     if (o != m_cachedImage) {
         RenderReplaced::imageChanged(o);
         return;