[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 83e15c8f6fc9cfef2c2755e4417f6bc4105dac0e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 00:41:34 2002 +0000

    	- fixed 3007961 -- Crash in DOM::HTMLImageElementImpl::parseAttribute
    
            * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
    	Be sure to call ref on the new image before calling deref on the old
    	image. That's because deref on the old image causes a cache flush,
    	which might cause the image to go away in certain cases.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c86428e..96d08af 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3007961 -- Crash in DOM::HTMLImageElementImpl::parseAttribute
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Be sure to call ref on the new image before calling deref on the old
+	image. That's because deref on the old image causes a cache flush,
+	which might cause the image to go away in certain cases.
+
 2002-10-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed possible build failure.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c86428e..96d08af 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3007961 -- Crash in DOM::HTMLImageElementImpl::parseAttribute
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Be sure to call ref on the new image before calling deref on the old
+	image. That's because deref on the old image causes a cache flush,
+	which might cause the image to go away in certain cases.
+
 2002-10-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed possible build failure.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c86428e..96d08af 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-10-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3007961 -- Crash in DOM::HTMLImageElementImpl::parseAttribute
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Be sure to call ref on the new image before calling deref on the old
+	image. That's because deref on the old image causes a cache flush,
+	which might cause the image to go away in certain cases.
+
 2002-10-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed possible build failure.
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index d13ff20..07a4244 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -360,7 +360,6 @@ bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
 
 void RenderImage::updateFromElement()
 {
-#ifdef APPLE_CHANGES
     // Treat a lack of src or empty string for src as no image at all, not the page itself
     // loaded as an image.
     DOMString attr = element()->getAttribute(ATTR_SRC);
@@ -369,16 +368,12 @@ void RenderImage::updateFromElement()
         new_image = NULL;
     else
         new_image = element()->getDocument()->docLoader()->requestImage(khtml::parseURL(attr));
-#else
-    CachedImage *new_image = element()->getDocument()->docLoader()->
-                             requestImage(khtml::parseURL(element()->getAttribute(ATTR_SRC)));
-#endif
 
     if(new_image && new_image != image && (!style() || !style()->contentObject())) {
         loadEventSent = false;
+        new_image->ref(this);
         if(image) image->deref(this);
         image = new_image;
-        image->ref(this);
         berrorPic = image->isErrorImage();
     }
 

-- 
WebKit Debian packaging