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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e11958d69456e27209f84237b4f0487b7f99f280
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 13:20:07 2010 +0000

    2010-09-06  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Dirk Schulze.
    
            [WML] Use RenderImageResource in WMLImageElement.cpp
            https://bugs.webkit.org/show_bug.cgi?id=44952
    
            The hasImage() and setCachedImage() were moved to RenderImageResource class.
            So, WML also should use the functions from RenderImageResource.
    
            * wml/WMLImageElement.cpp:
            (WebCore::WMLImageElement::attach):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66822 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a6f024..ad6d80a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-06  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Dirk Schulze.
+
+        [WML] Use RenderImageResource in WMLImageElement.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44952
+
+        The hasImage() and setCachedImage() were moved to RenderImageResource class. 
+        So, WML also should use the functions from RenderImageResource.
+
+        * wml/WMLImageElement.cpp:
+        (WebCore::WMLImageElement::attach):
+
 2010-08-26  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/wml/WMLImageElement.cpp b/WebCore/wml/WMLImageElement.cpp
index c4f6b06..5e15ccb 100644
--- a/WebCore/wml/WMLImageElement.cpp
+++ b/WebCore/wml/WMLImageElement.cpp
@@ -101,9 +101,10 @@ void WMLImageElement::attach()
 
     if (renderer() && renderer()->isImage() && m_imageLoader.haveFiredBeforeLoadEvent()) {
         RenderImage* imageObj = toRenderImage(renderer());
-        if (imageObj->hasImage())
+        RenderImageResource* renderImageResource = imageObj->imageResource();
+        if (renderImageResource->hasImage())
             return;
-        imageObj->setCachedImage(m_imageLoader.image());
+        renderImageResource->setCachedImage(m_imageLoader.image());
         
         // If we have no image at all because we have no src attribute, set
         // image height and width for the alt text instead.

-- 
WebKit Debian packaging