| OLD | NEW |
|---|
| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 }; | 74 }; |
| 75 | 75 |
| 76 static ScriptController* create(LocalFrame* frame) { | 76 static ScriptController* create(LocalFrame* frame) { |
| 77 return new ScriptController(frame); | 77 return new ScriptController(frame); |
| 78 } | 78 } |
| 79 | 79 |
| 80 DECLARE_TRACE(); | 80 DECLARE_TRACE(); |
| 81 | 81 |
| 82 bool initializeMainWorld(); | 82 bool initializeMainWorld(); |
| 83 WindowProxy* windowProxy(DOMWrapperWorld&); | 83 WindowProxy* windowProxy(DOMWrapperWorld&); |
| 84 WindowProxy* existingWindowProxy(DOMWrapperWorld&); | |
| 85 | 84 |
| 86 // Evaluate JavaScript in the main world. | 85 // Evaluate JavaScript in the main world. |
| 87 void executeScriptInMainWorld( | 86 void executeScriptInMainWorld( |
| 88 const String&, | 87 const String&, |
| 89 ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled); | 88 ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled); |
| 90 void executeScriptInMainWorld(const ScriptSourceCode&, | 89 void executeScriptInMainWorld(const ScriptSourceCode&, |
| 91 AccessControlStatus = NotSharableCrossOrigin); | 90 AccessControlStatus = NotSharableCrossOrigin); |
| 92 v8::Local<v8::Value> executeScriptInMainWorldAndReturnValue( | 91 v8::Local<v8::Value> executeScriptInMainWorldAndReturnValue( |
| 93 const ScriptSourceCode&, | 92 const ScriptSourceCode&, |
| 94 ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled); | 93 ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled); |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, | 165 v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, |
| 167 AccessControlStatus, | 166 AccessControlStatus, |
| 168 ExecuteScriptPolicy); | 167 ExecuteScriptPolicy); |
| 169 | 168 |
| 170 Member<WindowProxyManager> m_windowProxyManager; | 169 Member<WindowProxyManager> m_windowProxyManager; |
| 171 }; | 170 }; |
| 172 | 171 |
| 173 } // namespace blink | 172 } // namespace blink |
| 174 | 173 |
| 175 #endif // ScriptController_h | 174 #endif // ScriptController_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2607743002:
Remove existingWindowProxy() (Closed)
