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

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

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 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <list> 9 #include <list>
10 #include <string> 10 #include <string>
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 jint clip_left, 124 jint clip_left,
125 jint clip_top, 125 jint clip_top,
126 jint clip_right, 126 jint clip_right,
127 jint clip_bottom); 127 jint clip_bottom);
128 jlong GetAwDrawGLViewContext(JNIEnv* env, jobject obj); 128 jlong GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
129 jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height); 129 jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height);
130 void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled); 130 void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled);
131 void ClearView(JNIEnv* env, jobject obj); 131 void ClearView(JNIEnv* env, jobject obj);
132 void SetExtraHeadersForUrl(JNIEnv* env, jobject obj, 132 void SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
133 jstring url, jstring extra_headers); 133 jstring url, jstring extra_headers);
134 void SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj);
134 135
135 void DrawGL(AwDrawGLInfo* draw_info); 136 void DrawGL(AwDrawGLInfo* draw_info);
136 137
137 void InvokeGeolocationCallback(JNIEnv* env, 138 void InvokeGeolocationCallback(JNIEnv* env,
138 jobject obj, 139 jobject obj,
139 jboolean value, 140 jboolean value,
140 jstring origin); 141 jstring origin);
141 142
142 // PermissionRequestHandlerClient implementation. 143 // PermissionRequestHandlerClient implementation.
143 virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE; 144 virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 GLViewRendererManager::Key renderer_manager_key_; 262 GLViewRendererManager::Key renderer_manager_key_;
262 263
263 DISALLOW_COPY_AND_ASSIGN(AwContents); 264 DISALLOW_COPY_AND_ASSIGN(AwContents);
264 }; 265 };
265 266
266 bool RegisterAwContents(JNIEnv* env); 267 bool RegisterAwContents(JNIEnv* env);
267 268
268 } // namespace android_webview 269 } // namespace android_webview
269 270
270 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 271 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698