Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: Source/WebCore/html/shadow/MediaControlRootElementChromium.h

Issue 10827333: Merge 123822 - [Chromium] Regression: Global-buffer-overflow in WebCore::mediaControlElementType (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef MediaControlRootElementChromium_h 27 #ifndef MediaControlRootElementChromium_h
28 #define MediaControlRootElementChromium_h 28 #define MediaControlRootElementChromium_h
29 29
30 #if ENABLE(VIDEO) 30 #if ENABLE(VIDEO)
31 31
32 #include "MediaControlElements.h"
32 #include "MediaControls.h" 33 #include "MediaControls.h"
33 #include <wtf/RefPtr.h> 34 #include <wtf/RefPtr.h>
34 35
35 namespace WebCore { 36 namespace WebCore {
36 37
37 class Document; 38 class Document;
38 class HTMLInputElement; 39 class HTMLInputElement;
39 class Event; 40 class Event;
40 class MediaControlPanelMuteButtonElement; 41 class MediaControlPanelMuteButtonElement;
41 class MediaControlPlayButtonElement; 42 class MediaControlPlayButtonElement;
(...skipping 12 matching lines...) Expand all
54 class MediaPlayer; 55 class MediaPlayer;
55 56
56 class RenderBox; 57 class RenderBox;
57 class RenderMedia; 58 class RenderMedia;
58 59
59 #if ENABLE(VIDEO_TRACK) 60 #if ENABLE(VIDEO_TRACK)
60 class MediaControlTextTrackContainerElement; 61 class MediaControlTextTrackContainerElement;
61 class MediaControlTextTrackDisplayElement; 62 class MediaControlTextTrackDisplayElement;
62 #endif 63 #endif
63 64
64 class MediaControlChromiumEnclosureElement : public HTMLDivElement { 65 class MediaControlChromiumEnclosureElement : public MediaControlElement {
65 public: 66 public:
66 static PassRefPtr<MediaControlChromiumEnclosureElement> create(Document*); 67 static PassRefPtr<MediaControlChromiumEnclosureElement> create(Document*);
67 68
69 private:
70 explicit MediaControlChromiumEnclosureElement(Document*);
71
72 virtual MediaControlElementType displayType() const;
68 virtual const AtomicString& shadowPseudoId() const; 73 virtual const AtomicString& shadowPseudoId() const;
69
70 void setMediaController(MediaControllerInterface* controller) { m_mediaContr oller = controller; }
71 MediaControllerInterface* mediaController() const { return m_mediaController ; }
72
73 protected:
74 MediaControlChromiumEnclosureElement(Document*);
75
76 private:
77 virtual bool isMediaControlElement() const { return true; }
78
79 MediaControllerInterface* m_mediaController;
80 }; 74 };
81 75
82 class MediaControlRootElementChromium : public MediaControls { 76 class MediaControlRootElementChromium : public MediaControls {
83 public: 77 public:
84 static PassRefPtr<MediaControlRootElementChromium> create(Document*); 78 static PassRefPtr<MediaControlRootElementChromium> create(Document*);
85 79
86 // MediaControls implementation. 80 // MediaControls implementation.
87 void setMediaController(MediaControllerInterface*); 81 void setMediaController(MediaControllerInterface*);
88 82
89 void show(); 83 void show();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 Timer<MediaControlRootElementChromium> m_hideFullscreenControlsTimer; 150 Timer<MediaControlRootElementChromium> m_hideFullscreenControlsTimer;
157 bool m_isMouseOverControls; 151 bool m_isMouseOverControls;
158 bool m_isFullscreen; 152 bool m_isFullscreen;
159 }; 153 };
160 154
161 } 155 }
162 156
163 #endif 157 #endif
164 158
165 #endif 159 #endif
OLDNEW
« no previous file with comments | « LayoutTests/accessibility/media-controls-expected.txt ('k') | Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698