Apply script preprocessor to Web page scripts only.

Source/bindings/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-2011 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:
  *
  *     * 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
@@ skipping 23 matching lines @@
 
 #include "DebuggerScriptSource.h"
 #include "V8JavaScriptCallFrame.h"
 #include "bindings/v8/JavaScriptCallFrame.h"
 #include "bindings/v8/ScopedPersistent.h"
 #include "bindings/v8/ScriptObject.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8RecursionScope.h"
 #include "core/inspector/ScriptDebugListener.h"
 #include "wtf/StdLibExtras.h"
+#include "wtf/StringExtras.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 namespace {
 
 class ClientDataImpl : public v8::Debug::ClientData {
 public:
     ClientDataImpl(PassOwnPtr<ScriptDebugServer::Task> task) : m_task(task) { }
     virtual ~ClientDataImpl() { }
@@ skipping 24 matching lines @@
 v8::Local<v8::Value> ScriptDebugServer::callDebuggerMethod(const char* functionName, int argc, v8::Handle<v8::Value> argv[])
 {
     v8::Handle<v8::Function> function = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::NewSymbol(functionName)));
     V8RecursionScope::MicrotaskSuppression scope;
     return function->Call(m_debuggerScript.get(), argc, argv);
 }
 
 class ScriptDebugServer::ScriptPreprocessor {
     WTF_MAKE_NONCOPYABLE(ScriptPreprocessor);
 public:
+
     explicit ScriptPreprocessor(const String& preprocessorScript)
     {
         v8::HandleScope scope;
 
         m_utilityContext.set(v8::Context::New());
         if (m_utilityContext.isEmpty())
             return;
 
         v8::Context::Scope contextScope(m_utilityContext.get());
 
@@ skipping 32 matching lines @@
 
         v8::TryCatch tryCatch;
         RecursionScopeSuppression suppressionScope;
         v8::Handle<v8::Value> resultValue = m_preprocessorFunction->Call(context->Global(), 2, argv);
 
         if (tryCatch.HasCaught())
             return sourceCode;
 
         if (resultValue->IsString()) {
             v8::String::Utf8Value utf8Value(resultValue);
-            return String::fromUTF8(*utf8Value, utf8Value.length());
+
+            String preprocessed = String::fromUTF8(*utf8Value, utf8Value.length());
+            // Zero bytes crash the page if we are preprocessing injectedScripts
+            if (preprocessed.length() == 0)
+                return sourceCode;
+
+            return preprocessed;
         }
 
         return sourceCode;
     }
 
     ~ScriptPreprocessor()
     {
     }
 
 private:
@@ skipping 300 matching lines @@
     ASSERT(!eventContext.IsEmpty());
 
     ScriptDebugListener* listener = getDebugListenerForContext(eventContext);
     if (listener) {
         v8::HandleScope scope;
         if (event == v8::BeforeCompile) {
 
             if (!m_scriptPreprocessor)
                 return;
 
+            // Don't preprocess debugger scripts or content scripts
+            if (V8PerContextDebugData::isSystemScope(eventContext) || V8PerContextDebugData::contextCategory(eventContext) == "injected")

[pfeldman, 2013/05/01 07:33:55]

Please introduce constant for this so that we could track where it is set. Also,
can we make injected contexts have system scope instead?

+                return;
+
             OwnPtr<ScriptPreprocessor> preprocessor(m_scriptPreprocessor.release());
+
             v8::Local<v8::Context> debugContext = v8::Debug::GetDebugContext();
             v8::Context::Scope contextScope(debugContext);
             v8::Handle<v8::Function> getScriptSourceFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("getScriptSource")));
             v8::Handle<v8::Value> argv[] = { eventDetails.GetEventData() };
             v8::Handle<v8::Value> script = getScriptSourceFunction->Call(m_debuggerScript.get(), 1, argv);
 
             v8::Handle<v8::Function> getScriptNameFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("getScriptName")));
             v8::Handle<v8::Value> argv1[] = { eventDetails.GetEventData() };
             v8::Handle<v8::Value> scriptName = getScriptNameFunction->Call(m_debuggerScript.get(), 1, argv1);
 
+            v8::String::Utf8Value scriptNameUtf8Value(scriptName);
+            String scriptNameString = String::fromUTF8(*scriptNameUtf8Value, scriptNameUtf8Value.length());
+            if (scriptNameString.contains("data:text/html,chromewebdata"))

[pfeldman, 2013/05/01 07:33:55]

You can't say "chromewebdata" from blink which is presumable Chrome-unaware.
Same thing, can it be system?

+                return;
+
             v8::Handle<v8::Function> setScriptSourceFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("setScriptSource")));
-            String patchedScript = preprocessor->preprocessSourceCode(toWebCoreStringWithUndefinedOrNullCheck(script), toWebCoreStringWithUndefinedOrNullCheck(scriptName));
+            String patchedScript = preprocessor->preprocessSourceCode(toWebCoreStringWithUndefinedOrNullCheck(script), scriptNameString);
 
             v8::Handle<v8::Value> argv2[] = { eventDetails.GetEventData(), v8String(patchedScript, debugContext->GetIsolate()) };
             setScriptSourceFunction->Call(m_debuggerScript.get(), 2, argv2);
             m_scriptPreprocessor = preprocessor.release();
         } else if (event == v8::AfterCompile) {
             v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
             v8::Handle<v8::Function> onAfterCompileFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::NewSymbol("getAfterCompileScript")));
             v8::Handle<v8::Value> argv[] = { eventDetails.GetEventData() };
             v8::Handle<v8::Value> value = onAfterCompileFunction->Call(m_debuggerScript.get(), 1, argv);
             ASSERT(value->IsObject());
@@ skipping 149 matching lines @@
         *result = ScriptValue(tryCatch.Exception());
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
             *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
     } else
         *result = ScriptValue(value);
 }
 
 } // namespace WebCore