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

Side by Side Diff: components/exo/surface.h

Issue 2661543002: Rename LocalFrameId to LocalSurfaceId (Closed)
Patch Set: c Created 3 years, 10 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
« no previous file with comments | « components/exo/compositor_frame_sink_holder.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef COMPONENTS_EXO_SURFACE_H_ 5 #ifndef COMPONENTS_EXO_SURFACE_H_
6 #define COMPONENTS_EXO_SURFACE_H_ 6 #define COMPONENTS_EXO_SURFACE_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 gfx::Size content_size_; 325 gfx::Size content_size_;
326 326
327 // This is true when Attach() has been called and new contents should take 327 // This is true when Attach() has been called and new contents should take
328 // effect next time Commit() is called. 328 // effect next time Commit() is called.
329 bool has_pending_contents_ = false; 329 bool has_pending_contents_ = false;
330 330
331 // The buffer that will become the content of surface when Commit() is called. 331 // The buffer that will become the content of surface when Commit() is called.
332 BufferAttachment pending_buffer_; 332 BufferAttachment pending_buffer_;
333 333
334 const cc::FrameSinkId frame_sink_id_; 334 const cc::FrameSinkId frame_sink_id_;
335 cc::LocalFrameId local_frame_id_; 335 cc::LocalSurfaceId local_surface_id_;
336 336
337 scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder_; 337 scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder_;
338 338
339 cc::SurfaceIdAllocator id_allocator_; 339 cc::SurfaceIdAllocator id_allocator_;
340 340
341 // The next resource id the buffer will be attached to. 341 // The next resource id the buffer will be attached to.
342 int next_resource_id_ = 1; 342 int next_resource_id_ = 1;
343 343
344 // The damage region to schedule paint for when Commit() is called. 344 // The damage region to schedule paint for when Commit() is called.
345 SkRegion pending_damage_; 345 SkRegion pending_damage_;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // ui::Layer::SetShowSurface because the layer needs to know how to add 416 // ui::Layer::SetShowSurface because the layer needs to know how to add
417 // references to surfaces. 417 // references to surfaces.
418 scoped_refptr<cc::SurfaceReferenceFactory> surface_reference_factory_; 418 scoped_refptr<cc::SurfaceReferenceFactory> surface_reference_factory_;
419 419
420 DISALLOW_COPY_AND_ASSIGN(Surface); 420 DISALLOW_COPY_AND_ASSIGN(Surface);
421 }; 421 };
422 422
423 } // namespace exo 423 } // namespace exo
424 424
425 #endif // COMPONENTS_EXO_SURFACE_H_ 425 #endif // COMPONENTS_EXO_SURFACE_H_
OLDNEW
« no previous file with comments | « components/exo/compositor_frame_sink_holder.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698