Reland [blink-in-js] Migrate resources required for blink-in-js to grd - part 3

Source/bindings/core/v8/PrivateScriptRunner.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/core/v8/PrivateScriptRunner.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "core/PrivateScriptSources.h"
 #ifndef NDEBUG
 #include "core/PrivateScriptSourcesForTesting.h"
 #endif
 #include "core/dom/ExceptionCode.h"
+#include "platform/PlatformResourceLoader.h"
 
 namespace blink {
 
 static void dumpV8Message(v8::Handle<v8::Message> message)
 {
     if (message.IsEmpty())
         return;
 
     // FIXME: GetScriptOrigin() and GetLineNumber() return empty handles
     // when they are called at the first time if V8 has a pending exception.
     // So we need to call twice to get a correct ScriptOrigin and line number.
     // This is a bug of V8.
     message->GetScriptOrigin();
     message->GetLineNumber();
 
     v8::Handle<v8::Value> resourceName = message->GetScriptOrigin().ResourceName();
     String fileName = "Unknown JavaScript file";
     if (!resourceName.IsEmpty() && resourceName->IsString())
         fileName = toCoreString(v8::Handle<v8::String>::Cast(resourceName));
     int lineNumber = message->GetLineNumber();
     v8::Handle<v8::String> errorMessage = message->Get();
     fprintf(stderr, "%s (line %d): %s\n", fileName.utf8().data(), lineNumber, toCoreString(errorMessage).utf8().data());
 }
 
-static v8::Handle<v8::Value> compileAndRunPrivateScript(v8::Isolate* isolate, String scriptClassName, const unsigned char* source, size_t size)
+static v8::Handle<v8::Value> compileAndRunPrivateScript(v8::Isolate* isolate, String scriptClassName, const char* source, size_t size)
 {
     v8::TryCatch block;
-    String sourceString(reinterpret_cast<const char*>(source), size);
+    String sourceString(source, size);
     String fileName = scriptClassName + ".js";
     v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(v8String(isolate, sourceString), fileName, TextPosition::minimumPosition(), 0, isolate, NotSharableCrossOrigin, V8CacheOptionsOff);
     if (block.HasCaught()) {
         fprintf(stderr, "Private script error: Compile failed. (Class name = %s)\n", scriptClassName.utf8().data());
         dumpV8Message(block.Message());
         RELEASE_ASSERT_NOT_REACHED();
     }
 
     v8::Handle<v8::Value> result = V8ScriptRunner::runCompiledInternalScript(script, isolate);
     if (block.HasCaught()) {
@@ skipping 19 matching lines @@
             compileAndRunPrivateScript(isolate, kPrivateScriptSourcesForTesting[index].scriptClassName, kPrivateScriptSourcesForTesting[index].source, kPrivateScriptSourcesForTesting[index].size);
             compiledScriptCount++;
         }
     }
 #endif
 
     // |kPrivateScriptSources| is defined in V8PrivateScriptSources.h, which is auto-generated
     // by make_private_script_source.py.
     for (size_t index = 0; index < WTF_ARRAY_LENGTH(kPrivateScriptSources); index++) {
         if (className == kPrivateScriptSources[index].className) {
-            compileAndRunPrivateScript(isolate, kPrivateScriptSources[index].scriptClassName, kPrivateScriptSources[index].source, kPrivateScriptSources[index].size);
+            String resourceData = loadResourceAsASCIIString(kPrivateScriptSources[index].resourceFile);
+            compileAndRunPrivateScript(isolate, kPrivateScriptSources[index].scriptClassName, resourceData.utf8().data(), resourceData.length());
             compiledScriptCount++;
         }
     }
 
     if (!compiledScriptCount) {
         fprintf(stderr, "Private script error: Target source code was not found. (Class name = %s)\n", className.utf8().data());
         RELEASE_ASSERT_NOT_REACHED();
     }
 }
 
 static v8::Handle<v8::Value> installPrivateScriptRunner(v8::Isolate* isolate)
 {
     const String className = "PrivateScriptRunner";
     size_t index;
     // |kPrivateScriptSources| is defined in V8PrivateScriptSources.h, which is auto-generated
     // by make_private_script_source.py.
     for (index = 0; index < WTF_ARRAY_LENGTH(kPrivateScriptSources); index++) {
         if (className == kPrivateScriptSources[index].className)
             break;
     }
     if (index == WTF_ARRAY_LENGTH(kPrivateScriptSources)) {
         fprintf(stderr, "Private script error: Target source code was not found. (Class name = %s)\n", className.utf8().data());
         RELEASE_ASSERT_NOT_REACHED();
     }
-    return compileAndRunPrivateScript(isolate, className, kPrivateScriptSources[index].source, kPrivateScriptSources[index].size);
+    String resourceData = loadResourceAsASCIIString(kPrivateScriptSources[index].resourceFile);
+    return compileAndRunPrivateScript(isolate, className, resourceData.utf8().data(), resourceData.length());
 }
 
 static v8::Handle<v8::Object> classObjectOfPrivateScript(ScriptState* scriptState, String className)
 {
     ASSERT(scriptState->perContextData());
     ASSERT(scriptState->executionContext());
     v8::Isolate* isolate = scriptState->isolate();
     v8::Handle<v8::Value> compiledClass = scriptState->perContextData()->compiledPrivateScript(className);
     if (compiledClass.IsEmpty()) {
         v8::Handle<v8::Value> installedClasses = scriptState->perContextData()->compiledPrivateScript("PrivateScriptRunner");
@@ skipping 142 matching lines @@
         exceptionState.throwIfNeeded();
         return;
     }
 
     fprintf(stderr, "Private script error: %s was thrown.\n", exceptionName.utf8().data());
     dumpV8Message(tryCatchMessage);
     RELEASE_ASSERT_NOT_REACHED();
 }
 
 } // namespace blink