Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / PageDebuggerAgent.cpp

diff --git a/src/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp b/src/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp
index c5dba5d..3c150dd 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp
+++ b/src/third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp
@@ -121,7 +121,10 @@ InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString
 {
     if (!executionContextId) {
         ScriptState* scriptState = ScriptState::forMainWorld(m_pageAgent->mainFrame());
-        return injectedScriptManager()->injectedScriptFor(scriptState);
+        InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
+        if (result.isEmpty())
+            *errorString = "Internal error: main world execution context not found.";
+        return result;
     }
     InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
     if (injectedScript.isEmpty())