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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 14e63e73ba7f65b9d4558896970fea61b8cc221e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 6 23:42:34 2003 +0000

            * khtml/rendering/render_image.h:
            (khtml::RenderImage::isDisplayingError): forgot to remove the "virtual" part of the declaration
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a34ad1c..fd2ea99 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2003-11-06  Chris Blumenberg  <cblu at apple.com>
 
+        * khtml/rendering/render_image.h:
+        (khtml::RenderImage::isDisplayingError): forgot to remove the "virtual" part of the declaration
+
+2003-11-06  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed:
 	<rdar://problem/3275118>: Dragging from missing-image link stretches missing-image icon to size of missing image
 	<rdar://problem/3476225>: assert dragging non-existant images
diff --git a/WebCore/khtml/rendering/render_image.h b/WebCore/khtml/rendering/render_image.h
index ff8e0d6..954d51d 100644
--- a/WebCore/khtml/rendering/render_image.h
+++ b/WebCore/khtml/rendering/render_image.h
@@ -75,7 +75,7 @@ public:
     // Called to set generated content images (e.g., :before/:after generated images).
     void setContentObject(CachedObject* co);
     
-    virtual bool isDisplayingError() const { return berrorPic; }
+    bool isDisplayingError() const { return berrorPic; }
     
 private:
     bool isWidthSpecified() const;

-- 
WebKit Debian packaging