From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 Source/WebCore/rendering/MediaControlElements.h | 53 +++++++++++++++++++++----
 1 file changed, 46 insertions(+), 7 deletions(-)

(limited to 'Source/WebCore/rendering/MediaControlElements.h')

diff --git a/Source/WebCore/rendering/MediaControlElements.h b/Source/WebCore/rendering/MediaControlElements.h
index 44e8811..77116e3 100644
--- a/Source/WebCore/rendering/MediaControlElements.h
+++ b/Source/WebCore/rendering/MediaControlElements.h
@@ -142,16 +142,16 @@ public:
     virtual PassRefPtr<RenderStyle> styleForElement();
     void setVisible(bool);
     bool isVisible() { return m_isVisible; }
-    void setPosition(int x, int y);
     bool hitTest(const IntPoint& absPoint);
 
 private:
     MediaControlVolumeSliderContainerElement(HTMLMediaElement*);
+
+    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     virtual MediaControlElementType displayType() const;
     virtual const AtomicString& shadowPseudoId() const;
 
     bool m_isVisible;
-    int m_x, m_y;
 };
 
 // ----------------------------
@@ -372,9 +372,10 @@ public:
     virtual void defaultEventHandler(Event*);
     void update();
 
-private:
+protected:
     MediaControlVolumeSliderElement(HTMLMediaElement*);
 
+private:
     virtual const AtomicString& shadowPseudoId() const;
 };
 
@@ -394,10 +395,48 @@ private:
 
 // ----------------------------
 
-class MediaControlTimeDisplayElement : public MediaControlElement {
+class MediaControlFullscreenVolumeSliderElement : public MediaControlVolumeSliderElement {
 public:
-    void setVisible(bool);
+    static PassRefPtr<MediaControlFullscreenVolumeSliderElement> create(HTMLMediaElement*);
+    
+private:
+    MediaControlFullscreenVolumeSliderElement(HTMLMediaElement*);
+    
+    virtual const AtomicString& shadowPseudoId() const;
+};
+
+// ----------------------------
+
+class MediaControlFullscreenVolumeMinButtonElement : public MediaControlInputElement {
+public:
+    static PassRefPtr<MediaControlFullscreenVolumeMinButtonElement> create(HTMLMediaElement*);
+    
+    virtual void defaultEventHandler(Event*);
+    
+private:
+    MediaControlFullscreenVolumeMinButtonElement(HTMLMediaElement*);
+    
+    virtual const AtomicString& shadowPseudoId() const;
+};
+
+// ----------------------------
+
+class MediaControlFullscreenVolumeMaxButtonElement : public MediaControlInputElement {
+public:
+    static PassRefPtr<MediaControlFullscreenVolumeMaxButtonElement> create(HTMLMediaElement*);
+    
+    virtual void defaultEventHandler(Event*);
+    
+private:
+    MediaControlFullscreenVolumeMaxButtonElement(HTMLMediaElement*);
+    
+    virtual const AtomicString& shadowPseudoId() const;
+};
+
+// ----------------------------
 
+class MediaControlTimeDisplayElement : public MediaControlElement {
+public:
     void setCurrentValue(float);
     float currentValue() const { return m_currentValue; }
 
@@ -405,9 +444,9 @@ protected:
     MediaControlTimeDisplayElement(HTMLMediaElement*);
 
 private:
-    virtual PassRefPtr<RenderStyle> styleForElement();
+    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+
     float m_currentValue;
-    bool m_isVisible;
 };
 
 // ----------------------------
-- 
cgit v1.1