Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / core / v8 / ScheduledAction.cpp

diff --git a/src/third_party/WebKit/Source/bindings/core/v8/ScheduledAction.cpp b/src/third_party/WebKit/Source/bindings/core/v8/ScheduledAction.cpp
index b0315ae..b7ce1d3 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/core/v8/ScheduledAction.cpp
+++ b/src/third_party/WebKit/Source/bindings/core/v8/ScheduledAction.cpp
@@ -41,6 +41,7 @@
 #include "core/frame/LocalFrame.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
+#include "platform/Logging.h"
 #include "platform/TraceEvent.h"
 
 namespace blink {
@@ -71,28 +72,37 @@ void ScheduledAction::execute(ExecutionContext* context)
 {
     if (context->isDocument()) {
         LocalFrame* frame = toDocument(context)->frame();
-        if (!frame)
+        if (!frame) {
+            WTF_LOG(Timers, "ScheduledAction::execute %p: no frame", this);
             return;
-        if (!frame->script().canExecuteScripts(AboutToExecuteScript))
+        }
+        if (!frame->script().canExecuteScripts(AboutToExecuteScript)) {
+            WTF_LOG(Timers, "ScheduledAction::execute %p: frame can not execute scripts", this);
             return;
+        }
         execute(frame);
     } else {
+        WTF_LOG(Timers, "ScheduledAction::execute %p: worker scope", this);
         execute(toWorkerGlobalScope(context));
     }
 }
 
 void ScheduledAction::execute(LocalFrame* frame)
 {
-    if (m_scriptState->contextIsEmpty())
+    if (m_scriptState->contextIsValid()) {
+        WTF_LOG(Timers, "ScheduledAction::execute %p: context is empty", this);
         return;
+    }
 
     TRACE_EVENT0("v8", "ScheduledAction::execute");
     ScriptState::Scope scope(m_scriptState.get());
     if (!m_function.isEmpty()) {
+        WTF_LOG(Timers, "ScheduledAction::execute %p: have function", this);
         Vector<v8::Handle<v8::Value> > info;
         createLocalHandlesForArgs(&info);
         frame->script().callFunction(m_function.newLocal(m_scriptState->isolate()), m_scriptState->context()->Global(), info.size(), info.data());
     } else {
+        WTF_LOG(Timers, "ScheduledAction::execute %p: executing from source", this);
         frame->script().executeScriptAndReturnValue(m_scriptState->context(), ScriptSourceCode(m_code));
     }
 
@@ -102,7 +112,7 @@ void ScheduledAction::execute(LocalFrame* frame)
 void ScheduledAction::execute(WorkerGlobalScope* worker)
 {
     ASSERT(worker->thread()->isCurrentThread());
-    ASSERT(!m_scriptState->contextIsEmpty());
+    ASSERT(!m_scriptState->contextIsValid());
     if (!m_function.isEmpty()) {
         ScriptState::Scope scope(m_scriptState.get());
         Vector<v8::Handle<v8::Value> > info;