| Index: Source/core/html/HTMLVideoElement.cpp
|
| diff --git a/Source/core/html/HTMLVideoElement.cpp b/Source/core/html/HTMLVideoElement.cpp
|
| index bbdf46bf1c6aa4120558e8cd1efb7bf213c3d43c..5d58b9d32b43a5193a1528eb600f01392fdcfc92 100644
|
| --- a/Source/core/html/HTMLVideoElement.cpp
|
| +++ b/Source/core/html/HTMLVideoElement.cpp
|
| @@ -20,7 +20,7 @@
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -58,9 +58,9 @@ PassRefPtr<HTMLVideoElement> HTMLVideoElement::create(const QualifiedName& tagNa
|
| return videoElement.release();
|
| }
|
|
|
| -bool HTMLVideoElement::rendererIsNeeded(const NodeRenderingContext& context)
|
| +bool HTMLVideoElement::rendererIsNeeded(const NodeRenderingContext& context)
|
| {
|
| - return HTMLElement::rendererIsNeeded(context);
|
| + return HTMLElement::rendererIsNeeded(context);
|
| }
|
|
|
| RenderObject* HTMLVideoElement::createRenderer(RenderStyle*)
|
| @@ -78,7 +78,7 @@ void HTMLVideoElement::attach(const AttachContext& context)
|
| m_imageLoader = adoptPtr(new HTMLImageLoader(this));
|
| m_imageLoader->updateFromElement();
|
| if (renderer())
|
| - toRenderImage(renderer())->imageResource()->setCachedImage(m_imageLoader->image());
|
| + toRenderImage(renderer())->imageResource()->setCachedImage(m_imageLoader->image());
|
| }
|
| }
|
|
|
| @@ -111,7 +111,7 @@ void HTMLVideoElement::parseAttribute(const QualifiedName& name, const AtomicStr
|
| m_imageLoader->updateFromElementIgnoringPreviousError();
|
| } else {
|
| if (renderer())
|
| - toRenderImage(renderer())->imageResource()->setCachedImage(0);
|
| + toRenderImage(renderer())->imageResource()->setCachedImage(0);
|
| }
|
| } else
|
| HTMLMediaElement::parseAttribute(name, value);
|
| @@ -120,7 +120,7 @@ void HTMLVideoElement::parseAttribute(const QualifiedName& name, const AtomicStr
|
| bool HTMLVideoElement::supportsFullscreen() const
|
| {
|
| Page* page = document() ? document()->page() : 0;
|
| - if (!page)
|
| + if (!page)
|
| return false;
|
|
|
| if (!player() || !player()->supportsFullscreen())
|
| @@ -149,14 +149,14 @@ unsigned HTMLVideoElement::width() const
|
| unsigned w = getAttribute(widthAttr).string().toUInt(&ok);
|
| return ok ? w : 0;
|
| }
|
| -
|
| +
|
| unsigned HTMLVideoElement::height() const
|
| {
|
| bool ok;
|
| unsigned h = getAttribute(heightAttr).string().toUInt(&ok);
|
| return ok ? h : 0;
|
| }
|
| -
|
| +
|
| bool HTMLVideoElement::isURLAttribute(const Attribute& attribute) const
|
| {
|
| return attribute.name() == posterAttr || HTMLMediaElement::isURLAttribute(attribute);
|
| @@ -215,7 +215,7 @@ bool HTMLVideoElement::hasAvailableVideoFrame() const
|
| {
|
| if (!player())
|
| return false;
|
| -
|
| +
|
| return player()->hasVideo() && player()->readyState() >= MediaPlayer::HaveCurrentData;
|
| }
|
|
|
| @@ -224,7 +224,7 @@ void HTMLVideoElement::webkitEnterFullscreen(ExceptionCode& ec)
|
| if (isFullscreen())
|
| return;
|
|
|
| - // Generate an exception if this isn't called in response to a user gesture, or if the
|
| + // Generate an exception if this isn't called in response to a user gesture, or if the
|
| // element does not support fullscreen.
|
| if ((userGestureRequiredForFullscreen() && !ScriptController::processingUserGesture()) || !supportsFullscreen()) {
|
| ec = InvalidStateError;
|
|
|