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

Side by Side Diff: android_webview/browser/renderer_host/aw_render_view_host_ext.cc

Issue 366913006: [Android WebView] Terminate execution of stuck JS code on navigation requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" 5 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 8 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
9 #include "android_webview/common/render_view_messages.h" 9 #include "android_webview/common/render_view_messages.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 if (web_contents()->GetRenderViewHost()) { 97 if (web_contents()->GetRenderViewHost()) {
98 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(), 98 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(),
99 background_color_)); 99 background_color_));
100 } 100 }
101 } 101 }
102 102
103 void AwRenderViewHostExt::SetJsOnlineProperty(bool network_up) { 103 void AwRenderViewHostExt::SetJsOnlineProperty(bool network_up) {
104 Send(new AwViewMsg_SetJsOnlineProperty(network_up)); 104 Send(new AwViewMsg_SetJsOnlineProperty(network_up));
105 } 105 }
106 106
107 void AwRenderViewHostExt::SendCheckRenderThreadResponsiveness() {
108 Send(new AwViewMsg_CheckRenderThreadResponsiveness());
109 }
110
107 void AwRenderViewHostExt::RenderViewCreated( 111 void AwRenderViewHostExt::RenderViewCreated(
108 content::RenderViewHost* render_view_host) { 112 content::RenderViewHost* render_view_host) {
109 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(), 113 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(),
110 background_color_)); 114 background_color_));
111 } 115 }
112 116
113 void AwRenderViewHostExt::RenderProcessGone(base::TerminationStatus status) { 117 void AwRenderViewHostExt::RenderProcessGone(base::TerminationStatus status) {
114 DCHECK(CalledOnValidThread()); 118 DCHECK(CalledOnValidThread());
115 for (std::map<int, DocumentHasImagesResult>::iterator pending_req = 119 for (std::map<int, DocumentHasImagesResult>::iterator pending_req =
116 pending_document_has_images_requests_.begin(); 120 pending_document_has_images_requests_.begin();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) { 173 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
170 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor); 174 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
171 } 175 }
172 176
173 void AwRenderViewHostExt::OnContentsSizeChanged( 177 void AwRenderViewHostExt::OnContentsSizeChanged(
174 const gfx::Size& contents_size) { 178 const gfx::Size& contents_size) {
175 client_->OnWebLayoutContentsSizeChanged(contents_size); 179 client_->OnWebLayoutContentsSizeChanged(contents_size);
176 } 180 }
177 181
178 } // namespace android_webview 182 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/renderer_host/aw_render_view_host_ext.h ('k') | android_webview/common/render_view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698