WIP enum / V8PerContextData solution

Source/bindings/v8/ScriptController.cpp

 /*
  * 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.
@@ skipping 254 matching lines @@
         // Compile the script.
         v8::Handle<v8::String> code = v8String(source.source(), m_isolate);
         TRACE_EVENT_BEGIN0("v8", "v8.compile");
         OwnPtr<v8::ScriptData> scriptData = ScriptSourceCode::precompileScript(code, source.cachedScript());
 
         // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at
         // 1, whereas v8 starts at 0.
         v8::Handle<v8::Script> script = ScriptSourceCode::compileScript(code, source.url(), source.startPosition(), scriptData.get(), m_isolate);
         TRACE_EVENT_END0("v8", "v8.compile");
         TRACE_EVENT0("v8", "v8.run");
-
+ 
         // Keep Frame (and therefore ScriptController) alive.
         RefPtr<Frame> protect(m_frame);
         result = ScriptRunner::runCompiledScript(script, m_frame->document());
         ASSERT(!tryCatch.HasCaught() || result.IsEmpty());
     }
 
     InspectorInstrumentation::didEvaluateScript(cookie);
 
     return result;
 }
@@ skipping 385 matching lines @@
     }
 }
 
 bool ScriptController::setContextDebugId(int debugId)
 {
     ASSERT(debugId > 0);
     if (!m_windowShell->isContextInitialized())
         return false;
     v8::HandleScope scope;
     v8::Handle<v8::Context> context = m_windowShell->context();
-    return V8PerContextDebugData::setContextDebugData(context, "page", debugId);
+    V8PerContextDebugData::setDebugDataForPage(context, debugId);
+    return true;
 }
 
 int ScriptController::contextDebugId(v8::Handle<v8::Context> context)
 {
-    return V8PerContextDebugData::contextDebugId(context);
+    return V8PerContextDebugData::debugId(context);
 }
 
 void ScriptController::updateDocument()
 {
     // For an uninitialized main window shell, do not incur the cost of context initialization during FrameLoader::init().
     if ((!m_windowShell->isContextInitialized() || !m_windowShell->isGlobalInitialized()) && m_frame->loader()->stateMachine()->creatingInitialEmptyDocument())
         return;
 
     if (!initializeMainWorld())
         windowShell(mainThreadNormalWorld())->updateDocument();
@@ skipping 83 matching lines @@
         
         // DocumentWriter::replaceDocument can cause the DocumentLoader to get deref'ed and possible destroyed,
         // so protect it with a RefPtr.
         if (RefPtr<DocumentLoader> loader = m_frame->document()->loader())
             loader->writer()->replaceDocument(scriptResult, ownerDocument.get());
     }
     return true;
 }
 
 } // namespace WebCore