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

Source/WebCore/html/shadow/MediaControlRootElementChromium.h

 /*
  * 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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 MediaControlRootElementChromium_h
 #define MediaControlRootElementChromium_h
 
 #if ENABLE(VIDEO)
 
+#include "MediaControlElements.h"
 #include "MediaControls.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 class Document;
 class HTMLInputElement;
 class Event;
 class MediaControlPanelMuteButtonElement;
 class MediaControlPlayButtonElement;
@@ skipping 12 matching lines @@
 class MediaPlayer;
 
 class RenderBox;
 class RenderMedia;
 
 #if ENABLE(VIDEO_TRACK)
 class MediaControlTextTrackContainerElement;
 class MediaControlTextTrackDisplayElement;
 #endif
 
-class MediaControlChromiumEnclosureElement : public HTMLDivElement {
+class MediaControlChromiumEnclosureElement : public MediaControlElement {
 public:
     static PassRefPtr<MediaControlChromiumEnclosureElement> create(Document*);
 
+private:
+    explicit MediaControlChromiumEnclosureElement(Document*);
+
+    virtual MediaControlElementType displayType() const;
     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; }
-
-    MediaControllerInterface* m_mediaController;
 };
 
 class MediaControlRootElementChromium : public MediaControls {
 public:
     static PassRefPtr<MediaControlRootElementChromium> create(Document*);
 
     // MediaControls implementation.
     void setMediaController(MediaControllerInterface*);
 
     void show();
@@ skipping 66 matching lines @@
     Timer<MediaControlRootElementChromium> m_hideFullscreenControlsTimer;
     bool m_isMouseOverControls;
     bool m_isFullscreen;
 };
 
 }
 
 #endif
 
 #endif