Let MediaControls use the parent HTMLMediaElement

Source/core/html/shadow/MediaControlElementTypes.cpp

 /*
  * 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 18 matching lines @@
 
 #include "config.h"
 
 #include "core/html/shadow/MediaControlElementTypes.h"
 
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/css/StylePropertySet.h"
 #include "core/events/MouseEvent.h"
+#include "core/html/HTMLMediaElement.h"
+#include "core/html/MediaController.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 class Event;
 
 HTMLMediaElement* toParentMediaElement(Node* node)
 {
     if (!node)
         return 0;
     Node* mediaNode = node->shadowHost();
     if (!mediaNode)
         mediaNode = node;
     if (!mediaNode || !mediaNode->isElementNode() || !toElement(mediaNode)->isMediaElement())
         return 0;
 
     return toHTMLMediaElement(mediaNode);
 }
 
 MediaControlElementType mediaControlElementType(Node* node)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(node->isMediaControlElement());
     HTMLElement* element = toHTMLElement(node);
     if (element->hasTagName(inputTag))
         return static_cast<MediaControlInputElement*>(element)->displayType();
     return static_cast<MediaControlDivElement*>(element)->displayType();
 }
 
-MediaControlElement::MediaControlElement(MediaControlElementType displayType, HTMLElement* element)
-    : m_mediaController(0)
+MediaControlElement::MediaControlElement(HTMLMediaElement& mediaElement, MediaControlElementType displayType, HTMLElement* element)

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

WDYT about handing in MediaControls into these base classes instead? Part of my
reasoning is to make it easier for subcontrols to keep their visibility state in
sync with the parent control object along the lines of the discussion I've been
having in https://codereview.chromium.org/182613006/ .

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

I started writing this patch before merging MediaControlsAndroid and at the time
I tried doing this but hit some silly bump in the road and went with
HTMLMediaElement. I tried again now and like the outcome, so I'll go with that.

+    : m_mediaElement(mediaElement)
     , m_displayType(displayType)
     , m_element(element)
 {
 }
 
+MediaControllerInterface& MediaControlElement::mediaControllerInterface() const
+{
+    if (m_mediaElement.controller())
+        return *m_mediaElement.controller();
+    return m_mediaElement;
+}
+
 void MediaControlElement::hide()
 {
     m_element->setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone);
 }
 
 void MediaControlElement::show()
 {
     m_element->removeInlineStyleProperty(CSSPropertyDisplay);
 }
 
 void MediaControlElement::setDisplayType(MediaControlElementType displayType)
 {
     if (displayType == m_displayType)
         return;
 
     m_displayType = displayType;
     if (RenderObject* object = m_element->renderer())
         object->repaint();
 }
 
 // ----------------------------
 
-MediaControlDivElement::MediaControlDivElement(Document& document, MediaControlElementType displayType)
-    : HTMLDivElement(document)
-    , MediaControlElement(displayType, this)
+MediaControlDivElement::MediaControlDivElement(HTMLMediaElement& mediaElement, MediaControlElementType displayType)
+    : HTMLDivElement(mediaElement.document())
+    , MediaControlElement(mediaElement, displayType, this)
 {
 }
 
 // ----------------------------
 
-MediaControlInputElement::MediaControlInputElement(Document& document, MediaControlElementType displayType)
-    : HTMLInputElement(document, 0, false)
-    , MediaControlElement(displayType, this)
+MediaControlInputElement::MediaControlInputElement(HTMLMediaElement& mediaElement, MediaControlElementType displayType)
+    : HTMLInputElement(mediaElement.document(), 0, false)
+    , MediaControlElement(mediaElement, displayType, this)
 {
 }
 
 bool MediaControlInputElement::isMouseFocusable() const
 {
     return false;
 }
 
 // ----------------------------
 
-MediaControlTimeDisplayElement::MediaControlTimeDisplayElement(Document& document, MediaControlElementType displayType)
-    : MediaControlDivElement(document, displayType)
+MediaControlTimeDisplayElement::MediaControlTimeDisplayElement(HTMLMediaElement& mediaElement, MediaControlElementType displayType)
+    : MediaControlDivElement(mediaElement, displayType)
     , m_currentValue(0)
 {
 }
 
 void MediaControlTimeDisplayElement::setCurrentValue(double time)
 {
     m_currentValue = time;
 }
 
 } // namespace WebCore