| Index: chrome/renderer/extensions/chrome_v8_context_set.cc
|
| diff --git a/chrome/renderer/extensions/chrome_v8_context_set.cc b/chrome/renderer/extensions/chrome_v8_context_set.cc
|
| index 40b6fe1db9c25c318095cbf308a14cb3dee3fb71..391f3ad49d44e34c37c5fa65ede03a1f92f601b2 100644
|
| --- a/chrome/renderer/extensions/chrome_v8_context_set.cc
|
| +++ b/chrome/renderer/extensions/chrome_v8_context_set.cc
|
| @@ -60,12 +60,14 @@ ChromeV8ContextSet::ContextSet ChromeV8ContextSet::GetAll() const {
|
| }
|
|
|
| ChromeV8Context* ChromeV8ContextSet::GetCurrent() const {
|
| - return v8::Context::InContext() ?
|
| - GetByV8Context(v8::Context::GetCurrent()) : NULL;
|
| + v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| + return isolate->InContext() ? GetByV8Context(isolate->GetCurrentContext())
|
| + : NULL;
|
| }
|
|
|
| ChromeV8Context* ChromeV8ContextSet::GetCalling() const {
|
| - v8::Local<v8::Context> calling = v8::Context::GetCalling();
|
| + v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| + v8::Local<v8::Context> calling = isolate->GetCallingContext();
|
| return calling.IsEmpty() ? NULL : GetByV8Context(calling);
|
| }
|
|
|
|
|