[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 4649b542a865887312d9f36622f27a3c3a4800b8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 30 00:04:12 2002 +0000

            * src/kdelibs/khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
            Make images with no src, or src="" be empty rather than being the page itself
            loaded as an image.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b75e7cf..02f91af 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+        Make images with no src, or src="" be empty rather than being the page itself
+        loaded as an image.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         More fixes for cancelling.  Fixed some code that appears to have been
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b75e7cf..02f91af 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+        Make images with no src, or src="" be empty rather than being the page itself
+        loaded as an image.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         More fixes for cancelling.  Fixed some code that appears to have been
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b75e7cf..02f91af 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/rendering/render_image.cpp: (RenderImage::updateFromElement):
+        Make images with no src, or src="" be empty rather than being the page itself
+        loaded as an image.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         More fixes for cancelling.  Fixed some code that appears to have been
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index d763173..bc0e785 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -345,8 +345,19 @@ bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
 void RenderImage::updateFromElement()
 {
     assert(element());
+#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);
+    CachedImage *new_image;
+    if (attr.isEmpty())
+        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) {
         loadEventSent = false;
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_image.cpp b/WebCore/src/kdelibs/khtml/rendering/render_image.cpp
index d763173..bc0e785 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_image.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_image.cpp
@@ -345,8 +345,19 @@ bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
 void RenderImage::updateFromElement()
 {
     assert(element());
+#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);
+    CachedImage *new_image;
+    if (attr.isEmpty())
+        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) {
         loadEventSent = false;

-- 
WebKit Debian packaging