third_party/WebKit/Source/core/layout/LayoutThemeTest.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/layout/LayoutThemeTest.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp ('k') | third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp b/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp

index 4524fe1b2c7e58c3a3f7dac9899cf4e8d7661564..c16be2942964937f812067dfb24e653fb4fd246f 100644

--- a/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutThemeTest.cpp

@@ -85,39 +85,22 @@ TEST_F(LayoutThemeTest, ChangeFocusRingColor) {

TEST_F(LayoutThemeTest, FormatMediaTime) {

struct {

- bool newUi;

float time;

float duration;

String expectedResult;

} tests[] = {

- {false, 1, 1, "0:01"}, {false, 1, 15, "0:01"},

- {false, 1, 600, "00:01"}, {false, 1, 3600, "0:00:01"},

- {false, 1, 7200, "0:00:01"}, {false, 15, 15, "0:15"},

- {false, 15, 600, "00:15"}, {false, 15, 3600, "0:00:15"},

- {false, 15, 7200, "0:00:15"}, {false, 600, 600, "10:00"},

- {false, 600, 3600, "0:10:00"}, {false, 600, 7200, "0:10:00"},

- {false, 3600, 3600, "1:00:00"}, {false, 3600, 7200, "1:00:00"},

- {false, 7200, 7200, "2:00:00"},

- {true, 1, 1, "0:01"}, {true, 1, 15, "0:01"},

- {true, 1, 600, "0:01"}, {true, 1, 3600, "00:01"},

- {true, 1, 7200, "000:01"}, {true, 15, 15, "0:15"},

- {true, 15, 600, "0:15"}, {true, 15, 3600, "00:15"},

- {true, 15, 7200, "000:15"}, {true, 600, 600, "10:00"},

- {true, 600, 3600, "10:00"}, {true, 600, 7200, "010:00"},

- {true, 3600, 3600, "60:00"}, {true, 3600, 7200, "060:00"},

- {true, 7200, 7200, "120:00"},

+ {1, 1, "0:01"}, {1, 15, "0:01"}, {1, 600, "0:01"},

+ {1, 3600, "00:01"}, {1, 7200, "000:01"}, {15, 15, "0:15"},

+ {15, 600, "0:15"}, {15, 3600, "00:15"}, {15, 7200, "000:15"},

+ {600, 600, "10:00"}, {600, 3600, "10:00"}, {600, 7200, "010:00"},

+ {3600, 3600, "60:00"}, {3600, 7200, "060:00"}, {7200, 7200, "120:00"},

};

- const bool newUi = RuntimeEnabledFeatures::newMediaPlaybackUiEnabled();

for (const auto& testcase : tests) {

- RuntimeEnabledFeatures::setNewMediaPlaybackUiEnabled(testcase.newUi);

EXPECT_EQ(testcase.expectedResult,

LayoutTheme::theme().formatMediaControlsCurrentTime(

testcase.time, testcase.duration));

}

- RuntimeEnabledFeatures::setNewMediaPlaybackUiEnabled(newUi);

}

} // namespace blink