Make v8 inspector not crash

sky/engine/v8_inspector/InjectedScriptManager.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/v8_inspector/InjectedScriptManager.h"
 
 #include "sky/engine/bindings/core/v8/ScriptValue.h"
 #include "sky/engine/core/inspector/InjectedScriptHost.h"
 #include "sky/engine/platform/JSONValues.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/public/platform/WebData.h"
 #include "sky/engine/v8_inspector/InjectedScript.h"
 #include "sky/engine/v8_inspector/JSONParser.h"
+#include "sky/engine/v8_inspector/read_from_source_tree.h"
 #include "sky/engine/wtf/PassOwnPtr.h"
 
 namespace blink {
 
 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
 {
     return adoptPtr(new InjectedScriptManager);
 }
 
 InjectedScriptManager::InjectedScriptManager()
@@ skipping 89 matching lines @@
     keys.appendRange(m_idToInjectedScript.keys().begin(), m_idToInjectedScript.keys().end());
     for (Vector<int>::iterator k = keys.begin(); k != keys.end(); ++k) {
         IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(*k);
         if (s != m_idToInjectedScript.end())
             s->value.releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
     }
 }
 
 String InjectedScriptManager::injectedScriptSource()
 {
-    const blink::WebData& injectedScriptSourceResource = blink::Platform::current()->loadResource("InjectedScriptSource.js");
-    return String(injectedScriptSourceResource.data(), injectedScriptSourceResource.size());
+    std::string buffer;
+    inspector::ReadFileFromSourceTree("InjectedScriptSource.js", &buffer);
+    return String::fromUTF8(buffer);
 }
 
 InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState* inspectedScriptState)
 {
     ScriptStateToId::iterator it = m_scriptStateToId.find(inspectedScriptState);
     if (it != m_scriptStateToId.end()) {
         IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->value);
         if (it1 != m_idToInjectedScript.end())
             return it1->value;
     }
 
     int id = injectedScriptIdFor(inspectedScriptState);
     ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), inspectedScriptState, id);
     InjectedScript result(injectedScriptValue);
     m_idToInjectedScript.set(id, result);
 
     // TODO(yurys): InjecedScript should be available as a regular module rather that using a global variable.
     v8::Isolate* isolate = inspectedScriptState->isolate();
     v8::Local<v8::Object> global = inspectedScriptState->context()->Global();
     global->Set(v8::String::NewFromUtf8(isolate, "injectedScript"), injectedScriptValue.v8ValueUnsafe());
     return result;
 }
 
 } // namespace blink