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

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

Issue 655813004: Part 1: Refactor Android WebView graphics code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor
Patch Set: comments Created 6 years, 2 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
« no previous file with comments | « android_webview/browser/shared_renderer_state.cc ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 void HideGeolocationPrompt(const GURL& origin); 232 void HideGeolocationPrompt(const GURL& origin);
233 233
234 JavaObjectWeakGlobalRef java_ref_; 234 JavaObjectWeakGlobalRef java_ref_;
235 scoped_ptr<content::WebContents> web_contents_; 235 scoped_ptr<content::WebContents> web_contents_;
236 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; 236 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
237 scoped_ptr<AwContentsClientBridge> contents_client_bridge_; 237 scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
238 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; 238 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
239 scoped_ptr<FindHelper> find_helper_; 239 scoped_ptr<FindHelper> find_helper_;
240 scoped_ptr<IconHelper> icon_helper_; 240 scoped_ptr<IconHelper> icon_helper_;
241 scoped_ptr<AwContents> pending_contents_; 241 scoped_ptr<AwContents> pending_contents_;
242 SharedRendererState shared_renderer_state_;
243 BrowserViewRenderer browser_view_renderer_; 242 BrowserViewRenderer browser_view_renderer_;
243 // SharedRendererState is owned by BrowserViewRenderer.
244 // So keep a raw pointer here.
245 SharedRendererState* shared_renderer_state_;
246 // TODO(hush): hardware renderer will be owned by SharedRendererState,
247 // after DrawGL is moved to SharedRendererState.
244 scoped_ptr<HardwareRenderer> hardware_renderer_; 248 scoped_ptr<HardwareRenderer> hardware_renderer_;
245 scoped_ptr<AwPdfExporter> pdf_exporter_; 249 scoped_ptr<AwPdfExporter> pdf_exporter_;
246 scoped_ptr<PermissionRequestHandler> permission_request_handler_; 250 scoped_ptr<PermissionRequestHandler> permission_request_handler_;
247 251
248 // GURL is supplied by the content layer as requesting frame. 252 // GURL is supplied by the content layer as requesting frame.
249 // Callback is supplied by the content layer, and is invoked with the result 253 // Callback is supplied by the content layer, and is invoked with the result
250 // from the permission prompt. 254 // from the permission prompt.
251 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback; 255 typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback;
252 // The first element in the list is always the currently pending request. 256 // The first element in the list is always the currently pending request.
253 std::list<OriginCallback> pending_geolocation_prompts_; 257 std::list<OriginCallback> pending_geolocation_prompts_;
254 258
255 base::Lock render_thread_lock_; 259 base::Lock render_thread_lock_;
256 GLViewRendererManager::Key renderer_manager_key_; 260 GLViewRendererManager::Key renderer_manager_key_;
257 261
258 DISALLOW_COPY_AND_ASSIGN(AwContents); 262 DISALLOW_COPY_AND_ASSIGN(AwContents);
259 }; 263 };
260 264
261 bool RegisterAwContents(JNIEnv* env); 265 bool RegisterAwContents(JNIEnv* env);
262 266
263 } // namespace android_webview 267 } // namespace android_webview
264 268
265 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 269 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW
« no previous file with comments | « android_webview/browser/shared_renderer_state.cc ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698