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

Side by Side Diff: content/browser/renderer_host/browser_compositor_view_mac.mm

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser_compositor_view_mac.h" 5 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 outstanding_copy_count_ += 1; 262 outstanding_copy_count_ += 1;
263 263
264 auto callback_with_decrement = 264 auto callback_with_decrement =
265 base::Bind(&BrowserCompositorMac::CopyToVideoFrameCompleted, 265 base::Bind(&BrowserCompositorMac::CopyToVideoFrameCompleted,
266 weak_factory_.GetWeakPtr(), callback); 266 weak_factory_.GetWeakPtr(), callback);
267 267
268 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame( 268 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
269 src_subrect, std::move(target), callback_with_decrement); 269 src_subrect, std::move(target), callback_with_decrement);
270 } 270 }
271 271
272 void BrowserCompositorMac::DidCreateNewRendererCompositorFrameSink( 272 void BrowserCompositorMac::DidCreateNewRendererCompositorFrameSink() {
273 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) { 273 delegated_frame_host_->DidCreateNewRendererCompositorFrameSink();
274 renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
275 delegated_frame_host_->DidCreateNewRendererCompositorFrameSink(
276 renderer_compositor_frame_sink_);
277 } 274 }
278 275
279 void BrowserCompositorMac::SubmitCompositorFrame( 276 void BrowserCompositorMac::SubmitCompositorFrame(
280 const cc::LocalSurfaceId& local_surface_id, 277 const cc::LocalSurfaceId& local_surface_id,
281 cc::CompositorFrame frame) { 278 cc::CompositorFrame frame) {
282 // Compute the frame size based on the root render pass rect size. 279 // Compute the frame size based on the root render pass rect size.
283 cc::RenderPass* root_pass = frame.render_pass_list.back().get(); 280 cc::RenderPass* root_pass = frame.render_pass_list.back().get();
284 float scale_factor = frame.metadata.device_scale_factor; 281 float scale_factor = frame.metadata.device_scale_factor;
285 gfx::Size pixel_size = root_pass->output_rect.size(); 282 gfx::Size pixel_size = root_pass->output_rect.size();
286 gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size); 283 gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 // Mac uses the RenderWidgetResizeHelper instead of a resize lock. 426 // Mac uses the RenderWidgetResizeHelper instead of a resize lock.
430 return false; 427 return false;
431 } 428 }
432 429
433 std::unique_ptr<CompositorResizeLock> 430 std::unique_ptr<CompositorResizeLock>
434 BrowserCompositorMac::DelegatedFrameHostCreateResizeLock() { 431 BrowserCompositorMac::DelegatedFrameHostCreateResizeLock() {
435 NOTREACHED(); 432 NOTREACHED();
436 return nullptr; 433 return nullptr;
437 } 434 }
438 435
436 void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
437 bool is_swap_ack,
438 const cc::ReturnedResourceArray& resources) {
439 client_->BrowserCompositorMacSendReclaimCompositorResources(is_swap_ack,
440 resources);
441 }
442
439 void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) { 443 void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
440 client_->BrowserCompositorMacSendBeginFrame(args); 444 client_->BrowserCompositorMacSendBeginFrame(args);
441 } 445 }
442 446
443 bool BrowserCompositorMac::IsAutoResizeEnabled() const { 447 bool BrowserCompositorMac::IsAutoResizeEnabled() const {
444 NOTREACHED(); 448 NOTREACHED();
445 return false; 449 return false;
446 } 450 }
447 451
448 } // namespace content 452 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/browser_compositor_view_mac.h ('k') | content/browser/renderer_host/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698