Apply script preprocessor to Web page scripts only.

Source/bindings/v8/ScriptPreprocessor.cpp

Index: Source/bindings/v8/ScriptPreprocessor.cpp
diff --git a/Source/bindings/v8/ScriptPreprocessor.cpp b/Source/bindings/v8/ScriptPreprocessor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..aa52992db89c11f0687825b3453471adaf395f4e
--- /dev/null
+++ b/Source/bindings/v8/ScriptPreprocessor.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Apple 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 "config.h"
+#include "bindings/v8/ScriptPreprocessor.h"
+
+#include "bindings/v8/ScriptController.h"
+#include "bindings/v8/ScriptSourceCode.h"
+#include "bindings/v8/ScriptValue.h"
+#include "bindings/v8/V8Binding.h"
+#include "bindings/v8/V8ScriptRunner.h"
+#include "bindings/v8/V8WindowShell.h"
+#include "core/page/DOMWindow.h"
+#include "core/page/Frame.h"
+#include "core/page/Page.h"
+#include "core/page/PageConsole.h"
+#include "wtf/TemporaryChange.h"
+
+namespace WebCore {
+
+ScriptPreprocessor::ScriptPreprocessor(const String& preprocessorScript, ScriptController* controller, PageConsole* console)
+    : m_controller(controller)
+    , m_isPreprocessing(false)
+{
+    v8::TryCatch tryCatch;
+    tryCatch.SetVerbose(true);
+    ScriptSourceCode preprocessor(preprocessorScript);
+    Vector<ScriptSourceCode> sources;
+    sources.append(preprocessor);
+    Vector<ScriptValue> scriptResults;
+    controller->executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorldId, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);
+
+    if (scriptResults.size() != 1) {
+        console->addMessage(JSMessageSource, ErrorMessageLevel, "ScriptPreprocessor internal error, one ScriptSourceCode must give exactly one result.");
+        return;
+    }
+
+    ScriptValue preprocessorFunction = scriptResults[0];
+    if (!preprocessorFunction.isFunction()) {
+        console->addMessage(JSMessageSource, ErrorMessageLevel, "The preprocessor must compile to a function.");
+        return;
+    }
+
+    v8::Local<v8::Context> context = isolatedWorldContext();
+    v8::Isolate* isolate = context->GetIsolate();

[haraken, 2013/07/11 01:13:59]

Instead of looking up the Isolate every time, you can pass an Isolate when
constructing ScriptPreprocessor, store the Isolate to
ScriptPreprocessor::m_isolate, and use it afterward.

[johnjbarton, 2013/07/11 19:14:42]

Done.

+    m_preprocessorFunction.set(isolate, v8::Handle<v8::Function>::Cast(preprocessorFunction.v8Value()));
+}
+
+v8::Local<v8::Context> ScriptPreprocessor::isolatedWorldContext()

[haraken, 2013/07/11 01:13:59]

It looks wasteful to call isolatedWorldContext() and look up the context every
time ScriptPreprocessor needs a context. Conceptually, I think
ScriptPreprocessor should own the context. You can add
ScriptPreprocessor::m_context, initialize it in the constructor of
ScriptPreprocessor, and use it afterward.

[johnjbarton, 2013/07/11 19:14:42]

Done.

+{
+    RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptPreprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);
+    V8WindowShell* isolatedWorldShell = m_controller->windowShell(world.get());
+    return isolatedWorldShell->context();
+}
+
+String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const String& sourceName)
+{
+    if (m_preprocessorFunction.isEmpty())
+        return sourceCode;
+
+    v8::Local<v8::Context> context = isolatedWorldContext();
+    v8::Isolate* isolate(context->GetIsolate());
+    v8::HandleScope handleScope(isolate);
+    v8::Context::Scope contextScope(context);
+
+    v8::Handle<v8::String> sourceCodeString = v8String(sourceCode, isolate);
+    v8::Handle<v8::String> sourceNameString = v8String(sourceName, isolate);
+    v8::Handle<v8::Value> argv[] = { sourceCodeString, sourceNameString };
+
+    v8::TryCatch tryCatch;
+    tryCatch.SetVerbose(true);
+    TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);
+    v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(m_preprocessorFunction.newLocal(isolate), context->Global(), WTF_ARRAY_LENGTH(argv), argv);
+
+    if (!resultValue.IsEmpty() && resultValue->IsString())
+        return toWebCoreStringWithNullCheck(resultValue);
+
+    return sourceCode;
+}
+
+bool ScriptPreprocessor::hasPreprocessorFunction()
+{
+    return !m_preprocessorFunction.isEmpty();
+}
+
+bool ScriptPreprocessor::isPreprocessing()
+{
+    return m_isPreprocessing;
+}
+
+} // namespace WebCore