X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fworkers%2FWorkerRunLoop.cpp;h=f015c829c11f6b3ad428cf88e4fd5c6f9f775537;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=0a93a772cbddc8e3f160a05b17186ba6b99cee58;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/workers/WorkerRunLoop.cpp b/src/third_party/WebKit/Source/core/workers/WorkerRunLoop.cpp index 0a93a77..f015c82 100644 --- a/src/third_party/WebKit/Source/core/workers/WorkerRunLoop.cpp +++ b/src/third_party/WebKit/Source/core/workers/WorkerRunLoop.cpp @@ -42,6 +42,11 @@ namespace WebCore { +static String defaultMode() +{ + return String(); +} + class WorkerRunLoop::Task { WTF_MAKE_NONCOPYABLE(Task); WTF_MAKE_FAST_ALLOCATED; public: @@ -94,7 +99,7 @@ class ModePredicate { public: ModePredicate(const String& mode) : m_mode(mode) - , m_defaultMode(mode == WorkerRunLoop::defaultMode()) + , m_defaultMode(mode == defaultMode()) { } @@ -125,11 +130,6 @@ WorkerRunLoop::~WorkerRunLoop() ASSERT(!m_nestedCount); } -String WorkerRunLoop::defaultMode() -{ - return String(); -} - class RunLoopSetup { WTF_MAKE_NONCOPYABLE(RunLoopSetup); public: @@ -161,9 +161,7 @@ void WorkerRunLoop::run(WorkerGlobalScope* context) ModePredicate modePredicate(defaultMode()); MessageQueueWaitResult result; do { -#if ENABLE(OILPAN) ThreadState::current()->safePoint(ThreadState::NoHeapPointersOnStack); -#endif result = runInMode(context, modePredicate, WaitForMessage); } while (result != MessageQueueTerminated); runCleanupTasks(context); @@ -210,9 +208,7 @@ MessageQueueWaitResult WorkerRunLoop::runInMode(WorkerGlobalScope* context, cons } { -#if ENABLE(OILPAN) ThreadState::SafePointScope safePointScope(ThreadState::NoHeapPointersOnStack); -#endif task = m_messageQueue.waitForMessageFilteredWithTimeout(result, predicate, absoluteTime); } } while (result == MessageQueueTimeout && nextTimeoutEventIsIdleWatchdog); @@ -279,9 +275,4 @@ bool WorkerRunLoop::postTaskForMode(PassOwnPtr task, const return m_messageQueue.append(Task::create(task, mode.isolatedCopy())); } -bool WorkerRunLoop::postTaskForMode(const Closure& closure, const String& mode) -{ - return postTaskForMode(CallClosureTask::create(closure), mode); -} - } // namespace WebCore