OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
111 | 111 |
112 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState) | 112 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState) |
113 { | 113 { |
114 ScriptState::Scope scope(scriptState); | 114 ScriptState::Scope scope(scriptState); |
115 v8::Local<v8::Object> global = scriptState->context()->Global(); | 115 v8::Local<v8::Object> global = scriptState->context()->Global(); |
116 if (global.IsEmpty()) | 116 if (global.IsEmpty()) |
117 return false; | 117 return false; |
118 v8::Handle<v8::Object> holder = V8Window::findInstanceInPrototypeChain(globa l, scriptState->isolate()); | 118 v8::Handle<v8::Object> holder = V8Window::findInstanceInPrototypeChain(globa l, scriptState->isolate()); |
119 if (holder.IsEmpty()) | 119 if (holder.IsEmpty()) |
120 return false; | 120 return false; |
121 LocalFrame* frame = V8Window::toImpl(holder)->frame(); | 121 LocalFrame* frame = toLocalDOMWindow(V8Window::toImpl(holder))->frame(); |
dcheng
2014/10/31 03:20:40
For things like this, I assume that the browser wi
haraken
2014/10/31 06:07:04
Don't we need to have:
LocalDOMWindow* window =
dcheng
2014/10/31 06:31:01
The browser should be routing any calls of this na
| |
122 | 122 |
123 return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), fra me, DoNotReportSecurityError); | 123 return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), fra me, DoNotReportSecurityError); |
124 } | 124 } |
125 | 125 |
126 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Objec t, InjectedScriptManager::CallbackData>& data) | 126 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Objec t, InjectedScriptManager::CallbackData>& data) |
127 { | 127 { |
128 InjectedScriptManager::CallbackData* callbackData = data.GetParameter(); | 128 InjectedScriptManager::CallbackData* callbackData = data.GetParameter(); |
129 callbackData->injectedScriptManager->removeCallbackData(callbackData); | 129 callbackData->injectedScriptManager->removeCallbackData(callbackData); |
130 } | 130 } |
131 | 131 |
132 } // namespace blink | 132 } // namespace blink |
OLD | NEW |