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

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

Issue 828413005: Stop pretending MediaControls::initializeControls() will fail (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 11 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 | Annotate | Revision Log
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 void updateTextTrackDisplay(); 71 void updateTextTrackDisplay();
72 72
73 void mediaElementFocused(); 73 void mediaElementFocused();
74 74
75 virtual void trace(Visitor*) override; 75 virtual void trace(Visitor*) override;
76 76
77 private: 77 private:
78 explicit MediaControls(HTMLMediaElement&); 78 explicit MediaControls(HTMLMediaElement&);
79 79
80 bool initializeControls(); 80 void initializeControls();
81 81
82 void makeOpaque(); 82 void makeOpaque();
83 void makeTransparent(); 83 void makeTransparent();
84 84
85 void updatePlayState(); 85 void updatePlayState();
86 86
87 enum HideBehaviorFlags { 87 enum HideBehaviorFlags {
88 IgnoreVideoHover = 1 << 0, 88 IgnoreVideoHover = 1 << 0,
89 IgnoreFocus = 1 << 1, 89 IgnoreFocus = 1 << 1,
90 IgnoreControlsHover = 1 << 2 90 IgnoreControlsHover = 1 << 2
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 bool m_isMouseOverControls : 1; 137 bool m_isMouseOverControls : 1;
138 bool m_isPausedForScrubbing : 1; 138 bool m_isPausedForScrubbing : 1;
139 bool m_wasLastEventTouch : 1; 139 bool m_wasLastEventTouch : 1;
140 }; 140 };
141 141
142 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 142 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
143 143
144 } 144 }
145 145
146 #endif 146 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698