Let MediaControls use the parent HTMLMediaElement

Source/core/html/shadow/MediaControlElementTypes.h

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 15 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef MediaControlElementTypes_h
 #define MediaControlElementTypes_h
 
 #include "core/html/HTMLDivElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLMediaElement.h"
-#include "core/html/MediaControllerInterface.h"
 #include "core/rendering/RenderBlock.h"
 
 namespace WebCore {
 
+class HTMLMediaElement;
+class MediaControllerInterface;
+
 enum MediaControlElementType {
     MediaEnterFullscreenButton = 0,
     MediaMuteButton,
     MediaPlayButton,
     MediaSlider,
     MediaSliderThumb,
     MediaShowClosedCaptionsButton,
     MediaHideClosedCaptionsButton,
     MediaUnMuteButton,
     MediaPauseButton,
@@ skipping 20 matching lines @@
 
 // ----------------------------
 
 class MediaControlElement {
 public:
     void hide();
     void show();
 
     MediaControlElementType displayType() { return m_displayType; }
 
-    void setMediaController(MediaControllerInterface* controller) { m_mediaController = controller; }
-    MediaControllerInterface* mediaController() const { return m_mediaController; }
-
 protected:
-    explicit MediaControlElement(MediaControlElementType, HTMLElement*);
+    explicit MediaControlElement(HTMLMediaElement&, MediaControlElementType, HTMLElement*);

[acolwell GONE FROM CHROMIUM, 2014/03/12 00:22:32]

Drop explicit since this isn't a 1 arg constructor.

[philipj_slow, 2014/03/12 04:30:11]

Done.

     ~MediaControlElement() { }
 
     void setDisplayType(MediaControlElementType);
 
+    MediaControllerInterface& mediaControllerInterface() const;
+
+    HTMLMediaElement& m_mediaElement;

[acolwell GONE FROM CHROMIUM, 2014/03/12 00:22:32]

Why does this need to be protected instead of private?

[philipj_slow, 2014/03/12 04:30:11]

Oops, that was needed for a following patch, but I'll add a public getter
instead.

+
 private:
-    MediaControllerInterface* m_mediaController;
     MediaControlElementType m_displayType;
     HTMLElement* m_element;
 };
 
 // ----------------------------
 
 class MediaControlDivElement : public HTMLDivElement, public MediaControlElement {
 protected:
     virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; }
-    explicit MediaControlDivElement(Document&, MediaControlElementType);
+    explicit MediaControlDivElement(HTMLMediaElement&, MediaControlElementType);

[acolwell GONE FROM CHROMIUM, 2014/03/12 00:22:32]

nit: drop explicit here and other cases of non-single argument constructors.

[philipj_slow, 2014/03/12 04:30:11]

Done.

 };
 
 // ----------------------------
 
 class MediaControlInputElement : public HTMLInputElement, public MediaControlElement {
 protected:
     virtual bool isMediaControlElement() const OVERRIDE FINAL { return true; }
-    explicit MediaControlInputElement(Document&, MediaControlElementType);
+    explicit MediaControlInputElement(HTMLMediaElement&, MediaControlElementType);
 
 private:
     virtual void updateDisplayType() { }
     virtual bool isMouseFocusable() const OVERRIDE;
 };
 
 // ----------------------------
 
 class MediaControlTimeDisplayElement : public MediaControlDivElement {
 public:
     void setCurrentValue(double);
     double currentValue() const { return m_currentValue; }
 
 protected:
-    explicit MediaControlTimeDisplayElement(Document&, MediaControlElementType);
+    explicit MediaControlTimeDisplayElement(HTMLMediaElement&, MediaControlElementType);
 
 private:
     double m_currentValue;
 };
 
 } // namespace WebCore
 
 #endif // MediaControlElementTypes_h