Source/core/frame/DOMTimer.cpp - Issue 329183002: Removing "using" declarations that import names in the C++ Standard library.

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: Source/core/frame/DOMTimer.cpp

Issue 329183002: Removing "using" declarations that import names in the C++ Standard library. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed Trybot Errors Created 6 years, 6 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: Source/core/frame/DOMTimer.cpp

diff --git a/Source/core/frame/DOMTimer.cpp b/Source/core/frame/DOMTimer.cpp

index 9013180c62fb6e78c85a190029e94c93b7e96443..4d9b76a27ffb9fba1618359ff4efdef59de5f0cd 100644

--- a/Source/core/frame/DOMTimer.cpp

+++ b/Source/core/frame/DOMTimer.cpp

@@ -33,8 +33,6 @@

#include "platform/TraceEvent.h"

#include "wtf/CurrentTime.h"

-using namespace std;

namespace WebCore {

static const int maxIntervalForUserGestureForwarding = 1000; // One second matches Gecko.

@@ -98,7 +96,7 @@ DOMTimer::DOMTimer(ExecutionContext* context, PassOwnPtr<ScheduledAction> action

if (shouldForwardUserGesture(interval, m_nestingLevel))

m_userGestureToken = UserGestureIndicator::currentToken();

- double intervalMilliseconds = max(oneMillisecond, interval * oneMillisecond);

+ double intervalMilliseconds = std::max(oneMillisecond, interval * oneMillisecond);

if (intervalMilliseconds < minimumInterval && m_nestingLevel >= maxTimerNestingLevel)

intervalMilliseconds = minimumInterval;

if (singleShot)

« no previous file with comments | « Source/core/fileapi/FileReaderLoader.cpp ('k') | Source/core/frame/ImageBitmap.cpp » ('j') | no next file with comments »