Worklets - Change inheritance heirarchy of WorkletGlobalScope

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 23 matching lines @@
 #include "bindings/core/v8/V8AbstractEventListener.h"
 #include "bindings/core/v8/V8ArrayBufferView.h"
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8Element.h"
 #include "bindings/core/v8/V8EventTarget.h"
 #include "bindings/core/v8/V8NodeFilter.h"
 #include "bindings/core/v8/V8NodeFilterCondition.h"
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/V8WorkerGlobalScope.h"
+#include "bindings/core/v8/V8WorkletGlobalScope.h"
 #include "bindings/core/v8/V8XPathNSResolver.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "bindings/core/v8/custom/V8CustomXPathNSResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/FlexibleArrayBufferView.h"
 #include "core/dom/NodeFilter.h"
 #include "core/dom/QualifiedName.h"
 #include "core/frame/LocalDOMWindow.h"
@@ skipping 642 matching lines @@
     v8::Local<v8::Context> context = isolate->GetCallingContext();
     if (context.IsEmpty()) {
         // Unfortunately, when processing script from a plugin, we might not
         // have a calling context. In those cases, we fall back to the
         // entered context.
         context = isolate->GetEnteredContext();
     }
     return toLocalDOMWindow(toDOMWindow(context));
 }
 
-namespace {
-ExecutionContext* (*s_toExecutionContextForModules)(v8::Local<v8::Context>) = nullptr;
-}
-
 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();
-    ASSERT(s_toExecutionContextForModules);
-    return (*s_toExecutionContextForModules)(context);
-}
-
-void registerToExecutionContextForModules(ExecutionContext* (*toExecutionContextForModules)(v8::Local<v8::Context>))
-{
-    s_toExecutionContextForModules = toExecutionContextForModules;
+    v8::Local<v8::Object> workletWrapper = V8WorkletGlobalScope::findInstanceInPrototypeChain(global, context->GetIsolate());
+    if (!workletWrapper.IsEmpty())
+        return V8WorkerGlobalScope::toImpl(workletWrapper)->getExecutionContext();

[yhirano, 2016/06/02 08:14:42]

Shouldn't this be V8WorkletGlobalScope?

[ikilpatrick, 2016/06/02 18:26:00]

Yup, done.

+    // FIXME: Is this line of code reachable?
+    return nullptr;
 }
 
 ExecutionContext* currentExecutionContext(v8::Isolate* isolate)
 {
     return toExecutionContext(isolate->GetCurrentContext());
 }
 
 ExecutionContext* enteredExecutionContext(v8::Isolate* isolate)
 {
     ExecutionContext* context = toExecutionContext(isolate->GetEnteredContext());
@@ skipping 208 matching lines @@
     v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::unwrap(data)));
 }
 
 v8::Local<v8::Value> freezeV8Object(v8::Local<v8::Value> value, v8::Isolate* isolate)
 {
     v8CallOrCrash(value.As<v8::Object>()->SetIntegrityLevel(isolate->GetCurrentContext(), v8::IntegrityLevel::kFrozen));
     return value;
 }
 
 } // namespace blink