[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 2a0325452705aabc3e8d89517f22fd2d30b18462
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 05:39:24 2002 +0000

    	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.
    
            * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
    	Roll back the change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 302eedd..e8f040e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+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.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Roll back the change.
+
 2002-10-20  David Hyatt  <hyatt at apple.com>
 
 	Rewrite the clearing code for floats.  Rewrote the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 302eedd..e8f040e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+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.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Roll back the change.
+
 2002-10-20  David Hyatt  <hyatt at apple.com>
 
 	Rewrite the clearing code for floats.  Rewrote the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 302eedd..e8f040e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+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.
+
+        * khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+	Roll back the change.
+
 2002-10-20  David Hyatt  <hyatt at apple.com>
 
 	Rewrite the clearing code for floats.  Rewrote the
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 07a4244..d13ff20 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -360,6 +360,7 @@ 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);
@@ -368,12 +369,16 @@ 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