diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/html/HTMLVideoElement.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/html/HTMLVideoElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLVideoElement.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/html/HTMLVideoElement.cpp b/WebCore/html/HTMLVideoElement.cpp index 0389b54..9fd1a09 100644 --- a/WebCore/html/HTMLVideoElement.cpp +++ b/WebCore/html/HTMLVideoElement.cpp @@ -54,7 +54,7 @@ inline HTMLVideoElement::HTMLVideoElement(const QualifiedName& tagName, Document PassRefPtr<HTMLVideoElement> HTMLVideoElement::create(const QualifiedName& tagName, Document* document) { - return new HTMLVideoElement(tagName, document); + return adoptRef(new HTMLVideoElement(tagName, document)); } bool HTMLVideoElement::rendererIsNeeded(RenderStyle* style) @@ -177,9 +177,10 @@ void HTMLVideoElement::setPoster(const String& value) setAttribute(posterAttr, value); } -bool HTMLVideoElement::isURLAttribute(Attribute* attr) const +bool HTMLVideoElement::isURLAttribute(Attribute* attribute) const { - return attr->name() == posterAttr; + return HTMLMediaElement::isURLAttribute(attribute) + || attribute->name() == posterAttr; } const QualifiedName& HTMLVideoElement::imageSourceAttributeName() const @@ -258,4 +259,5 @@ void HTMLVideoElement::willMoveToNewOwnerDocument() } } + #endif |