From 5ddde30071f639962dd557c453f2ad01f8f0fd00 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 8 Sep 2010 12:18:00 +0100 Subject: Merge WebKit at r66666 : Initial merge by git. Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f --- WebCore/html/HTMLVideoElement.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'WebCore/html/HTMLVideoElement.cpp') diff --git a/WebCore/html/HTMLVideoElement.cpp b/WebCore/html/HTMLVideoElement.cpp index cd9c7ec..219bb85 100644 --- a/WebCore/html/HTMLVideoElement.cpp +++ b/WebCore/html/HTMLVideoElement.cpp @@ -78,10 +78,8 @@ void HTMLVideoElement::attach() if (!m_imageLoader) m_imageLoader = adoptPtr(new HTMLImageLoader(this)); m_imageLoader->updateFromElement(); - if (renderer()) { - RenderImage* imageRenderer = toRenderImage(renderer()); - imageRenderer->setCachedImage(m_imageLoader->image()); - } + if (renderer()) + toRenderImage(renderer())->imageResource()->setCachedImage(m_imageLoader->image()); } #endif } @@ -111,7 +109,7 @@ void HTMLVideoElement::parseMappedAttribute(Attribute* attr) if (m_imageLoader) m_imageLoader.clear(); if (renderer()) - toRenderImage(renderer())->setCachedImage(0); + toRenderImage(renderer())->imageResource()->setCachedImage(0); } #endif } else if (attrName == widthAttr) -- cgit v1.1