third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp - Issue 2447503002: Remove newMediaPlaybackUi flag from content/ and Blink.

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

Unified Diff: third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

Issue 2447503002: Remove newMediaPlaybackUi flag from content/ and Blink. (Closed)

Patch Set: fix mistake caught by tests 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:

Index: third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

index eaa330f1d687f37aaef134910de844c21f587dc9..efef3868e999ee5b065b36bd15425a891bf968a5 100644

--- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

+++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

@@ -150,10 +150,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(

// <audio>.

if (!m_mediaControlsStyleSheet &&

(isHTMLVideoElement(element) || isHTMLAudioElement(element))) {

- String mediaRules = loadResourceAsASCIIString(

- RuntimeEnabledFeatures::newMediaPlaybackUiEnabled()

- ? "mediaControlsNew.css"

- : "mediaControls.css") +

+ String mediaRules = loadResourceAsASCIIString("mediaControlsNew.css") +

LayoutTheme::theme().extraMediaControlsStyleSheet();

m_mediaControlsStyleSheet = parseUASheet(mediaRules);

m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());