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

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

Issue 536593004: Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ..."" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2062
Patch Set: Created 6 years, 3 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
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (web_contents()->GetRenderViewHost()) { 92 if (web_contents()->GetRenderViewHost()) {
93 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(), 93 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(),
94 background_color_)); 94 background_color_));
95 } 95 }
96 } 96 }
97 97
98 void AwRenderViewHostExt::SetJsOnlineProperty(bool network_up) { 98 void AwRenderViewHostExt::SetJsOnlineProperty(bool network_up) {
99 Send(new AwViewMsg_SetJsOnlineProperty(network_up)); 99 Send(new AwViewMsg_SetJsOnlineProperty(network_up));
100 } 100 }
101 101
102 void AwRenderViewHostExt::SendCheckRenderThreadResponsiveness() {
103 Send(new AwViewMsg_CheckRenderThreadResponsiveness());
104 }
105
106 void AwRenderViewHostExt::RenderViewCreated( 102 void AwRenderViewHostExt::RenderViewCreated(
107 content::RenderViewHost* render_view_host) { 103 content::RenderViewHost* render_view_host) {
108 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(), 104 Send(new AwViewMsg_SetBackgroundColor(web_contents()->GetRoutingID(),
109 background_color_)); 105 background_color_));
110 } 106 }
111 107
112 void AwRenderViewHostExt::RenderProcessGone(base::TerminationStatus status) { 108 void AwRenderViewHostExt::RenderProcessGone(base::TerminationStatus status) {
113 DCHECK(CalledOnValidThread()); 109 DCHECK(CalledOnValidThread());
114 for (std::map<int, DocumentHasImagesResult>::iterator pending_req = 110 for (std::map<int, DocumentHasImagesResult>::iterator pending_req =
115 pending_document_has_images_requests_.begin(); 111 pending_document_has_images_requests_.begin();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) { 164 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
169 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor); 165 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
170 } 166 }
171 167
172 void AwRenderViewHostExt::OnContentsSizeChanged( 168 void AwRenderViewHostExt::OnContentsSizeChanged(
173 const gfx::Size& contents_size) { 169 const gfx::Size& contents_size) {
174 client_->OnWebLayoutContentsSizeChanged(contents_size); 170 client_->OnWebLayoutContentsSizeChanged(contents_size);
175 } 171 }
176 172
177 } // namespace android_webview 173 } // 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