Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / ThreadTimers.cpp

diff --git a/src/third_party/WebKit/Source/platform/ThreadTimers.cpp b/src/third_party/WebKit/Source/platform/ThreadTimers.cpp
index 5be280a..0cc2ac1 100644 (file)
--- a/src/third_party/WebKit/Source/platform/ThreadTimers.cpp
+++ b/src/third_party/WebKit/Source/platform/ThreadTimers.cpp
@@ -35,8 +35,6 @@
 #include "wtf/CurrentTime.h"
 #include "wtf/MainThread.h"
 
-using namespace std;
-
 namespace blink {
 
 // Fire timers for this length of time, and then quit to let the run loop process user input events.
@@ -97,7 +95,7 @@ void ThreadTimers::updateSharedTimer()
                 return;
         }
         m_pendingSharedTimerFireTime = nextFireTime;
-        m_sharedTimer->setFireInterval(max(nextFireTime - currentMonotonicTime, 0.0));
+        m_sharedTimer->setFireInterval(std::max(nextFireTime - currentMonotonicTime, 0.0));
     }
 }