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

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

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 #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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 jint visible_left, 120 jint visible_left,
121 jint visible_top, 121 jint visible_top,
122 jint visible_right, 122 jint visible_right,
123 jint visible_bottom); 123 jint visible_bottom);
124 jlong GetAwDrawGLViewContext(JNIEnv* env, jobject obj); 124 jlong GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
125 jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height); 125 jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height);
126 void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled); 126 void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled);
127 void ClearView(JNIEnv* env, jobject obj); 127 void ClearView(JNIEnv* env, jobject obj);
128 void SetExtraHeadersForUrl(JNIEnv* env, jobject obj, 128 void SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
129 jstring url, jstring extra_headers); 129 jstring url, jstring extra_headers);
130 void SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj);
131 130
132 void DrawGL(AwDrawGLInfo* draw_info); 131 void DrawGL(AwDrawGLInfo* draw_info);
133 132
134 void InvokeGeolocationCallback(JNIEnv* env, 133 void InvokeGeolocationCallback(JNIEnv* env,
135 jobject obj, 134 jobject obj,
136 jboolean value, 135 jboolean value,
137 jstring origin); 136 jstring origin);
138 137
139 // PermissionRequestHandlerClient implementation. 138 // PermissionRequestHandlerClient implementation.
140 virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE; 139 virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 GLViewRendererManager::Key renderer_manager_key_; 254 GLViewRendererManager::Key renderer_manager_key_;
256 255
257 DISALLOW_COPY_AND_ASSIGN(AwContents); 256 DISALLOW_COPY_AND_ASSIGN(AwContents);
258 }; 257 };
259 258
260 bool RegisterAwContents(JNIEnv* env); 259 bool RegisterAwContents(JNIEnv* env);
261 260
262 } // namespace android_webview 261 } // namespace android_webview
263 262
264 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 263 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698