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

Unified Diff: third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp

Issue 2730683004: Avoid name collision for secondsPerHour/secondsPerMinute (Closed)
Patch Set: Created 3 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
Index: third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
index f3e4542db09ffa2ee484574b68cda004d3e22ca4..cbd6d36f431a6fd3700b0d6d6298d318fb91bc8c 100644
--- a/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
+++ b/third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp
@@ -45,9 +45,6 @@ namespace blink {
using namespace HTMLNames;
-const double secondsPerHour = 3600;
-const double secondsPerMinute = 60;
-const double secondsPerMillisecond = 0.001;
const unsigned fileIdentifierLength = 6;
bool VTTParser::parseFloatPercentageValue(VTTScanner& valueScanner,
@@ -405,6 +402,9 @@ bool VTTParser::collectTimeStamp(const String& line, double& timeStamp) {
bool VTTParser::collectTimeStamp(VTTScanner& input, double& timeStamp) {
// Collect a WebVTT timestamp (5.3 WebVTT cue timings and settings parsing.)
// Steps 1 - 4 - Initial checks, let most significant units be minutes.
+ const int secondsPerHour = 3600;
+ const int secondsPerMinute = 60;
+ const double secondsPerMillisecond = 0.001;
fs 2017/03/02 15:52:15 Ditto.
enum Mode { Minutes, Hours };
Mode mode = Minutes;

Powered by Google App Engine
This is Rietveld 408576698