[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 2ab9a0d2d3fc59be95b94e844253ff097bb5aa7f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 06:03:30 2002 +0000

    	Redid my fix. It was just an ordering thing. The image had to already be
    	installed as the current image before calling ref(), because in the cached
    	case, you get the loading complete callback right then.
    
            * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
    	Call deref on the old image later. Basically, instead of moving the ref
    	of the new image up, I moved the deref of the old image down.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e8f040e..f5ecccd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	Redid my fix. It was just an ordering thing. The image had to already be
+	installed as the current image before calling ref(), because in the cached
+	case, you get the loading complete callback right then.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Call deref on the old image later. Basically, instead of moving the ref
+	of the new image up, I moved the deref of the old image down.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	Roll out my render_image.cpp change. It was causing a big problem
 	getting images from the cache. I need to study further to figure out why.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e8f040e..f5ecccd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	Redid my fix. It was just an ordering thing. The image had to already be
+	installed as the current image before calling ref(), because in the cached
+	case, you get the loading complete callback right then.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Call deref on the old image later. Basically, instead of moving the ref
+	of the new image up, I moved the deref of the old image down.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	Roll out my render_image.cpp change. It was causing a big problem
 	getting images from the cache. I need to study further to figure out why.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8f040e..f5ecccd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	Redid my fix. It was just an ordering thing. The image had to already be
+	installed as the current image before calling ref(), because in the cached
+	case, you get the loading complete callback right then.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Call deref on the old image later. Basically, instead of moving the ref
+	of the new image up, I moved the deref of the old image down.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	Roll out my render_image.cpp change. It was causing a big problem
 	getting images from the cache. I need to study further to figure out why.
 
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index d13ff20..0af1fc4 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -376,10 +376,11 @@ void RenderImage::updateFromElement()
 
     if(new_image && new_image != image && (!style() || !style()->contentObject())) {
         loadEventSent = false;
-        if(image) image->deref(this);
+        CachedImage *old_image = image;
         image = new_image;
         image->ref(this);
         berrorPic = image->isErrorImage();
+        if (old_image) old_image->deref(this);
     }
 
     if (element()->id() == ID_INPUT)

-- 
WebKit Debian packaging