Merge 123822 - [Chromium] Regression: Global-buffer-overflow in WebCore::mediaControlElementType

Source/WebCore/html/shadow/MediaControlRootElementChromium.h

Index: Source/WebCore/html/shadow/MediaControlRootElementChromium.h
===================================================================
--- Source/WebCore/html/shadow/MediaControlRootElementChromium.h	(revision 125606)
+++ Source/WebCore/html/shadow/MediaControlRootElementChromium.h	(working copy)
@@ -29,6 +29,7 @@
 
 #if ENABLE(VIDEO)
 
+#include "MediaControlElements.h"
 #include "MediaControls.h"
 #include <wtf/RefPtr.h>
 
@@ -61,22 +62,15 @@
 class MediaControlTextTrackDisplayElement;
 #endif
 
-class MediaControlChromiumEnclosureElement : public HTMLDivElement {
+class MediaControlChromiumEnclosureElement : public MediaControlElement {
 public:
     static PassRefPtr<MediaControlChromiumEnclosureElement> create(Document*);
 
-    virtual const AtomicString& shadowPseudoId() const;
-
-    void setMediaController(MediaControllerInterface* controller) { m_mediaController = controller; }
-    MediaControllerInterface* mediaController() const { return m_mediaController; }
-
-protected:
-    MediaControlChromiumEnclosureElement(Document*);
-
 private:
-    virtual bool isMediaControlElement() const { return true; }
+    explicit MediaControlChromiumEnclosureElement(Document*);
 
-    MediaControllerInterface* m_mediaController;
+    virtual MediaControlElementType displayType() const;
+    virtual const AtomicString& shadowPseudoId() const;
 };
 
 class MediaControlRootElementChromium : public MediaControls {