Make V8Binding helpers return LocalFrame/LocalDOMWindow as appropriate

third_party/WebKit/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 699 matching lines @@
   if (value.IsEmpty() || !value->IsObject())
     return 0;
 
   v8::Local<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(
       v8::Local<v8::Object>::Cast(value), isolate);
   if (!windowWrapper.IsEmpty())
     return V8Window::toImpl(windowWrapper);
   return 0;
 }
 
-DOMWindow* toDOMWindow(v8::Local<v8::Context> context) {
+LocalDOMWindow* toLocalDOMWindow(v8::Local<v8::Context> context) {
   if (context.IsEmpty())
     return 0;
-  return toDOMWindow(context->GetIsolate(), context->Global());
+  return toLocalDOMWindow(
+      toDOMWindow(context->GetIsolate(), context->Global()));
 }
 
 LocalDOMWindow* enteredDOMWindow(v8::Isolate* isolate) {
   LocalDOMWindow* window =
-      toLocalDOMWindow(toDOMWindow(isolate->GetEnteredOrMicrotaskContext()));
+      toLocalDOMWindow(isolate->GetEnteredOrMicrotaskContext());
   DCHECK(window);
   return window;
 }
 
 LocalDOMWindow* currentDOMWindow(v8::Isolate* isolate) {
-  return toLocalDOMWindow(toDOMWindow(isolate->GetCurrentContext()));
+  return toLocalDOMWindow(isolate->GetCurrentContext());
 }
 
 ExecutionContext* toExecutionContext(v8::Local<v8::Context> context) {
   if (context.IsEmpty())
     return 0;
   v8::Local<v8::Object> global = context->Global();
   v8::Local<v8::Object> windowWrapper =
       V8Window::findInstanceInPrototypeChain(global, context->GetIsolate());
   if (!windowWrapper.IsEmpty())
     return V8Window::toImpl(windowWrapper)->getExecutionContext();
   v8::Local<v8::Object> workerWrapper =
       V8WorkerGlobalScope::findInstanceInPrototypeChain(global,
                                                         context->GetIsolate());
   if (!workerWrapper.IsEmpty())
     return V8WorkerGlobalScope::toImpl(workerWrapper)->getExecutionContext();
   v8::Local<v8::Object> workletWrapper =
       V8WorkletGlobalScope::findInstanceInPrototypeChain(global,
                                                          context->GetIsolate());
   if (!workletWrapper.IsEmpty())
     return V8WorkletGlobalScope::toImpl(workletWrapper);
   // FIXME: Is this line of code reachable?
   return nullptr;
 }
 
 ExecutionContext* currentExecutionContext(v8::Isolate* isolate) {
   return toExecutionContext(isolate->GetCurrentContext());
 }
 
-Frame* toFrameIfNotDetached(v8::Local<v8::Context> context) {
-  DOMWindow* window = toDOMWindow(context);
+LocalFrame* toLocalFrameIfNotDetached(v8::Local<v8::Context> context) {
+  LocalDOMWindow* window = toLocalDOMWindow(context);
   if (window && window->isCurrentlyDisplayedInFrame())
     return window->frame();
   // We return 0 here because |context| is detached from the Frame. If we
   // did return |frame| we could get in trouble because the frame could be
   // navigated to another security origin.
   return nullptr;
 }
 
 void toFlexibleArrayBufferView(v8::Isolate* isolate,
                                v8::Local<v8::Value> value,
@@ skipping 19 matching lines @@
   } else if (context->isWorkerGlobalScope()) {
     if (WorkerOrWorkletScriptController* script =
             toWorkerOrWorkletGlobalScope(context)->scriptController()) {
       if (script->getScriptState()->contextIsValid())
         return script->getScriptState()->context();
     }
   }
   return v8::Local<v8::Context>();
 }
 
-v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) {
+v8::Local<v8::Context> toV8Context(LocalFrame* frame, DOMWrapperWorld& world) {
   if (!frame)
     return v8::Local<v8::Context>();
   v8::Local<v8::Context> context = toV8ContextEvenIfDetached(frame, world);
   if (context.IsEmpty())
     return v8::Local<v8::Context>();
   ScriptState* scriptState = ScriptState::from(context);
   if (scriptState->contextIsValid()) {
-    ASSERT(toFrameIfNotDetached(context) == frame);
+    DCHECK_EQ(frame, toLocalFrameIfNotDetached(context));
     return scriptState->context();
   }
   return v8::Local<v8::Context>();
 }
 
-v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame* frame,
+v8::Local<v8::Context> toV8ContextEvenIfDetached(LocalFrame* frame,
                                                  DOMWrapperWorld& world) {
   ASSERT(frame);
   return frame->windowProxy(world)->contextIfInitialized();
 }
 
 bool isValidEnum(const String& value,
                  const char** validValues,
                  size_t length,
                  const String& enumName,
                  ExceptionState& exceptionState) {
@@ skipping 142 matching lines @@
   if (!v8Call(v8::JSON::Parse(isolate, v8String(isolate, stringifiedJSON)),
               parsed, tryCatch)) {
     if (tryCatch.HasCaught())
       exceptionState.rethrowV8Exception(tryCatch.Exception());
   }
 
   return parsed;
 }
 
 }  // namespace blink