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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2118163002: Remove ScriptRunner::callFunction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: temp Created 4 years, 5 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
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/custom/V8DocumentCustom.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 CHECK_LT(worldID, EmbedderWorldIdLimit); 825 CHECK_LT(worldID, EmbedderWorldIdLimit);
826 826
827 SuspendableScriptExecutor::createAndRun(frame(), worldID, createSourcesVecto r(sourcesIn, numSources), extensionGroup, userGesture, callback); 827 SuspendableScriptExecutor::createAndRun(frame(), worldID, createSourcesVecto r(sourcesIn, numSources), extensionGroup, userGesture, callback);
828 } 828 }
829 829
830 // TODO(bashi): Consider returning MaybeLocal. 830 // TODO(bashi): Consider returning MaybeLocal.
831 v8::Local<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(v8::Loc al<v8::Function> function, v8::Local<v8::Value> receiver, int argc, v8::Local<v8 ::Value> argv[]) 831 v8::Local<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(v8::Loc al<v8::Function> function, v8::Local<v8::Value> receiver, int argc, v8::Local<v8 ::Value> argv[])
832 { 832 {
833 DCHECK(frame()); 833 DCHECK(frame());
834 v8::Local<v8::Value> result; 834 v8::Local<v8::Value> result;
835 if (!frame()->script().callFunction(function, receiver, argc, static_cast<v8 ::Local<v8::Value>*>(argv)).ToLocal(&result)) 835 if (!V8ScriptRunner::callFunction(function, frame()->document(), receiver, a rgc, static_cast<v8::Local<v8::Value>*>(argv), toIsolate(frame())).ToLocal(&resu lt))
836 return v8::Local<v8::Value>(); 836 return v8::Local<v8::Value>();
837 return result; 837 return result;
838 } 838 }
839 839
840 v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const 840 v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const
841 { 841 {
842 ScriptState* scriptState = ScriptState::forMainWorld(frame()); 842 ScriptState* scriptState = ScriptState::forMainWorld(frame());
843 DCHECK(scriptState); 843 DCHECK(scriptState);
844 return scriptState->context(); 844 return scriptState->context();
845 } 845 }
(...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after
2161 { 2161 {
2162 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2162 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2163 } 2163 }
2164 2164
2165 void WebLocalFrameImpl::clearActiveFindMatch() 2165 void WebLocalFrameImpl::clearActiveFindMatch()
2166 { 2166 {
2167 ensureTextFinder().clearActiveFindMatch(); 2167 ensureTextFinder().clearActiveFindMatch();
2168 } 2168 }
2169 2169
2170 } // namespace blink 2170 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/custom/V8DocumentCustom.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698