diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/html/HTMLVideoElement.cpp | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/html/HTMLVideoElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLVideoElement.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/html/HTMLVideoElement.cpp b/WebCore/html/HTMLVideoElement.cpp index a6fdb5f..bfdf241 100644 --- a/WebCore/html/HTMLVideoElement.cpp +++ b/WebCore/html/HTMLVideoElement.cpp @@ -101,7 +101,6 @@ void HTMLVideoElement::parseMappedAttribute(Attribute* attr) const QualifiedName& attrName = attr->name(); if (attrName == posterAttr) { - m_posterURL = getNonEmptyURLAttribute(posterAttr); updatePosterImage(); if (m_shouldDisplayPosterImage) { #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO) @@ -110,7 +109,7 @@ void HTMLVideoElement::parseMappedAttribute(Attribute* attr) m_imageLoader->updateFromElementIgnoringPreviousError(); #else if (player()) - player()->setPoster(poster()); + player()->setPoster(getNonEmptyURLAttribute(posterAttr)); #endif } } else if (attrName == widthAttr) @@ -179,7 +178,7 @@ void HTMLVideoElement::updatePosterImage() bool oldShouldShowPosterImage = m_shouldDisplayPosterImage; #endif - m_shouldDisplayPosterImage = !poster().isEmpty() && !hasAvailableVideoFrame(); + m_shouldDisplayPosterImage = !getAttribute(posterAttr).isEmpty() && !hasAvailableVideoFrame(); #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO) if (renderer() && oldShouldShowPosterImage != m_shouldDisplayPosterImage) |