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

Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

Index: Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp
===================================================================
--- Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp	(revision 125606)
+++ Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp	(working copy)
@@ -49,8 +49,7 @@
 static const double timeWithoutMouseMovementBeforeHidingControls = 2;
 
 MediaControlChromiumEnclosureElement::MediaControlChromiumEnclosureElement(Document* document)
-    : HTMLDivElement(HTMLNames::divTag, document->document())
-    , m_mediaController(0)
+    : MediaControlElement(document)
 {
 }
 
@@ -59,6 +58,13 @@
     return adoptRef(new MediaControlChromiumEnclosureElement(document));
 }
 
+MediaControlElementType MediaControlChromiumEnclosureElement::displayType() const
+{
+    // Mapping onto same MediaControlElementType as panel element, since it has similar properties.
+    return MediaControlsPanel;
+}
+
+
 const AtomicString& MediaControlChromiumEnclosureElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure"));