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

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

Issue 441193003: Hide video controls after touch when hideMediaControlsTimerFired fires. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: /s/TODO/FIXME Created 6 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) 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 bool initializeControls(); 76 bool initializeControls();
77 77
78 void makeOpaque(); 78 void makeOpaque();
79 void makeTransparent(); 79 void makeTransparent();
80 80
81 void updatePlayState(); 81 void updatePlayState();
82 82
83 enum HideBehaviorFlags { 83 enum HideBehaviorFlags {
84 IgnoreVideoHover = 1 << 0, 84 IgnoreVideoHover = 1 << 0,
85 IgnoreFocus = 1 << 1 85 IgnoreFocus = 1 << 1,
86 IgnoreControlsHover = 1 << 2
86 }; 87 };
87 88
88 bool shouldHideMediaControls(unsigned behaviorFlags = 0) const; 89 bool shouldHideMediaControls(unsigned behaviorFlags = 0) const;
89 void hideMediaControlsTimerFired(Timer<MediaControls>*); 90 void hideMediaControlsTimerFired(Timer<MediaControls>*);
90 void startHideMediaControlsTimer(); 91 void startHideMediaControlsTimer();
91 void stopHideMediaControlsTimer(); 92 void stopHideMediaControlsTimer();
92 93
93 void createTextTrackDisplay(); 94 void createTextTrackDisplay();
94 void showTextTrackDisplay(); 95 void showTextTrackDisplay();
95 void hideTextTrackDisplay(); 96 void hideTextTrackDisplay();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 Timer<MediaControls> m_hideMediaControlsTimer; 128 Timer<MediaControls> m_hideMediaControlsTimer;
128 bool m_isMouseOverControls : 1; 129 bool m_isMouseOverControls : 1;
129 bool m_isPausedForScrubbing : 1; 130 bool m_isPausedForScrubbing : 1;
130 }; 131 };
131 132
132 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 133 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
133 134
134 } 135 }
135 136
136 #endif 137 #endif
OLDNEW
« no previous file with comments | « LayoutTests/media/video-controls-visible-exiting-fullscreen.html ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698