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

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

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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "android_webview/native/aw_contents.h" 5 #include "android_webview/native/aw_contents.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/browser/aw_browser_context.h" 10 #include "android_webview/browser/aw_browser_context.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 int render_process_id, int render_frame_id) { 166 int render_process_id, int render_frame_id) {
167 AwContents* aw_contents = AwContents::FromWebContents( 167 AwContents* aw_contents = AwContents::FromWebContents(
168 content::WebContents::FromRenderFrameHost( 168 content::WebContents::FromRenderFrameHost(
169 content::RenderFrameHost::FromID(render_process_id, 169 content::RenderFrameHost::FromID(render_process_id,
170 render_frame_id))); 170 render_frame_id)));
171 return aw_contents; 171 return aw_contents;
172 } 172 }
173 173
174 AwContents::AwContents(std::unique_ptr<WebContents> web_contents) 174 AwContents::AwContents(std::unique_ptr<WebContents> web_contents)
175 : functor_(nullptr), 175 : functor_(nullptr),
176 web_contents_(std::move(web_contents)),
176 browser_view_renderer_( 177 browser_view_renderer_(
178 web_contents_.get(),
177 this, 179 this,
178 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)), 180 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
179 web_contents_(std::move(web_contents)),
180 renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) { 181 renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) {
181 base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1); 182 base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
182 icon_helper_.reset(new IconHelper(web_contents_.get())); 183 icon_helper_.reset(new IconHelper(web_contents_.get()));
183 icon_helper_->SetListener(this); 184 icon_helper_->SetListener(this);
184 web_contents_->SetUserData(android_webview::kAwContentsUserDataKey, 185 web_contents_->SetUserData(android_webview::kAwContentsUserDataKey,
185 new AwContentsUserData(this)); 186 new AwContentsUserData(this));
186 browser_view_renderer_.RegisterWithWebContents(web_contents_.get()); 187 browser_view_renderer_.RegisterWithWebContents(web_contents_.get());
187 render_view_host_ext_.reset( 188 render_view_host_ext_.reset(
188 new AwRenderViewHostExt(this, web_contents_.get())); 189 new AwRenderViewHostExt(this, web_contents_.get()));
189 190
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 const JavaParamRef<jobject>& obj) { 1283 const JavaParamRef<jobject>& obj) {
1283 web_contents_->ResumeLoadingCreatedWebContents(); 1284 web_contents_->ResumeLoadingCreatedWebContents();
1284 } 1285 }
1285 1286
1286 void SetShouldDownloadFavicons(JNIEnv* env, 1287 void SetShouldDownloadFavicons(JNIEnv* env,
1287 const JavaParamRef<jclass>& jclazz) { 1288 const JavaParamRef<jclass>& jclazz) {
1288 g_should_download_favicons = true; 1289 g_should_download_favicons = true;
1289 } 1290 }
1290 1291
1291 } // namespace android_webview 1292 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698