Extract a DOMWindow interface from LocalDOMWindow and use it in the idl.

Source/bindings/core/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 30 matching lines @@
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/V8WorkerGlobalScope.h"
 #include "bindings/core/v8/V8XPathNSResolver.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "bindings/core/v8/WorkerScriptController.h"
 #include "bindings/core/v8/custom/V8CustomXPathNSResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeFilter.h"
 #include "core/dom/QualifiedName.h"
+#include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/BindingVisitors.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/xml/XPathNSResolver.h"
 #include "platform/EventTracer.h"
 #include "platform/JSONValues.h"
@@ skipping 627 matching lines @@
 PassRefPtrWillBeRawPtr<XPathNSResolver> toXPathNSResolver(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     RefPtrWillBeRawPtr<XPathNSResolver> resolver = nullptr;
     if (V8XPathNSResolver::hasInstance(value, isolate))
         resolver = V8XPathNSResolver::toImpl(v8::Handle<v8::Object>::Cast(value));
     else if (value->IsObject())
         resolver = V8CustomXPathNSResolver::create(value->ToObject(), isolate);
     return resolver;
 }
 
-LocalDOMWindow* toDOMWindow(v8::Handle<v8::Value> value, v8::Isolate* isolate)
+DOMWindow* toDOMWindow(v8::Handle<v8::Value> value, v8::Isolate* isolate)
 {
     if (value.IsEmpty() || !value->IsObject())
         return 0;
 
     v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(v8::Handle<v8::Object>::Cast(value), isolate);
     if (!windowWrapper.IsEmpty())
         return V8Window::toImpl(windowWrapper);
     return 0;
 }
 
-LocalDOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
+DOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
 {
     if (context.IsEmpty())
         return 0;
     return toDOMWindow(context->Global(), context->GetIsolate());
 }
 
 LocalDOMWindow* enteredDOMWindow(v8::Isolate* isolate)

[haraken, 2014/10/31 06:07:04]

Rename this to enteredLocalDOMWindow in a follow-up CL.

 {
-    LocalDOMWindow* window = toDOMWindow(isolate->GetEnteredContext());
+    LocalDOMWindow* window = toLocalDOMWindow(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
         // to the current context.
         window = currentDOMWindow(isolate);
         ASSERT(window);
     }
     return window;
 }
 
 LocalDOMWindow* currentDOMWindow(v8::Isolate* isolate)

[haraken, 2014/10/31 06:07:04]

currentLocalDOMWindow

 {
-    return toDOMWindow(isolate->GetCurrentContext());
+    return toLocalDOMWindow(toDOMWindow(isolate->GetCurrentContext()));
 }
 
 LocalDOMWindow* callingDOMWindow(v8::Isolate* isolate)

[haraken, 2014/10/31 06:07:04]

callingLocalDOMWindow

 {
     v8::Handle<v8::Context> context = isolate->GetCallingContext();
     if (context.IsEmpty()) {
         // Unfortunately, when processing script from a plug-in, we might not
         // have a calling context. In those cases, we fall back to the
         // entered context.
         context = isolate->GetEnteredContext();
     }
-    return toDOMWindow(context);
+    return toLocalDOMWindow(toDOMWindow(context));
 }
 
 ExecutionContext* toExecutionContext(v8::Handle<v8::Context> context)
 {
     if (context.IsEmpty())
         return 0;
     v8::Handle<v8::Object> global = context->Global();
     v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(global, context->GetIsolate());
     if (!windowWrapper.IsEmpty())
         return V8Window::toImpl(windowWrapper)->executionContext();
@@ skipping 16 matching lines @@
         // Unfortunately, when processing script from a plug-in, we might not
         // have a calling context. In those cases, we fall back to the
         // entered context.
         context = isolate->GetEnteredContext();
     }
     return toExecutionContext(context);
 }
 
 LocalFrame* toFrameIfNotDetached(v8::Handle<v8::Context> context)
 {
-    LocalDOMWindow* window = toDOMWindow(context);
+    LocalDOMWindow* window = toLocalDOMWindow(toDOMWindow(context));
     if (window && window->isCurrentlyDisplayedInFrame())
         return window->frame();
     // We return 0 here because |context| is detached from the LocalFrame. If we
     // did return |frame| we could get in trouble because the frame could be
     // navigated to another security origin.
     return 0;
 }
 
 v8::Local<v8::Context> toV8Context(ExecutionContext* context, DOMWrapperWorld& world)
 {
@@ skipping 202 matching lines @@
 
 v8::Local<v8::Value> v8IteratorResult(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     v8::Local<v8::Object> result = v8::Object::New(isolate);
     result->Set(v8String(isolate, "value"), value);
     result->Set(v8String(isolate, "done"), v8Boolean(false, isolate));
     return result;
 }
 
 } // namespace blink