messageHandlerInMainThread should return immediately if there is no entered window

third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp

Index: third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
index d3328f9ec6971f6f808b6da3a8d8d0b02b3b6dab..e1daa8b6142fe0ccaa73b875c176a505a0a91c1a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp
@@ -137,7 +137,8 @@ static void messageHandlerInMainThread(v8::Local<v8::Message> message, v8::Local
     ASSERT(isMainThread());
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     // If called during context initialization, there will be no entered window.
-    LocalDOMWindow* enteredWindow = enteredDOMWindow(isolate);
+    // TODO(haraken): Add a helper method to get an entered window that may be null.
+    LocalDOMWindow* enteredWindow = toLocalDOMWindow(toDOMWindow(isolate->GetEnteredContext()));
     if (!enteredWindow || !enteredWindow->isCurrentlyDisplayedInFrame())
         return;