WIP enum / V8PerContextData solution

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 21 matching lines @@
 #include "ScriptDebugServer.h"
 
 
 #include "DebuggerScriptSource.h"
 #include "JavaScriptCallFrame.h"
 #include "ScopedPersistent.h"
 #include "ScriptDebugListener.h"
 #include "ScriptObject.h"
 #include "V8Binding.h"
 #include "V8JavaScriptCallFrame.h"
+#include "V8PerContextDebugData.h"
 #include "V8RecursionScope.h"
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 namespace {
 
 class ClientDataImpl : public v8::Debug::ClientData {
 public:
@@ skipping 33 matching lines @@
 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;
-
+        
+        V8PerContextDebugData::setDebugDataForSystemUtility(m_utilityContext.get());
+        
         v8::Context::Scope contextScope(m_utilityContext.get());
 
         v8::TryCatch tryCatch;
 
         String wrappedScript = makeString("(", preprocessorScript, ")");
         v8::Handle<v8::String> preprocessor = v8::String::New(wrappedScript.utf8().data(), wrappedScript.utf8().length());
 
         v8::Handle<v8::Script> script = v8::Script::Compile(preprocessor);
 
         if (tryCatch.HasCaught())
@@ skipping 363 matching lines @@
             v8::Handle<v8::Value> argv1[] = { eventDetails.GetEventData() };
             v8::Handle<v8::Value> scriptName = getScriptNameFunction->Call(m_debuggerScript.get(), 1, argv1);
 
             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));
 
             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());
-            v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
-            dispatchDidParseSource(listener, object);
+            onAfterCompile(listener, eventDetails);
         } else if (event == v8::Break || event == v8::Exception) {
             v8::Handle<v8::Value> exception;
             if (event == v8::Exception) {
                 v8::Local<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(1);
                 // Stack trace is empty in case of syntax error. Silently continue execution in such cases.
                 if (!stackTrace->GetFrameCount())
                     return;
                 v8::Handle<v8::Object> eventData = eventDetails.GetEventData();
                 v8::Handle<v8::Value> exceptionGetterValue = eventData->Get(v8::String::NewSymbol("exception"));
                 ASSERT(!exceptionGetterValue.IsEmpty() && exceptionGetterValue->IsFunction());
                 v8::Handle<v8::Value> argv[] = { v8Undefined() };
                 V8RecursionScope::MicrotaskSuppression scope;
                 exception = v8::Handle<v8::Function>::Cast(exceptionGetterValue)->Call(eventData, 0, argv);
             }
 
             m_pausedContext = *eventContext;
             breakProgram(eventDetails.GetExecutionState(), exception);
             m_pausedContext.Clear();
         }
     }
 }
 
+void ScriptDebugServer::onAfterCompile(ScriptDebugListener* listener, const v8::Debug::EventDetails& eventDetails)
+{
+    v8::HandleScope scope;
+    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());
+    v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
+    dispatchDidParseSource(listener, object);
+}
+
 void ScriptDebugServer::dispatchDidParseSource(ScriptDebugListener* listener, v8::Handle<v8::Object> object)
 {
+
     String sourceID = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8::String::NewSymbol("id")));
 
     ScriptDebugListener::Script script;
     script.url = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8::String::NewSymbol("name")));
     script.source = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8::String::NewSymbol("source")));
     script.sourceMappingURL = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8::String::NewSymbol("sourceMappingURL")));
     script.startLine = object->Get(v8::String::NewSymbol("startLine"))->ToInteger()->Value();
     script.startColumn = object->Get(v8::String::NewSymbol("startColumn"))->ToInteger()->Value();
     script.endLine = object->Get(v8::String::NewSymbol("endLine"))->ToInteger()->Value();
     script.endColumn = object->Get(v8::String::NewSymbol("endColumn"))->ToInteger()->Value();
@@ skipping 113 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