Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp

Issue 2058133002: Fix DevTools support of worklets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move callingContextCanAccessContext to BindingSecurity Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/v8_inspector/InspectedContext.h" 5 #include "platform/v8_inspector/InspectedContext.h"
6 6
7 #include "bindings/core/v8/BindingSecurity.h"
7 #include "platform/v8_inspector/InjectedScript.h" 8 #include "platform/v8_inspector/InjectedScript.h"
8 #include "platform/v8_inspector/V8Console.h" 9 #include "platform/v8_inspector/V8Console.h"
9 #include "platform/v8_inspector/V8DebuggerImpl.h" 10 #include "platform/v8_inspector/V8DebuggerImpl.h"
10 #include "platform/v8_inspector/V8StringUtil.h" 11 #include "platform/v8_inspector/V8StringUtil.h"
11 #include "platform/v8_inspector/public/V8ContextInfo.h" 12 #include "platform/v8_inspector/public/V8ContextInfo.h"
12 #include "platform/v8_inspector/public/V8DebuggerClient.h" 13 #include "platform/v8_inspector/public/V8DebuggerClient.h"
13 14
14 namespace blink { 15 namespace blink {
15 16
16 void InspectedContext::weakCallback(const v8::WeakCallbackInfo<InspectedContext> & data) 17 void InspectedContext::weakCallback(const v8::WeakCallbackInfo<InspectedContext> & data)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 { 69 {
69 return m_debugger->isolate(); 70 return m_debugger->isolate();
70 } 71 }
71 72
72 void InspectedContext::createInjectedScript() 73 void InspectedContext::createInjectedScript()
73 { 74 {
74 DCHECK(!m_injectedScript); 75 DCHECK(!m_injectedScript);
75 v8::HandleScope handles(isolate()); 76 v8::HandleScope handles(isolate());
76 v8::Local<v8::Context> localContext = context(); 77 v8::Local<v8::Context> localContext = context();
77 v8::Local<v8::Context> callingContext = isolate()->GetCallingContext(); 78 v8::Local<v8::Context> callingContext = isolate()->GetCallingContext();
78 if (!callingContext.IsEmpty() && !m_debugger->client()->callingContextCanAcc essContext(callingContext, localContext)) 79 if (!callingContext.IsEmpty() && !BindingSecurity::callingContextCanAccessCo ntext(isolate(), callingContext, localContext, DoNotReportSecurityError))
79 return; 80 return;
80 m_injectedScript = InjectedScript::create(this); 81 m_injectedScript = InjectedScript::create(this);
81 } 82 }
82 83
83 void InspectedContext::discardInjectedScript() 84 void InspectedContext::discardInjectedScript()
84 { 85 {
85 m_injectedScript.reset(); 86 m_injectedScript.reset();
86 } 87 }
87 88
88 } // namespace blink 89 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698