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

Side by Side Diff: android_webview/native/aw_contents.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/native/aw_contents.h" 5 #include "android_webview/native/aw_contents.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 std::string extra_headers; 1114 std::string extra_headers;
1115 if (jextra_headers) 1115 if (jextra_headers)
1116 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers); 1116 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers);
1117 AwResourceContext* resource_context = static_cast<AwResourceContext*>( 1117 AwResourceContext* resource_context = static_cast<AwResourceContext*>(
1118 AwBrowserContext::FromWebContents(web_contents_.get())-> 1118 AwBrowserContext::FromWebContents(web_contents_.get())->
1119 GetResourceContext()); 1119 GetResourceContext());
1120 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)), 1120 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)),
1121 extra_headers); 1121 extra_headers);
1122 } 1122 }
1123 1123
1124 void AwContents::SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj) {
1125 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1126 render_view_host_ext_->SendCheckRenderThreadResponsiveness();
1127 }
1128
1124 void AwContents::SetJsOnlineProperty(JNIEnv* env, 1129 void AwContents::SetJsOnlineProperty(JNIEnv* env,
1125 jobject obj, 1130 jobject obj,
1126 jboolean network_up) { 1131 jboolean network_up) {
1127 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1132 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1128 render_view_host_ext_->SetJsOnlineProperty(network_up); 1133 render_view_host_ext_->SetJsOnlineProperty(network_up);
1129 } 1134 }
1130 1135
1131 void AwContents::TrimMemory(JNIEnv* env, 1136 void AwContents::TrimMemory(JNIEnv* env,
1132 jobject obj, 1137 jobject obj,
1133 jint level, 1138 jint level,
1134 jboolean visible) { 1139 jboolean visible) {
1135 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1140 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1136 browser_view_renderer_.TrimMemory(level, visible); 1141 browser_view_renderer_.TrimMemory(level, visible);
1137 } 1142 }
1138 1143
1139 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { 1144 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
1140 g_should_download_favicons = true; 1145 g_should_download_favicons = true;
1141 } 1146 }
1142 1147
1143 } // namespace android_webview 1148 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | android_webview/renderer/aw_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698