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

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 532313002: Revert "[Android WebView] Terminate execution of stuck JS code on navigation requests" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125
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 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 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 std::string extra_headers; 1136 std::string extra_headers;
1137 if (jextra_headers) 1137 if (jextra_headers)
1138 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers); 1138 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers);
1139 AwResourceContext* resource_context = static_cast<AwResourceContext*>( 1139 AwResourceContext* resource_context = static_cast<AwResourceContext*>(
1140 AwBrowserContext::FromWebContents(web_contents_.get())-> 1140 AwBrowserContext::FromWebContents(web_contents_.get())->
1141 GetResourceContext()); 1141 GetResourceContext());
1142 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)), 1142 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)),
1143 extra_headers); 1143 extra_headers);
1144 } 1144 }
1145 1145
1146 void AwContents::SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj) {
1147 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1148 render_view_host_ext_->SendCheckRenderThreadResponsiveness();
1149 }
1150
1151 void AwContents::SetJsOnlineProperty(JNIEnv* env, 1146 void AwContents::SetJsOnlineProperty(JNIEnv* env,
1152 jobject obj, 1147 jobject obj,
1153 jboolean network_up) { 1148 jboolean network_up) {
1154 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1149 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1155 render_view_host_ext_->SetJsOnlineProperty(network_up); 1150 render_view_host_ext_->SetJsOnlineProperty(network_up);
1156 } 1151 }
1157 1152
1158 void AwContents::TrimMemory(JNIEnv* env, 1153 void AwContents::TrimMemory(JNIEnv* env,
1159 jobject obj, 1154 jobject obj,
1160 jint level, 1155 jint level,
1161 jboolean visible) { 1156 jboolean visible) {
1162 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1157 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1163 enum { 1158 enum {
1164 TRIM_MEMORY_MODERATE = 60, 1159 TRIM_MEMORY_MODERATE = 60,
1165 }; 1160 };
1166 if (level >= TRIM_MEMORY_MODERATE) { 1161 if (level >= TRIM_MEMORY_MODERATE) {
1167 ReleaseHardwareDrawIfNeeded(); 1162 ReleaseHardwareDrawIfNeeded();
1168 return; 1163 return;
1169 } 1164 }
1170 1165
1171 browser_view_renderer_.TrimMemory(level, visible); 1166 browser_view_renderer_.TrimMemory(level, visible);
1172 } 1167 }
1173 1168
1174 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { 1169 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
1175 g_should_download_favicons = true; 1170 g_should_download_favicons = true;
1176 } 1171 }
1177 1172
1178 } // namespace android_webview 1173 } // 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