Replace Context::Scope with ScriptState::Scope

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 319 matching lines @@
         currentCallFrameV8 = callDebuggerMethod("currentCallFrame", WTF_ARRAY_LENGTH(argv), argv);
     }
     ASSERT(!currentCallFrameV8.IsEmpty());
     if (!currentCallFrameV8->IsObject())
         return PassRefPtr<JavaScriptCallFrame>();
     return JavaScriptCallFrame::create(v8::Debug::GetDebugContext(), v8::Handle<v8::Object>::Cast(currentCallFrameV8));
 }
 
 ScriptValue ScriptDebugServer::currentCallFramesInner(ScopeInfoDetails scopeDetails)
 {
-    v8::HandleScope scope(m_isolate);
+    v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> pausedContext = m_pausedContext.IsEmpty() ? m_isolate->GetCurrentContext() : m_pausedContext;

[adamk, 2014/05/30 19:59:22]

Should m_pausedContext be a ScriptState?

[haraken, 2014/06/02 01:14:50]

Done.

     if (pausedContext.IsEmpty())
         return ScriptValue();
 
     RefPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(0, scopeDetails);
     if (!currentCallFrame)
         return ScriptValue();
 
-    v8::Context::Scope contextScope(pausedContext);
-    return ScriptValue(ScriptState::from(pausedContext), toV8(currentCallFrame.release(), v8::Handle<v8::Object>(), pausedContext->GetIsolate()));
+    ScriptState* scriptState = ScriptState::from(pausedContext);
+    ScriptState::Scope scope(scriptState);
+    return ScriptValue(scriptState, toV8(currentCallFrame.release(), scriptState->context()->Global(), pausedContext->GetIsolate()));
 }
 
 ScriptValue ScriptDebugServer::currentCallFrames()
 {
     return currentCallFramesInner(AllScopes);
 }
 
 ScriptValue ScriptDebugServer::currentCallFramesForAsyncStack()
 {
     return currentCallFramesInner(FastAsyncScopes);
@@ skipping 257 matching lines @@
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore