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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.h

Issue 2628053003: Remove extension group from DOMWrapperWorld. (Closed)
Patch Set: Fix GCCallbackTest Created 3 years, 11 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 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 AccessControlStatus); 101 AccessControlStatus);
102 void executeScriptInMainWorld(const CompiledScript&); 102 void executeScriptInMainWorld(const CompiledScript&);
103 103
104 // Executes JavaScript in an isolated world. The script gets its own global 104 // Executes JavaScript in an isolated world. The script gets its own global
105 // scope, its own prototypes for intrinsic JavaScript objects (String, Array, 105 // scope, its own prototypes for intrinsic JavaScript objects (String, Array,
106 // and so-on), and its own wrappers for all DOM nodes and DOM constructors. 106 // and so-on), and its own wrappers for all DOM nodes and DOM constructors.
107 // 107 //
108 // If an isolated world with the specified ID already exists, it is reused. 108 // If an isolated world with the specified ID already exists, it is reused.
109 // Otherwise, a new world is created. 109 // Otherwise, a new world is created.
110 // 110 //
111 // FIXME: Get rid of extensionGroup here.
112 // FIXME: We don't want to support multiple scripts. 111 // FIXME: We don't want to support multiple scripts.
113 void executeScriptInIsolatedWorld(int worldID, 112 void executeScriptInIsolatedWorld(int worldID,
114 const HeapVector<ScriptSourceCode>& sources, 113 const HeapVector<ScriptSourceCode>& sources,
115 int extensionGroup,
116 Vector<v8::Local<v8::Value>>* results); 114 Vector<v8::Local<v8::Value>>* results);
117 115
118 // Returns true if argument is a JavaScript URL. 116 // Returns true if argument is a JavaScript URL.
119 bool executeScriptIfJavaScriptURL(const KURL&, Element*); 117 bool executeScriptIfJavaScriptURL(const KURL&, Element*);
120 118
121 // Returns true if the current world is isolated, and has its own Content 119 // Returns true if the current world is isolated, and has its own Content
122 // Security Policy. In this case, the policy of the main world should be 120 // Security Policy. In this case, the policy of the main world should be
123 // ignored when evaluating resources injected into the DOM. 121 // ignored when evaluating resources injected into the DOM.
124 bool shouldBypassMainWorldCSP(); 122 bool shouldBypassMainWorldCSP();
125 123
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, 157 v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&,
160 AccessControlStatus, 158 AccessControlStatus,
161 ExecuteScriptPolicy); 159 ExecuteScriptPolicy);
162 160
163 Member<LocalWindowProxyManager> m_windowProxyManager; 161 Member<LocalWindowProxyManager> m_windowProxyManager;
164 }; 162 };
165 163
166 } // namespace blink 164 } // namespace blink
167 165
168 #endif // ScriptController_h 166 #endif // ScriptController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698