[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 6ab3d83ded002bb3708c74be7b729119dcf39e4b
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 1 22:20:58 2010 +0000

    2010-02-01  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=34448
            <rdar://problem/7598130>
    
            RenderVideo::intrinsicSizeChanged infinite recursion
    
            * rendering/RenderImage.h:
            (WebCore::RenderImage::intrinsicSizeChanged): Make protected instead of private so it can
                be called by RenderVideo.
            * rendering/RenderVideo.cpp:
            (WebCore::RenderVideo::intrinsicSizeChanged): Call RenderMedia::intrinsicSizeChanged, not
                RenderVideo::intrinsicSizeChanged.
            (WebCore::RenderVideo::imageChanged): Call RenderMedia::imageChanged instead of
                RenderImage::imageChanged.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2888743..34eacf7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-01  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34448
+        <rdar://problem/7598130>
+
+        RenderVideo::intrinsicSizeChanged infinite recursion
+
+        * rendering/RenderImage.h:
+        (WebCore::RenderImage::intrinsicSizeChanged): Make protected instead of private so it can
+            be called by RenderVideo.
+        * rendering/RenderVideo.cpp:
+        (WebCore::RenderVideo::intrinsicSizeChanged): Call RenderMedia::intrinsicSizeChanged, not
+            RenderVideo::intrinsicSizeChanged.
+        (WebCore::RenderVideo::imageChanged): Call RenderMedia::imageChanged instead of 
+            RenderImage::imageChanged.
+
 2010-02-01  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/rendering/RenderImage.h b/WebCore/rendering/RenderImage.h
index bc5e2d8..b89a652 100644
--- a/WebCore/rendering/RenderImage.h
+++ b/WebCore/rendering/RenderImage.h
@@ -64,6 +64,8 @@ protected:
     bool isWidthSpecified() const;
     bool isHeightSpecified() const;
 
+    virtual void intrinsicSizeChanged() { imageChanged(imagePtr()); }
+
 private:
     virtual const char* renderName() const { return "RenderImage"; }
 
@@ -89,8 +91,6 @@ private:
     virtual IntSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSize(multiplier) : IntSize(); }
     virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
 
-    virtual void intrinsicSizeChanged() { imageChanged(imagePtr()); }
-
     int calcAspectRatioWidth() const;
     int calcAspectRatioHeight() const;
 
diff --git a/WebCore/rendering/RenderVideo.cpp b/WebCore/rendering/RenderVideo.cpp
index d2a9620..813f2ef 100644
--- a/WebCore/rendering/RenderVideo.cpp
+++ b/WebCore/rendering/RenderVideo.cpp
@@ -85,7 +85,7 @@ RenderVideo::~RenderVideo()
 void RenderVideo::intrinsicSizeChanged()
 {
     if (videoElement()->shouldDisplayPosterImage())
-        RenderVideo::intrinsicSizeChanged();
+        RenderMedia::intrinsicSizeChanged();
     videoSizeChanged(); 
 }
 
@@ -104,7 +104,7 @@ void RenderVideo::videoSizeChanged()
 
 void RenderVideo::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
 {
-    RenderImage::imageChanged(newImage, rect);
+    RenderMedia::imageChanged(newImage, rect);
 
     // Cache the image intrinsic size so we can continue to use it to draw the image correctly
     // even after we know the video intrisic size but aren't able to draw video frames yet

-- 
WebKit Debian packaging