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

Side by Side Diff: android_webview/browser/renderer_host/view_renderer_host.cc

Issue 12356002: [NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remaining hacks Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/browser/renderer_host/view_renderer_host.h" 5 #include "android_webview/browser/renderer_host/view_renderer_host.h"
6 6
7 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 7 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
8 #include "android_webview/common/render_view_messages.h" 8 #include "android_webview/common/render_view_messages.h"
9 #include "android_webview/common/renderer_picture_map.h" 9 #include "android_webview/common/renderer_picture_map.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
11 #include "content/public/browser/render_view_host.h" 11 #include "content/public/browser/render_view_host.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 13
14 namespace android_webview { 14 namespace android_webview {
15 15
16 ViewRendererHost::ViewRendererHost(content::WebContents* contents, 16 ViewRendererHost::ViewRendererHost(content::WebContents* contents,
17 Client* client) 17 Client* client)
18 : content::WebContentsObserver(contents), 18 : content::WebContentsObserver(contents),
19 client_(client) { 19 client_(client) {
20 } 20 }
21 21
22 ViewRendererHost::~ViewRendererHost() { 22 ViewRendererHost::~ViewRendererHost() {
23 } 23 }
24 24
25 void ViewRendererHost::CapturePictureSync() { 25 void ViewRendererHost::CapturePictureSync() {
26 if (!IsRenderViewReady()) 26 if (!IsRenderViewReady())
27 return; 27 return;
28 28
29 ScopedAllowWaitForLegacyWebViewApi wait; 29 // ScopedAllowWaitForLegacyWebViewApi wait;
30 Send(new AwViewMsg_CapturePictureSync(web_contents()->GetRoutingID())); 30 // Send(new AwViewMsg_CapturePictureSync(web_contents()->GetRoutingID()));
31 } 31 }
32 32
33 void ViewRendererHost::EnableCapturePictureCallback(bool enabled) { 33 void ViewRendererHost::EnableCapturePictureCallback(bool enabled) {
34 Send(new AwViewMsg_EnableCapturePictureCallback( 34 Send(new AwViewMsg_EnableCapturePictureCallback(
35 web_contents()->GetRoutingID(), enabled)); 35 web_contents()->GetRoutingID(), enabled));
36 } 36 }
37 37
38 void ViewRendererHost::OnPictureUpdated() { 38 void ViewRendererHost::OnPictureUpdated() {
39 if (client_) { 39 if (client_) {
40 client_->OnPictureUpdated(web_contents()->GetRenderProcessHost()->GetID(), 40 client_->OnPictureUpdated(web_contents()->GetRenderProcessHost()->GetID(),
(...skipping 18 matching lines...) Expand all
59 return handled ? true : WebContentsObserver::OnMessageReceived(message); 59 return handled ? true : WebContentsObserver::OnMessageReceived(message);
60 } 60 }
61 61
62 bool ViewRendererHost::IsRenderViewReady() const { 62 bool ViewRendererHost::IsRenderViewReady() const {
63 return web_contents()->GetRenderProcessHost()->HasConnection() && 63 return web_contents()->GetRenderProcessHost()->HasConnection() &&
64 web_contents()->GetRenderViewHost() && 64 web_contents()->GetRenderViewHost() &&
65 web_contents()->GetRenderViewHost()->IsRenderViewLive(); 65 web_contents()->GetRenderViewHost()->IsRenderViewLive();
66 } 66 }
67 67
68 } // namespace android_webview 68 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/lib/main/aw_main_delegate.cc » ('j') | android_webview/lib/main/aw_main_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698