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

Side by Side Diff: Source/bindings/v8/custom/V8InjectedScriptManager.cpp

Issue 17035010: Revert "Rename DOMWindow interface to Window" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/InjectedScriptManager.h" 32 #include "core/inspector/InjectedScriptManager.h"
33 33
34 #include "V8DOMWindow.h"
34 #include "V8InjectedScriptHost.h" 35 #include "V8InjectedScriptHost.h"
35 #include "V8Window.h"
36 #include "bindings/v8/BindingSecurity.h" 36 #include "bindings/v8/BindingSecurity.h"
37 #include "bindings/v8/ScriptDebugServer.h" 37 #include "bindings/v8/ScriptDebugServer.h"
38 #include "bindings/v8/ScriptObject.h" 38 #include "bindings/v8/ScriptObject.h"
39 #include "bindings/v8/V8Binding.h" 39 #include "bindings/v8/V8Binding.h"
40 #include "bindings/v8/V8ObjectConstructor.h" 40 #include "bindings/v8/V8ObjectConstructor.h"
41 #include "bindings/v8/V8ScriptRunner.h" 41 #include "bindings/v8/V8ScriptRunner.h"
42 #include "core/inspector/InjectedScriptHost.h" 42 #include "core/inspector/InjectedScriptHost.h"
43 #include "core/page/DOMWindow.h" 43 #include "core/page/DOMWindow.h"
44 #include "wtf/RefPtr.h" 44 #include "wtf/RefPtr.h"
45 45
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 return ScriptObject(inspectedScriptState, v8::Handle<v8::Object>::Cast(injec tedScriptValue)); 97 return ScriptObject(inspectedScriptState, v8::Handle<v8::Object>::Cast(injec tedScriptValue));
98 } 98 }
99 99
100 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState) 100 bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState)
101 { 101 {
102 v8::HandleScope handleScope; 102 v8::HandleScope handleScope;
103 v8::Local<v8::Context> context = scriptState->context(); 103 v8::Local<v8::Context> context = scriptState->context();
104 v8::Local<v8::Object> global = context->Global(); 104 v8::Local<v8::Object> global = context->Global();
105 if (global.IsEmpty()) 105 if (global.IsEmpty())
106 return false; 106 return false;
107 v8::Handle<v8::Object> holder = global->FindInstanceInPrototypeChain(V8Windo w::GetTemplate(context->GetIsolate(), MainWorld)); 107 v8::Handle<v8::Object> holder = global->FindInstanceInPrototypeChain(V8DOMWi ndow::GetTemplate(context->GetIsolate(), MainWorld));
108 if (holder.IsEmpty()) 108 if (holder.IsEmpty())
109 holder = global->FindInstanceInPrototypeChain(V8Window::GetTemplate(cont ext->GetIsolate(), IsolatedWorld)); 109 holder = global->FindInstanceInPrototypeChain(V8DOMWindow::GetTemplate(c ontext->GetIsolate(), IsolatedWorld));
110 if (holder.IsEmpty()) 110 if (holder.IsEmpty())
111 return false; 111 return false;
112 Frame* frame = V8Window::toNative(holder)->frame(); 112 Frame* frame = V8DOMWindow::toNative(holder)->frame();
113 113
114 v8::Context::Scope contextScope(context); 114 v8::Context::Scope contextScope(context);
115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror); 115 return BindingSecurity::shouldAllowAccessToFrame(frame, DoNotReportSecurityE rror);
116 } 116 }
117 117
118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host) 118 void InjectedScriptManager::makeWeakCallback(v8::Isolate* isolate, v8::Persisten t<v8::Object>* object, InjectedScriptHost* host)
119 { 119 {
120 host->deref(); 120 host->deref();
121 object->Dispose(isolate); 121 object->Dispose(isolate);
122 } 122 }
123 123
124 } // namespace WebCore 124 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8HistoryCustom.cpp ('k') | Source/bindings/v8/custom/V8MessageEventCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698