| Index: Source/bindings/v8/V8Binding.cpp
|
| diff --git a/Source/bindings/v8/V8Binding.cpp b/Source/bindings/v8/V8Binding.cpp
|
| index 88192b78c1754962653549e4a784cd6ae0fe0b84..89d3abdff0c4704a4547d82c382f058f0ad1e549 100644
|
| --- a/Source/bindings/v8/V8Binding.cpp
|
| +++ b/Source/bindings/v8/V8Binding.cpp
|
| @@ -527,7 +527,7 @@ PassRefPtrWillBeRawPtr<XPathNSResolver> toXPathNSResolver(v8::Handle<v8::Value>
|
| return resolver;
|
| }
|
|
|
| -DOMWindow* toDOMWindow(v8::Handle<v8::Value> value, v8::Isolate* isolate)
|
| +LocalDOMWindow* toDOMWindow(v8::Handle<v8::Value> value, v8::Isolate* isolate)
|
| {
|
| if (value.IsEmpty() || !value->IsObject())
|
| return 0;
|
| @@ -538,16 +538,16 @@ DOMWindow* toDOMWindow(v8::Handle<v8::Value> value, v8::Isolate* isolate)
|
| return 0;
|
| }
|
|
|
| -DOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
|
| +LocalDOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
|
| {
|
| if (context.IsEmpty())
|
| return 0;
|
| return toDOMWindow(context->Global(), context->GetIsolate());
|
| }
|
|
|
| -DOMWindow* enteredDOMWindow(v8::Isolate* isolate)
|
| +LocalDOMWindow* enteredDOMWindow(v8::Isolate* isolate)
|
| {
|
| - DOMWindow* window = toDOMWindow(isolate->GetEnteredContext());
|
| + LocalDOMWindow* window = toDOMWindow(isolate->GetEnteredContext());
|
| if (!window) {
|
| // We don't always have an entered DOM window, for example during microtask callbacks from V8
|
| // (where the entered context may be the DOM-in-JS context). In that case, we fall back
|
| @@ -558,12 +558,12 @@ DOMWindow* enteredDOMWindow(v8::Isolate* isolate)
|
| return window;
|
| }
|
|
|
| -DOMWindow* currentDOMWindow(v8::Isolate* isolate)
|
| +LocalDOMWindow* currentDOMWindow(v8::Isolate* isolate)
|
| {
|
| return toDOMWindow(isolate->GetCurrentContext());
|
| }
|
|
|
| -DOMWindow* callingDOMWindow(v8::Isolate* isolate)
|
| +LocalDOMWindow* callingDOMWindow(v8::Isolate* isolate)
|
| {
|
| v8::Handle<v8::Context> context = isolate->GetCallingContext();
|
| if (context.IsEmpty()) {
|
| @@ -607,7 +607,7 @@ ExecutionContext* callingExecutionContext(v8::Isolate* isolate)
|
|
|
| LocalFrame* toFrameIfNotDetached(v8::Handle<v8::Context> context)
|
| {
|
| - DOMWindow* window = toDOMWindow(context);
|
| + LocalDOMWindow* window = toDOMWindow(context);
|
| if (window && window->isCurrentlyDisplayedInFrame())
|
| return window->frame();
|
| // We return 0 here because |context| is detached from the LocalFrame. If we
|
|
|