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

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h

Issue 2341423002: Don't include LayoutBlock.h from MediaControlElementTypes.h (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 15 matching lines...) Expand all
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #ifndef MediaControlElementTypes_h 30 #ifndef MediaControlElementTypes_h
31 #define MediaControlElementTypes_h 31 #define MediaControlElementTypes_h
32 32
33 #include "core/CoreExport.h" 33 #include "core/CoreExport.h"
34 #include "core/html/HTMLDivElement.h" 34 #include "core/html/HTMLDivElement.h"
35 #include "core/html/HTMLInputElement.h" 35 #include "core/html/HTMLInputElement.h"
36 #include "core/layout/LayoutBlock.h"
37 #include "public/platform/WebLocalizedString.h" 36 #include "public/platform/WebLocalizedString.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 class HTMLMediaElement; 40 class HTMLMediaElement;
42 class MediaControls; 41 class MediaControls;
43 42
44 enum MediaControlElementType { 43 enum MediaControlElementType {
45 MediaEnterFullscreenButton = 0, 44 MediaEnterFullscreenButton = 0,
46 MediaMuteButton, 45 MediaMuteButton,
(...skipping 20 matching lines...) Expand all
67 MediaCastOffButton, 66 MediaCastOffButton,
68 MediaCastOnButton, 67 MediaCastOnButton,
69 MediaOverlayCastOffButton, 68 MediaOverlayCastOffButton,
70 MediaOverlayCastOnButton, 69 MediaOverlayCastOnButton,
71 MediaOverflowButton, 70 MediaOverflowButton,
72 MediaOverflowList, 71 MediaOverflowList,
73 MediaDownloadButton, 72 MediaDownloadButton,
74 }; 73 };
75 74
76 CORE_EXPORT const HTMLMediaElement* toParentMediaElement(const Node*); 75 CORE_EXPORT const HTMLMediaElement* toParentMediaElement(const Node*);
77 inline const HTMLMediaElement* toParentMediaElement(const LayoutObject& layoutOb ject) { return toParentMediaElement(layoutObject.node()); } 76 CORE_EXPORT const HTMLMediaElement* toParentMediaElement(const LayoutObject&);
78 77
79 CORE_EXPORT MediaControlElementType mediaControlElementType(const Node*); 78 CORE_EXPORT MediaControlElementType mediaControlElementType(const Node*);
80 79
81 // ---------------------------- 80 // ----------------------------
82 81
83 class MediaControlElement : public GarbageCollectedMixin { 82 class MediaControlElement : public GarbageCollectedMixin {
84 public: 83 public:
85 // These hold the state about whether this control should be shown if 84 // These hold the state about whether this control should be shown if
86 // space permits. These will also show / hide as needed. 85 // space permits. These will also show / hide as needed.
87 void setIsWanted(bool); 86 void setIsWanted(bool);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 protected: 197 protected:
199 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType); 198 MediaControlTimeDisplayElement(MediaControls&, MediaControlElementType);
200 199
201 private: 200 private:
202 double m_currentValue; 201 double m_currentValue;
203 }; 202 };
204 203
205 } // namespace blink 204 } // namespace blink
206 205
207 #endif // MediaControlElementTypes_h 206 #endif // MediaControlElementTypes_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698