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 174 matching lines @@
 void MainThreadDebugger::unmuteConsole()
 {
     FrameConsole::unmute();
 }
 
 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> calling, v8::Local<v8::Context> target)
 {
     ExecutionContext* executionContext = toExecutionContext(target);
     ASSERT(executionContext);
 
     if (executionContext->isMainThreadWorkletGlobalScope()) {

[dgozman, 2016/06/27 23:12:33]

I think this code is too complicated now, and should be moved to BindingSecurity
instead. Maybe the whole method taking two contexts can live there? It's
bindings after all. Let's ask owners.

[Yuki, 2016/06/28 04:38:53]

Yes, please move this code into BindingSecurity.  BindingSecurity should be
responsible about the origin check, and we want it to be one-stop.

[Gleb Lanbin, 2016/06/28 17:58:33]

Done.

+        ExecutionContext* callingExecutionContext = toExecutionContext(calling);
+        DCHECK(callingExecutionContext);
+        DOMWindow* callingDomWindow = toDOMWindow(calling);
+        if (callingExecutionContext->isMainThreadWorkletGlobalScope()) {

[dgozman, 2016/06/27 23:13:38]

This looks pretty good. However, adding the reverse check would be even better.

[Gleb Lanbin, 2016/06/28 17:58:33]

Done.

+            Frame* callingFrame = toMainThreadWorkletGlobalScope(callingExecutionContext)->frame();
+            callingDomWindow = callingFrame ? callingFrame->domWindow() : nullptr;
+        }
         MainThreadWorkletGlobalScope* globalScope = toMainThreadWorkletGlobalScope(executionContext);
-        return globalScope && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMWindow(toDOMWindow(calling)), globalScope, DoNotReportSecurityError);
+        return globalScope && callingDomWindow && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMWindow(callingDomWindow), globalScope, 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)
@@ skipping 131 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