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

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

Issue 2386273003: Keep the media controls panel visible if the overflow menu is visible. (Closed)
Patch Set: Created 4 years, 2 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/MediaControls.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) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 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 * 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // Notify us that the media element's network state has changed. 86 // Notify us that the media element's network state has changed.
87 void networkStateChanged(); 87 void networkStateChanged();
88 88
89 void toggleOverflowMenu(); 89 void toggleOverflowMenu();
90 90
91 bool overflowMenuVisible(); 91 bool overflowMenuVisible();
92 92
93 DECLARE_VIRTUAL_TRACE(); 93 DECLARE_VIRTUAL_TRACE();
94 94
95 private: 95 private:
96 friend class MediaControlsTest;
97
96 void invalidate(Element*); 98 void invalidate(Element*);
97 99
98 class BatchedControlUpdate; 100 class BatchedControlUpdate;
99 101
100 explicit MediaControls(HTMLMediaElement&); 102 explicit MediaControls(HTMLMediaElement&);
101 103
102 void initializeControls(); 104 void initializeControls();
103 105
104 void makeOpaque(); 106 void makeOpaque();
105 void makeTransparent(); 107 void makeTransparent();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 int m_panelWidth; 166 int m_panelWidth;
165 167
166 bool m_allowHiddenVolumeControls : 1; 168 bool m_allowHiddenVolumeControls : 1;
167 }; 169 };
168 170
169 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 171 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
170 172
171 } // namespace blink 173 } // namespace blink
172 174
173 #endif 175 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698