| 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 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 return true; | 171 return true; |
| 172 } else if (activeProxy->inlineCode() && !activeProxy->timerCallback()) { | 172 } else if (activeProxy->inlineCode() && !activeProxy->timerCallback()) { |
| 173 // This is the <a href="javascript:window.open('...')> case -> we let it
through. | 173 // This is the <a href="javascript:window.open('...')> case -> we let it
through. |
| 174 return true; | 174 return true; |
| 175 } | 175 } |
| 176 | 176 |
| 177 // This is the <script>window.open(...)</script> case or a timer callback ->
block it. | 177 // This is the <script>window.open(...)</script> case or a timer callback ->
block it. |
| 178 return false; | 178 return false; |
| 179 } | 179 } |
| 180 | 180 |
| 181 void ScriptController::evaluateInNewWorld(const Vector<ScriptSourceCode>& source
s) |
| 182 { |
| 183 m_proxy->evaluateInNewWorld(sources); |
| 184 } |
| 185 |
| 181 void ScriptController::evaluateInNewContext(const Vector<ScriptSourceCode>& sour
ces) | 186 void ScriptController::evaluateInNewContext(const Vector<ScriptSourceCode>& sour
ces) |
| 182 { | 187 { |
| 183 m_proxy->evaluateInNewContext(sources); | 188 m_proxy->evaluateInNewContext(sources); |
| 184 } | 189 } |
| 185 | 190 |
| 186 // Evaluate a script file in the environment of this proxy. | 191 // Evaluate a script file in the environment of this proxy. |
| 187 ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) | 192 ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) |
| 188 { | 193 { |
| 189 v8::HandleScope handleScope; | 194 v8::HandleScope handleScope; |
| 190 v8::Handle<v8::Context> context = V8Proxy::GetContext(m_proxy->frame()); | 195 v8::Handle<v8::Context> context = V8Proxy::GetContext(m_proxy->frame()); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 { | 387 { |
| 383 notImplemented(); | 388 notImplemented(); |
| 384 } | 389 } |
| 385 | 390 |
| 386 void ScriptController::updateDocument() | 391 void ScriptController::updateDocument() |
| 387 { | 392 { |
| 388 m_proxy->updateDocument(); | 393 m_proxy->updateDocument(); |
| 389 } | 394 } |
| 390 | 395 |
| 391 } // namespace WebCore | 396 } // namespace WebCore |
| OLD | NEW |