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

Side by Side Diff: components/mus/surfaces/top_level_display_client.cc

Issue 1328953003: Mandoline: Support transforms and clipping of OOPIFs and events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODO Created 5 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/mus/surfaces/top_level_display_client.h" 5 #include "components/mus/surfaces/top_level_display_client.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "cc/surfaces/display.h" 8 #include "cc/surfaces/display.h"
9 #include "cc/surfaces/surface.h"
9 #include "components/mus/gles2/gpu_state.h" 10 #include "components/mus/gles2/gpu_state.h"
10 #include "components/mus/surfaces/surfaces_context_provider.h" 11 #include "components/mus/surfaces/surfaces_context_provider.h"
11 #include "components/mus/surfaces/surfaces_output_surface.h" 12 #include "components/mus/surfaces/surfaces_output_surface.h"
12 #include "components/mus/surfaces/surfaces_scheduler.h" 13 #include "components/mus/surfaces/surfaces_scheduler.h"
13 #include "components/mus/surfaces/surfaces_state.h" 14 #include "components/mus/surfaces/surfaces_state.h"
14 15
15 namespace mus { 16 namespace mus {
16 namespace { 17 namespace {
17 void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) { 18 void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) {
18 callback.Run(); 19 callback.Run();
(...skipping 20 matching lines...) Expand all
39 new SurfacesContextProvider(this, widget, gpu_state))), 40 new SurfacesContextProvider(this, widget, gpu_state))),
40 null_display_scheduler); 41 null_display_scheduler);
41 42
42 display_->Resize(last_submitted_frame_size_); 43 display_->Resize(last_submitted_frame_size_);
43 44
44 // TODO(fsamuel): Plumb the proper device scale factor. 45 // TODO(fsamuel): Plumb the proper device scale factor.
45 display_->SetSurfaceId(cc_id_, 1.f /* device_scale_factor */); 46 display_->SetSurfaceId(cc_id_, 1.f /* device_scale_factor */);
46 } 47 }
47 48
48 TopLevelDisplayClient::~TopLevelDisplayClient() { 49 TopLevelDisplayClient::~TopLevelDisplayClient() {
49 if (display_) { 50 factory_.Destroy(cc_id_);
50 factory_.Destroy(cc_id_); 51 surfaces_state_->scheduler()->RemoveDisplay(display_.get());
51 surfaces_state_->scheduler()->RemoveDisplay(display_.get()); 52 // By deleting the object after display_ is reset, OutputSurfaceLost can
52 // By deleting the object after display_ is reset, OutputSurfaceLost can 53 // know not to do anything (which would result in double delete).
53 // know not to do anything (which would result in double delete). 54 delete display_.release();
54 delete display_.release();
55 }
56 } 55 }
57 56
58 void TopLevelDisplayClient::SubmitCompositorFrame( 57 void TopLevelDisplayClient::SubmitCompositorFrame(
59 scoped_ptr<cc::CompositorFrame> frame, 58 scoped_ptr<cc::CompositorFrame> frame,
60 const base::Closure& callback) { 59 const base::Closure& callback) {
61 pending_frame_ = frame.Pass(); 60 pending_frame_ = frame.Pass();
62 61
63 last_submitted_frame_size_ = 62 last_submitted_frame_size_ =
64 pending_frame_->delegated_frame_data->render_pass_list.back() 63 pending_frame_->delegated_frame_data->render_pass_list.back()
65 ->output_rect.size(); 64 ->output_rect.size();
66 display_->Resize(last_submitted_frame_size_); 65 display_->Resize(last_submitted_frame_size_);
67 factory_.SubmitCompositorFrame(cc_id_, pending_frame_.Pass(), 66 factory_.SubmitCompositorFrame(cc_id_, pending_frame_.Pass(),
68 base::Bind(&CallCallback, callback)); 67 base::Bind(&CallCallback, callback));
69 surfaces_state_->scheduler()->SetNeedsDraw(); 68 surfaces_state_->scheduler()->SetNeedsDraw();
70 } 69 }
71 70
71 const cc::CompositorFrame*
72 TopLevelDisplayClient::GetLastCompositorFrame() const {
73 cc::Surface* surface = surfaces_state_->manager()->GetSurfaceForId(cc_id_);
74 if (!surface)
75 return nullptr;
76 return surface->GetEligibleFrame();
77 }
78
72 void TopLevelDisplayClient::CommitVSyncParameters(base::TimeTicks timebase, 79 void TopLevelDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
73 base::TimeDelta interval) {} 80 base::TimeDelta interval) {}
74 81
75 void TopLevelDisplayClient::OutputSurfaceLost() { 82 void TopLevelDisplayClient::OutputSurfaceLost() {
76 if (!display_) // Shutdown case 83 if (!display_) // Shutdown case
77 return; 84 return;
78 85
79 // If our OutputSurface is lost we can't draw until we get a new one. For now, 86 // If our OutputSurface is lost we can't draw until we get a new one. For now,
80 // destroy the display and create a new one when our ContextProvider provides 87 // destroy the display and create a new one when our ContextProvider provides
81 // a new one. 88 // a new one.
(...skipping 13 matching lines...) Expand all
95 base::TimeTicks::FromInternalValue(timebase), 102 base::TimeTicks::FromInternalValue(timebase),
96 base::TimeDelta::FromInternalValue(interval)); 103 base::TimeDelta::FromInternalValue(interval));
97 } 104 }
98 105
99 void TopLevelDisplayClient::ReturnResources( 106 void TopLevelDisplayClient::ReturnResources(
100 const cc::ReturnedResourceArray& resources) { 107 const cc::ReturnedResourceArray& resources) {
101 // TODO(fsamuel): Implement this. 108 // TODO(fsamuel): Implement this.
102 } 109 }
103 110
104 } // namespace mus 111 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/surfaces/top_level_display_client.h ('k') | components/mus/view_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698