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

Side by Side Diff: android_webview/native/aw_contents.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 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 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 std::string extra_headers; 1110 std::string extra_headers;
1111 if (jextra_headers) 1111 if (jextra_headers)
1112 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers); 1112 extra_headers = ConvertJavaStringToUTF8(env, jextra_headers);
1113 AwResourceContext* resource_context = static_cast<AwResourceContext*>( 1113 AwResourceContext* resource_context = static_cast<AwResourceContext*>(
1114 AwBrowserContext::FromWebContents(web_contents_.get())-> 1114 AwBrowserContext::FromWebContents(web_contents_.get())->
1115 GetResourceContext()); 1115 GetResourceContext());
1116 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)), 1116 resource_context->SetExtraHeaders(GURL(ConvertJavaStringToUTF8(env, url)),
1117 extra_headers); 1117 extra_headers);
1118 } 1118 }
1119 1119
1120 void AwContents::SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj) {
1121 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1122 render_view_host_ext_->SendCheckRenderThreadResponsiveness();
1123 }
1124
1125 void AwContents::SetJsOnlineProperty(JNIEnv* env, 1120 void AwContents::SetJsOnlineProperty(JNIEnv* env,
1126 jobject obj, 1121 jobject obj,
1127 jboolean network_up) { 1122 jboolean network_up) {
1128 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1123 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1129 render_view_host_ext_->SetJsOnlineProperty(network_up); 1124 render_view_host_ext_->SetJsOnlineProperty(network_up);
1130 } 1125 }
1131 1126
1132 void AwContents::TrimMemory(JNIEnv* env, 1127 void AwContents::TrimMemory(JNIEnv* env,
1133 jobject obj, 1128 jobject obj,
1134 jint level, 1129 jint level,
1135 jboolean visible) { 1130 jboolean visible) {
1136 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1131 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1137 enum { 1132 enum {
1138 TRIM_MEMORY_MODERATE = 60, 1133 TRIM_MEMORY_MODERATE = 60,
1139 }; 1134 };
1140 if (level >= TRIM_MEMORY_MODERATE) { 1135 if (level >= TRIM_MEMORY_MODERATE) {
1141 ReleaseHardwareDrawIfNeeded(); 1136 ReleaseHardwareDrawIfNeeded();
1142 return; 1137 return;
1143 } 1138 }
1144 1139
1145 browser_view_renderer_.TrimMemory(level, visible); 1140 browser_view_renderer_.TrimMemory(level, visible);
1146 } 1141 }
1147 1142
1148 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { 1143 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
1149 g_should_download_favicons = true; 1144 g_should_download_favicons = true;
1150 } 1145 }
1151 1146
1152 } // namespace android_webview 1147 } // 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