third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

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/html/track/vtt/VTTCue.cpp

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . Created 4 years, 10 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/html/track/vtt/VTTCue.h ('k') | third_party/WebKit/Source/core/html/track/vtt/VTTScanner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp

diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp

index a09e9a33dacd84e94ed5c68d190b8fcc8c3efa8e..eb462a3c8d738c57b9e1d661a1764f029e3beab4 100644

--- a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp

+++ b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp

@@ -653,7 +653,7 @@ VTTDisplayParameters VTTCue::calculateDisplayParameters() const

// Note: The 'text-align' property is also determined here so that

// VTTCueBox::applyCSSProperties need not have access to a VTTCue.

- displayParameters.textAlign = displayAlignmentMap[cueAlignment()];

+ displayParameters.textAlign = displayAlignmentMap[getCueAlignment()];

// 3. If the cue writing direction is horizontal, then let block-flow be

// 'tb'. Otherwise, if the cue writing direction is vertical growing left,