diff options
| author | sigbjornf <sigbjornf@opera.com> | 2015-07-24 01:41:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-24 08:42:15 +0000 |
| commit | f08040289fb0ed72c792863d2dab73fe4d1ca943 (patch) | |
| tree | 31aa667ea21ce8c9b3ed4eee516f50e338e878c5 /content/browser/frame_host | |
| parent | 2a589af08dae76302c4b81af4a072c54cf9a7f01 (diff) | |
| download | chromium_src-f08040289fb0ed72c792863d2dab73fe4d1ca943.zip chromium_src-f08040289fb0ed72c792863d2dab73fe4d1ca943.tar.gz chromium_src-f08040289fb0ed72c792863d2dab73fe4d1ca943.tar.bz2 | |
Revert of Add ExecuteJavaScriptForTest and make all tests use it (patchset #15 id:270001 of https://codereview.chromium.org/1123783002/)
Reason for revert:
Speculatively reverting to address failures,
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/51422
Original issue's description:
> Add ExecuteJavaScriptForTest and make all tests use it
>
> Additionally, restrict the URLs that ExecuteJavaScript can be invoked on
> to chrome-controlled URLs.
>
> R=jam@chromium.org
> BUG=507809
>
> Committed: https://crrev.com/904f14ebdc3bdb8e893df0a3211d09de42d5619c
> Cr-Commit-Position: refs/heads/master@{#340231}
TBR=jam@chromium.org,mdjones@chromium.org,torne@chromium.org,jochen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507809
Review URL: https://codereview.chromium.org/1257603003
Cr-Commit-Position: refs/heads/master@{#340241}
Diffstat (limited to 'content/browser/frame_host')
| -rw-r--r-- | content/browser/frame_host/render_frame_host_impl.cc | 40 | ||||
| -rw-r--r-- | content/browser/frame_host/render_frame_host_impl.h | 7 |
2 files changed, 0 insertions, 47 deletions
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index c7314b4..81aa7c3 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -92,10 +92,6 @@ int g_next_accessibility_reset_token = 1; // The next value to use for the javascript callback id. int g_next_javascript_callback_id = 1; -// Whether to allow injecting javascript into any kind of frame (for Android -// WebView). -bool g_allow_injecting_javascript = false; - // The (process id, routing id) pair that identifies one RenderFrame. typedef std::pair<int32, int32> RenderFrameHostID; typedef base::hash_map<RenderFrameHostID, RenderFrameHostImpl*> @@ -131,11 +127,6 @@ RenderFrameHost* RenderFrameHost::FromID(int render_process_id, } // static -void RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView() { - g_allow_injecting_javascript = true; -} - -// static RenderFrameHostImpl* RenderFrameHostImpl::FromID(int process_id, int routing_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -281,7 +272,6 @@ void RenderFrameHostImpl::AddMessageToConsole(ConsoleMessageLevel level, void RenderFrameHostImpl::ExecuteJavaScript( const base::string16& javascript) { - CHECK(CanExecuteJavaScript()); Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_, javascript, 0, false)); @@ -290,7 +280,6 @@ void RenderFrameHostImpl::ExecuteJavaScript( void RenderFrameHostImpl::ExecuteJavaScript( const base::string16& javascript, const JavaScriptResultCallback& callback) { - CHECK(CanExecuteJavaScript()); int key = g_next_javascript_callback_id++; Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_, javascript, @@ -298,23 +287,6 @@ void RenderFrameHostImpl::ExecuteJavaScript( javascript_callbacks_.insert(std::make_pair(key, callback)); } -void RenderFrameHostImpl::ExecuteJavaScriptForTests( - const base::string16& javascript) { - Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, - javascript, - 0, false, false)); -} - -void RenderFrameHostImpl::ExecuteJavaScriptForTests( - const base::string16& javascript, - const JavaScriptResultCallback& callback) { - int key = g_next_javascript_callback_id++; - Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, javascript, - key, true, false)); - javascript_callbacks_.insert(std::make_pair(key, callback)); -} - - void RenderFrameHostImpl::ExecuteJavaScriptWithUserGestureForTests( const base::string16& javascript) { Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, @@ -2160,16 +2132,4 @@ void RenderFrameHostImpl::UpdatePermissionsForNavigation( } } -bool RenderFrameHostImpl::CanExecuteJavaScript() { - return g_allow_injecting_javascript || - frame_tree_node_->current_url().SchemeIs(kChromeDevToolsScheme) || - ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( - GetProcess()->GetID()) || - // It's possible to load about:blank in a Web UI renderer. - // See http://crbug.com/42547 - (frame_tree_node_->current_url().spec() == url::kAboutBlankURL) || - // InterstitialPageImpl should be the only case matching this. - (delegate_->GetAsWebContents() == nullptr); -} - } // namespace content diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index b4e9442..8035992 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h @@ -139,10 +139,6 @@ class CONTENT_EXPORT RenderFrameHostImpl void ExecuteJavaScript(const base::string16& javascript) override; void ExecuteJavaScript(const base::string16& javascript, const JavaScriptResultCallback& callback) override; - void ExecuteJavaScriptForTests(const base::string16& javascript) override; - void ExecuteJavaScriptForTests( - const base::string16& javascript, - const JavaScriptResultCallback& callback) override; void ExecuteJavaScriptWithUserGestureForTests( const base::string16& javascript) override; void ExecuteJavaScriptInIsolatedWorld( @@ -588,9 +584,6 @@ class CONTENT_EXPORT RenderFrameHostImpl const CommonNavigationParams& common_params, const RequestNavigationParams& request_params); - // Returns true if the ExecuteJavaScript() API can be used on this host. - bool CanExecuteJavaScript(); - // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a // refcount that calls Shutdown when it reaches zero. This allows each // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring |