Check if the context is properly initialized before retrieving its script state.

Source/bindings/v8/V8DOMActivityLogger.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "bindings/v8/V8DOMActivityLogger.h"
 
 #include "bindings/v8/V8Binding.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/HashMap.h"
@@ skipping 57 matching lines @@
 
     return activityLogger(worldId, url.host());
 }
 
 V8DOMActivityLogger* V8DOMActivityLogger::currentActivityLogger()
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     if (!isolate->InContext())
         return 0;
 
-    V8PerContextData* contextData = ScriptState::current(isolate)->perContextData();
+    v8::Handle<v8::Context> context = isolate->GetCurrentContext();
+    if (context.IsEmpty() || !toDOMWindow(context))
+        return 0;
+
+    V8PerContextData* contextData = ScriptState::from(context)->perContextData();
     if (!contextData)
         return 0;
 
     return contextData->activityLogger();
 }
 
 V8DOMActivityLogger* V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld()
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     if (!isolate->InContext())
         return 0;
 
-    ScriptState* scriptState = ScriptState::current(isolate);
+    v8::Handle<v8::Context> context = isolate->GetCurrentContext();
+    if (context.IsEmpty() || !toDOMWindow(context))
+        return 0;
+
+    ScriptState* scriptState = ScriptState::from(context);
     if (!scriptState->world().isIsolatedWorld())
         return 0;
 
     V8PerContextData* contextData = scriptState->perContextData();
     if (!contextData)
         return 0;
 
     return contextData->activityLogger();
 }
 
 } // namespace WebCore