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

Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 31 matching lines @@
 #include "TextTrackCue.h"
 #endif
 
 using namespace std;
 
 namespace WebCore {
 
 static const double timeWithoutMouseMovementBeforeHidingControls = 2;
 
 MediaControlChromiumEnclosureElement::MediaControlChromiumEnclosureElement(Document* document)
-    : HTMLDivElement(HTMLNames::divTag, document->document())
-    , m_mediaController(0)
+    : MediaControlElement(document)
 {
 }
 
 PassRefPtr<MediaControlChromiumEnclosureElement> MediaControlChromiumEnclosureElement::create(Document* document)
 {
     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"));
     return id;
 }
 
 MediaControlRootElementChromium::MediaControlRootElementChromium(Document* document)
     : MediaControls(document)
     , m_mediaController(0)
     , m_playButton(0)
@@ skipping 421 matching lines @@
 {
     // We only need to update buffering progress when paused, during normal
     // playback playbackProgressed() will take care of it.
     if (m_mediaController->paused())
         m_timeline->setPosition(m_mediaController->currentTime());
 }
 
 }
 
 #endif