diff options
Diffstat (limited to 'WebCore/rendering/RenderMedia.cpp')
-rw-r--r-- | WebCore/rendering/RenderMedia.cpp | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/WebCore/rendering/RenderMedia.cpp b/WebCore/rendering/RenderMedia.cpp index 42cd709..2ffa2f6 100644 --- a/WebCore/rendering/RenderMedia.cpp +++ b/WebCore/rendering/RenderMedia.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,17 +28,11 @@ #if ENABLE(VIDEO) #include "RenderMedia.h" -#include "CSSStyleSelector.h" -#include "Event.h" #include "EventNames.h" #include "FloatConversion.h" -#include "FrameView.h" -#include "GraphicsContext.h" -#include "HTMLMediaElement.h" #include "HTMLNames.h" #include "MediaControlElements.h" #include "MouseEvent.h" -#include "MediaPlayer.h" #include <wtf/CurrentTime.h> #include <wtf/MathExtras.h> @@ -46,6 +40,8 @@ using namespace std; namespace WebCore { +using namespace HTMLNames; + static const double cTimeUpdateRepeatDelay = 0.2; static const double cOpacityAnimationRepeatDelay = 0.05; // FIXME get this from style @@ -145,28 +141,11 @@ void RenderMedia::layout() } } -const RenderObjectChildList* RenderMedia::children() const -{ - return m_controlsShadowRoot ? m_controlsShadowRoot->renderer()->virtualChildren() : 0; -} - -RenderObjectChildList* RenderMedia::children() -{ - return m_controlsShadowRoot ? m_controlsShadowRoot->renderer()->virtualChildren() : 0; -} - -void RenderMedia::removeChild(RenderObject* child) -{ - ASSERT(m_controlsShadowRoot); - ASSERT(child == m_controlsShadowRoot->renderer()); - child->removeLayers(enclosingLayer()); - static_cast<RenderMediaControlShadowRoot*>(child)->setParent(0); -} - void RenderMedia::createControlsShadowRoot() { ASSERT(!m_controlsShadowRoot); m_controlsShadowRoot = new MediaControlShadowRootElement(document(), mediaElement()); + addChild(m_controlsShadowRoot->renderer()); } void RenderMedia::createPanel() @@ -233,6 +212,7 @@ void RenderMedia::createTimeline() { ASSERT(!m_timeline); m_timeline = new MediaControlTimelineElement(document(), mediaElement()); + m_timeline->setAttribute(precisionAttr, "float"); m_timeline->attachToParent(m_timelineContainer.get()); } |