Source/core/html/shadow/MediaControls.h - Issue 1303553003: Enable mute button, even if preferring hidden volume slider.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1303553003: Enable mute button, even if preferring hidden volume slider. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fixed test... which is why we have them. Created 5 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

« no previous file with comments | « LayoutTests/media/video-controls-hidden-audio-expected.txt ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

OLD	NEW
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 134 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145	145

146 Timer<MediaControls> m_hideMediaControlsTimer;	146 Timer<MediaControls> m_hideMediaControlsTimer;

147 unsigned m_hideTimerBehaviorFlags;	147 unsigned m_hideTimerBehaviorFlags;

148 bool m_isMouseOverControls : 1;	148 bool m_isMouseOverControls : 1;

149 bool m_isPausedForScrubbing : 1;	149 bool m_isPausedForScrubbing : 1;

150	150

151 Timer<MediaControls> m_panelWidthChangedTimer;	151 Timer<MediaControls> m_panelWidthChangedTimer;

152 int m_panelWidth;	152 int m_panelWidth;

153	153

154 bool m_allowHiddenVolumeControls : 1;	154 bool m_allowHiddenVolumeControls : 1;

155 bool m_keepMuteButton : 1;

156 };	155 };

157	156

158 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());	157 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());

159	158

160 }	159 }

161	160

162 #endif	161 #endif

OLD	NEW