auto import from //depot/cupcake/@136594

1 files changed, 9 insertions, 3 deletions

diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h
index 8f48caf..a4670e9 100644
--- a/WebCore/rendering/RenderMedia.h
+++ b/WebCore/rendering/RenderMedia.h
@@ -40,6 +40,7 @@ class MediaControlPlayButtonElement;
 class MediaControlSeekButtonElement;
 class MediaControlTimelineElement;
 class MediaControlFullscreenButtonElement;
+class MediaTimeDisplayElement;
 class MediaPlayer;
 
 class RenderMedia : public RenderReplaced {
@@ -66,6 +67,7 @@ public:
     void updateFromElement();
     void updatePlayer();
     void updateControls();
+    void updateTimeDisplay();
     
     void forwardEvent(Event*);
 
@@ -75,17 +77,19 @@ public:
 
 private:
     void createControlsShadowRoot();
+    void destroyControlsShadowRoot();
     void createPanel();
     void createMuteButton();
     void createPlayButton();
     void createSeekBackButton();
     void createSeekForwardButton();
+    void createTimelineContainer();
     void createTimeline();
-    void createTimeDisplay();
+    void createCurrentTimeDisplay();
+    void createTimeRemainingDisplay();
     void createFullscreenButton();
     
     void timeUpdateTimerFired(Timer<RenderMedia>*);
-    void updateTimeDisplay();
     
     void updateControlVisibility();
     void changeOpacity(HTMLElement*, float opacity);
@@ -99,7 +103,9 @@ private:
     RefPtr<MediaControlSeekButtonElement> m_seekForwardButton;
     RefPtr<MediaControlTimelineElement> m_timeline;
     RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton;
-    RefPtr<HTMLElement> m_timeDisplay;
+    RefPtr<HTMLElement> m_timelineContainer;
+    RefPtr<MediaTimeDisplayElement> m_currentTimeDisplay;
+    RefPtr<MediaTimeDisplayElement> m_timeRemainingDisplay;
     EventTargetNode* m_lastUnderNode;
     EventTargetNode* m_nodeUnderMouse;