| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 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 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 852 for (unsigned i = 0; i < scriptResults.size(); i++) | 852 for (unsigned i = 0; i < scriptResults.size(); i++) |
| 853 v8Results[i] = v8::Local<v8::Value>::New(toIsolate(frame()), scriptR
esults[i].v8Value()); | 853 v8Results[i] = v8::Local<v8::Value>::New(toIsolate(frame()), scriptR
esults[i].v8Value()); |
| 854 results->swap(v8Results); | 854 results->swap(v8Results); |
| 855 } else | 855 } else |
| 856 frame()->script()->executeScriptInIsolatedWorld(worldID, sources, extens
ionGroup, 0); | 856 frame()->script()->executeScriptInIsolatedWorld(worldID, sources, extens
ionGroup, 0); |
| 857 } | 857 } |
| 858 | 858 |
| 859 v8::Handle<v8::Value> WebFrameImpl::callFunctionEvenIfScriptDisabled(v8::Handle<
v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8
::Value> argv[]) | 859 v8::Handle<v8::Value> WebFrameImpl::callFunctionEvenIfScriptDisabled(v8::Handle<
v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8
::Value> argv[]) |
| 860 { | 860 { |
| 861 ASSERT(frame()); | 861 ASSERT(frame()); |
| 862 return frame()->script()->callFunctionEvenIfScriptDisabled(function, receive
r, argc, argv).v8Value(); | 862 return frame()->script()->callFunction(function, receiver, argc, argv); |
| 863 } | 863 } |
| 864 | 864 |
| 865 v8::Local<v8::Context> WebFrameImpl::mainWorldScriptContext() const | 865 v8::Local<v8::Context> WebFrameImpl::mainWorldScriptContext() const |
| 866 { | 866 { |
| 867 if (!frame()) | 867 if (!frame()) |
| 868 return v8::Local<v8::Context>(); | 868 return v8::Local<v8::Context>(); |
| 869 return ScriptController::mainWorldContext(frame()); | 869 return ScriptController::mainWorldContext(frame()); |
| 870 } | 870 } |
| 871 | 871 |
| 872 v8::Handle<v8::Value> WebFrameImpl::createFileSystem(WebFileSystemType type, con
st WebString& name, const WebString& path) | 872 v8::Handle<v8::Value> WebFrameImpl::createFileSystem(WebFileSystemType type, con
st WebString& name, const WebString& path) |
| (...skipping 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2515 | 2515 |
| 2516 // There is a possibility that the frame being detached was the only | 2516 // There is a possibility that the frame being detached was the only |
| 2517 // pending one. We need to make sure final replies can be sent. | 2517 // pending one. We need to make sure final replies can be sent. |
| 2518 flushCurrentScopingEffort(m_findRequestIdentifier); | 2518 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2519 | 2519 |
| 2520 cancelPendingScopingEffort(); | 2520 cancelPendingScopingEffort(); |
| 2521 } | 2521 } |
| 2522 } | 2522 } |
| 2523 | 2523 |
| 2524 } // namespace WebKit | 2524 } // namespace WebKit |
| OLD | NEW |