[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1257cf2d3cfe4b32fa2baf97aa0bfc521b60dac3
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 06:56:27 2010 +0000

    2010-08-27  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            REGRESSION: some tests no longer painting
            https://bugs.webkit.org/show_bug.cgi?id=44773
    
            Fix regression from the RenderImageResource introduction, fast/canvas/canvas-as-image.html
            and fast/canvas/canvas-as-image-incremental-repaint.html pixel tests did not work anymore.
    
            * rendering/RenderImageResource.h:
            (WebCore::RenderImageResource::hasImage): Make hasImage virtual.
            * rendering/RenderImageResourceStyleImage.h:
            (WebCore::RenderImageResourceStyleImage::hasImage): Always return true, just like RenderImageGeneratedContent did.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66299 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 687146c..11b2e85 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-27  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        REGRESSION: some tests no longer painting
+        https://bugs.webkit.org/show_bug.cgi?id=44773
+
+        Fix regression from the RenderImageResource introduction, fast/canvas/canvas-as-image.html
+        and fast/canvas/canvas-as-image-incremental-repaint.html pixel tests did not work anymore.
+
+        * rendering/RenderImageResource.h:
+        (WebCore::RenderImageResource::hasImage): Make hasImage virtual.
+        * rendering/RenderImageResourceStyleImage.h:
+        (WebCore::RenderImageResourceStyleImage::hasImage): Always return true, just like RenderImageGeneratedContent did.
+
 2010-08-27  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/rendering/RenderImageResource.h b/WebCore/rendering/RenderImageResource.h
index bdd49a0..2346712 100644
--- a/WebCore/rendering/RenderImageResource.h
+++ b/WebCore/rendering/RenderImageResource.h
@@ -49,7 +49,7 @@ public:
 
     void setCachedImage(CachedImage*);
     CachedImage* cachedImage() const { return m_cachedImage.get(); }
-    bool hasImage() const { return m_cachedImage; }
+    virtual bool hasImage() const { return m_cachedImage; }
 
     void resetAnimation();
 
diff --git a/WebCore/rendering/RenderImageResourceStyleImage.h b/WebCore/rendering/RenderImageResourceStyleImage.h
index 0281304..d91aaa8 100644
--- a/WebCore/rendering/RenderImageResourceStyleImage.h
+++ b/WebCore/rendering/RenderImageResourceStyleImage.h
@@ -45,6 +45,7 @@ public:
     virtual void initialize(RenderObject*);
     virtual void shutdown();
 
+    virtual bool hasImage() const { return true; }
     virtual Image* image(int width = 0, int height = 0) { return m_styleImage->image(m_renderer, IntSize(width, height)); }
     virtual bool errorOccurred() const { return m_styleImage->errorOccurred(); }
 

-- 
WebKit Debian packaging