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

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

Issue 2036023002: Rewire Android WebView's compositor changed signal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix browse_view_renderer construction and rebase Created 4 years, 6 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 9
10 #include <list> 10 #include <list>
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // Geolocation API support 339 // Geolocation API support
340 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>); 340 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
341 void HideGeolocationPrompt(const GURL& origin); 341 void HideGeolocationPrompt(const GURL& origin);
342 342
343 void SetDipScaleInternal(float dip_scale); 343 void SetDipScaleInternal(float dip_scale);
344 344
345 void SetAwGLFunctor(AwGLFunctor* functor); 345 void SetAwGLFunctor(AwGLFunctor* functor);
346 346
347 JavaObjectWeakGlobalRef java_ref_; 347 JavaObjectWeakGlobalRef java_ref_;
348 AwGLFunctor* functor_; 348 AwGLFunctor* functor_;
349 std::unique_ptr<content::WebContents> web_contents_;
349 BrowserViewRenderer browser_view_renderer_; // Must outlive |web_contents_|. 350 BrowserViewRenderer browser_view_renderer_; // Must outlive |web_contents_|.
boliu 2016/06/13 15:30:44 uhh... the comment is clearly wrong now maybe sho
hush (inactive) 2016/06/14 23:48:29 I put it back to place. It was added so that Synch
350 std::unique_ptr<AwWebContentsDelegate> web_contents_delegate_; 351 std::unique_ptr<AwWebContentsDelegate> web_contents_delegate_;
351 std::unique_ptr<AwContentsClientBridge> contents_client_bridge_; 352 std::unique_ptr<AwContentsClientBridge> contents_client_bridge_;
352 std::unique_ptr<content::WebContents> web_contents_;
353 std::unique_ptr<AwRenderViewHostExt> render_view_host_ext_; 353 std::unique_ptr<AwRenderViewHostExt> render_view_host_ext_;
354 std::unique_ptr<FindHelper> find_helper_; 354 std::unique_ptr<FindHelper> find_helper_;
355 std::unique_ptr<IconHelper> icon_helper_; 355 std::unique_ptr<IconHelper> icon_helper_;
356 std::unique_ptr<AwContents> pending_contents_; 356 std::unique_ptr<AwContents> pending_contents_;
357 std::unique_ptr<AwPdfExporter> pdf_exporter_; 357 std::unique_ptr<AwPdfExporter> pdf_exporter_;
358 std::unique_ptr<PermissionRequestHandler> permission_request_handler_; 358 std::unique_ptr<PermissionRequestHandler> permission_request_handler_;
359 scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_; 359 scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_;
360 360
361 // GURL is supplied by the content layer as requesting frame. 361 // GURL is supplied by the content layer as requesting frame.
362 // Callback is supplied by the content layer, and is invoked with the result 362 // Callback is supplied by the content layer, and is invoked with the result
363 // from the permission prompt. 363 // from the permission prompt.
364 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback; 364 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback;
365 // The first element in the list is always the currently pending request. 365 // The first element in the list is always the currently pending request.
366 std::list<OriginCallback> pending_geolocation_prompts_; 366 std::list<OriginCallback> pending_geolocation_prompts_;
367 367
368 GLViewRendererManager::Key renderer_manager_key_; 368 GLViewRendererManager::Key renderer_manager_key_;
369 369
370 DISALLOW_COPY_AND_ASSIGN(AwContents); 370 DISALLOW_COPY_AND_ASSIGN(AwContents);
371 }; 371 };
372 372
373 bool RegisterAwContents(JNIEnv* env); 373 bool RegisterAwContents(JNIEnv* env);
374 374
375 } // namespace android_webview 375 } // namespace android_webview
376 376
377 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 377 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698