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.h

Issue 1816283005: Move SharedRendererState ownership to AwContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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>
11 #include <utility> 11 #include <utility>
12 12
13 #include "android_webview/browser/aw_browser_permission_request_delegate.h" 13 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
14 #include "android_webview/browser/aw_message_port_message_filter.h" 14 #include "android_webview/browser/aw_message_port_message_filter.h"
15 #include "android_webview/browser/browser_view_renderer.h" 15 #include "android_webview/browser/browser_view_renderer.h"
16 #include "android_webview/browser/browser_view_renderer_client.h" 16 #include "android_webview/browser/browser_view_renderer_client.h"
17 #include "android_webview/browser/find_helper.h" 17 #include "android_webview/browser/find_helper.h"
18 #include "android_webview/browser/gl_view_renderer_manager.h" 18 #include "android_webview/browser/gl_view_renderer_manager.h"
19 #include "android_webview/browser/icon_helper.h" 19 #include "android_webview/browser/icon_helper.h"
20 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" 20 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
21 #include "android_webview/browser/shared_renderer_state.h"
21 #include "android_webview/native/permission/permission_request_handler_client.h" 22 #include "android_webview/native/permission/permission_request_handler_client.h"
22 #include "base/android/jni_weak_ref.h" 23 #include "base/android/jni_weak_ref.h"
23 #include "base/android/scoped_java_ref.h" 24 #include "base/android/scoped_java_ref.h"
24 #include "base/callback_forward.h" 25 #include "base/callback_forward.h"
25 #include "base/macros.h" 26 #include "base/macros.h"
26 #include "base/memory/scoped_ptr.h" 27 #include "base/memory/scoped_ptr.h"
27 28
28 class SkBitmap; 29 class SkBitmap;
29 class TabContents; 30 class TabContents;
30 struct AwDrawGLInfo; 31 struct AwDrawGLInfo;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 void InitAutofillIfNecessary(bool enabled); 334 void InitAutofillIfNecessary(bool enabled);
334 335
335 // Geolocation API support 336 // Geolocation API support
336 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>); 337 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
337 void HideGeolocationPrompt(const GURL& origin); 338 void HideGeolocationPrompt(const GURL& origin);
338 339
339 void SetDipScaleInternal(float dip_scale); 340 void SetDipScaleInternal(float dip_scale);
340 341
341 JavaObjectWeakGlobalRef java_ref_; 342 JavaObjectWeakGlobalRef java_ref_;
342 BrowserViewRenderer browser_view_renderer_; // Must outlive |web_contents_|. 343 BrowserViewRenderer browser_view_renderer_; // Must outlive |web_contents_|.
344 SharedRendererState shared_renderer_state_;
343 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; 345 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
344 scoped_ptr<AwContentsClientBridge> contents_client_bridge_; 346 scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
345 scoped_ptr<content::WebContents> web_contents_; 347 scoped_ptr<content::WebContents> web_contents_;
346 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; 348 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
347 scoped_ptr<FindHelper> find_helper_; 349 scoped_ptr<FindHelper> find_helper_;
348 scoped_ptr<IconHelper> icon_helper_; 350 scoped_ptr<IconHelper> icon_helper_;
349 scoped_ptr<AwContents> pending_contents_; 351 scoped_ptr<AwContents> pending_contents_;
350 scoped_ptr<AwPdfExporter> pdf_exporter_; 352 scoped_ptr<AwPdfExporter> pdf_exporter_;
351 scoped_ptr<PermissionRequestHandler> permission_request_handler_; 353 scoped_ptr<PermissionRequestHandler> permission_request_handler_;
352 scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_; 354 scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_;
353 355
354 // GURL is supplied by the content layer as requesting frame. 356 // GURL is supplied by the content layer as requesting frame.
355 // Callback is supplied by the content layer, and is invoked with the result 357 // Callback is supplied by the content layer, and is invoked with the result
356 // from the permission prompt. 358 // from the permission prompt.
357 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback; 359 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback;
358 // The first element in the list is always the currently pending request. 360 // The first element in the list is always the currently pending request.
359 std::list<OriginCallback> pending_geolocation_prompts_; 361 std::list<OriginCallback> pending_geolocation_prompts_;
360 362
361 GLViewRendererManager::Key renderer_manager_key_; 363 GLViewRendererManager::Key renderer_manager_key_;
362 364
363 DISALLOW_COPY_AND_ASSIGN(AwContents); 365 DISALLOW_COPY_AND_ASSIGN(AwContents);
364 }; 366 };
365 367
366 bool RegisterAwContents(JNIEnv* env); 368 bool RegisterAwContents(JNIEnv* env);
367 369
368 } // namespace android_webview 370 } // namespace android_webview
369 371
370 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 372 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698