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

Side by Side Diff: content/browser/renderer_host/delegated_frame_host_client_aura.cc

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/renderer_host/delegated_frame_host_client_aura.h" 5 #include "content/browser/renderer_host/delegated_frame_host_client_aura.h"
6 6
7 #include "content/browser/renderer_host/render_widget_host_impl.h" 7 #include "content/browser/renderer_host/render_widget_host_impl.h"
8 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 8 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/view_messages.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 std::unique_ptr<CompositorResizeLock> 66 std::unique_ptr<CompositorResizeLock>
67 DelegatedFrameHostClientAura::DelegatedFrameHostCreateResizeLock() { 67 DelegatedFrameHostClientAura::DelegatedFrameHostCreateResizeLock() {
68 // Pointer moves are released when the CompositorResizeLock ends. 68 // Pointer moves are released when the CompositorResizeLock ends.
69 auto* host = render_widget_host_view_->window_->GetHost(); 69 auto* host = render_widget_host_view_->window_->GetHost();
70 host->dispatcher()->HoldPointerMoves(); 70 host->dispatcher()->HoldPointerMoves();
71 71
72 gfx::Size desired_size = render_widget_host_view_->window_->bounds().size(); 72 gfx::Size desired_size = render_widget_host_view_->window_->bounds().size();
73 return base::MakeUnique<CompositorResizeLock>(this, desired_size); 73 return base::MakeUnique<CompositorResizeLock>(this, desired_size);
74 } 74 }
75 75
76 void DelegatedFrameHostClientAura::
77 DelegatedFrameHostSendReclaimCompositorResources(
78 bool is_swap_ack,
79 const cc::ReturnedResourceArray& resources) {
80 render_widget_host_view_->host_->SendReclaimCompositorResources(is_swap_ack,
81 resources);
82 }
83
76 void DelegatedFrameHostClientAura::OnBeginFrame( 84 void DelegatedFrameHostClientAura::OnBeginFrame(
77 const cc::BeginFrameArgs& args) { 85 const cc::BeginFrameArgs& args) {
78 render_widget_host_view_->OnBeginFrame(args); 86 render_widget_host_view_->OnBeginFrame(args);
79 } 87 }
80 88
81 bool DelegatedFrameHostClientAura::IsAutoResizeEnabled() const { 89 bool DelegatedFrameHostClientAura::IsAutoResizeEnabled() const {
82 return render_widget_host_view_->host_->auto_resize_enabled(); 90 return render_widget_host_view_->host_->auto_resize_enabled();
83 } 91 }
84 92
85 std::unique_ptr<ui::CompositorLock> 93 std::unique_ptr<ui::CompositorLock>
86 DelegatedFrameHostClientAura::GetCompositorLock( 94 DelegatedFrameHostClientAura::GetCompositorLock(
87 ui::CompositorLockClient* client) { 95 ui::CompositorLockClient* client) {
88 auto* window_host = render_widget_host_view_->window_->GetHost(); 96 auto* window_host = render_widget_host_view_->window_->GetHost();
89 return window_host->compositor()->GetCompositorLock(client); 97 return window_host->compositor()->GetCompositorLock(client);
90 } 98 }
91 99
92 void DelegatedFrameHostClientAura::CompositorResizeLockEnded() { 100 void DelegatedFrameHostClientAura::CompositorResizeLockEnded() {
93 auto* window_host = render_widget_host_view_->window_->GetHost(); 101 auto* window_host = render_widget_host_view_->window_->GetHost();
94 window_host->dispatcher()->ReleasePointerMoves(); 102 window_host->dispatcher()->ReleasePointerMoves();
95 render_widget_host_view_->host_->WasResized(); 103 render_widget_host_view_->host_->WasResized();
96 } 104 }
97 105
98 } // namespace content 106 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698