Fix DevTools support of worklets

third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

 /*
  * Copyright (c) 2011 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 171 matching lines @@
     FrameConsole::mute();
 }
 
 void MainThreadDebugger::unmuteConsole()
 {
     FrameConsole::unmute();
 }
 
 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> calling, v8::Local<v8::Context> target)
 {
-    ExecutionContext* executionContext = toExecutionContext(target);
-    ASSERT(executionContext);
+    ExecutionContext* targetExecutionContext = toExecutionContext(target);
+    DCHECK(targetExecutionContext);
 
-    if (executionContext->isMainThreadWorkletGlobalScope()) {
-        MainThreadWorkletGlobalScope* globalScope = toMainThreadWorkletGlobalScope(executionContext);
-        return globalScope && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMWindow(toDOMWindow(calling)), globalScope, DoNotReportSecurityError);
-    }
+    ExecutionContext* callingExecutionContext = toExecutionContext(calling);
+    DCHECK(callingExecutionContext);
+
+    if (targetExecutionContext->isMainThreadWorkletGlobalScope())

[dgozman, 2016/06/28 19:21:00]

I'd even let BindingSecurity do these if checks for us, and introduce
BindingSecurity::shouldAllowAccessTo(v8::Isolate*, ExecutionContext* calling,
ExecutionContext* target)

[Gleb Lanbin, 2016/06/28 19:51:37]

discussed offline. moved the entire logic to BindingSecurity as suggested by
dgozman@.

+        return BindingSecurity::shouldAllowAccessTo(m_isolate, calling, callingExecutionContext, toMainThreadWorkletGlobalScope(targetExecutionContext), DoNotReportSecurityError);
+
+    if (callingExecutionContext->isMainThreadWorkletGlobalScope())
+        return BindingSecurity::shouldAllowAccessTo(m_isolate, target, targetExecutionContext, toMainThreadWorkletGlobalScope(callingExecutionContext), DoNotReportSecurityError);
 
     DOMWindow* window = toDOMWindow(target);
     return window && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMWindow(toDOMWindow(calling)), window, DoNotReportSecurityError);
 }
 
 int MainThreadDebugger::ensureDefaultContextInGroup(int contextGroupId)
 {
     LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
     if (!frame)
         return 0;
@@ skipping 130 matching lines @@
                 return;
             if (!nodes->Set(context, index++, toV8(node, info.Holder(), info.GetIsolate())).FromMaybe(false))
                 return;
         }
         info.GetReturnValue().Set(nodes);
     }
     exceptionState.throwIfNeeded();
 }
 
 } // namespace blink