summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLVideoElement.cpp
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-09-08 12:18:00 +0100
committerKristian Monsen <kristianm@google.com>2010-09-11 12:08:58 +0100
commit5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch)
tree775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/html/HTMLVideoElement.cpp
parent3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff)
downloadexternal_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip
external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz
external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/html/HTMLVideoElement.cpp')
-rw-r--r--WebCore/html/HTMLVideoElement.cpp8
1 files changed, 3 insertions, 5 deletions
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)