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

Side by Side Diff: services/ui/ws/server_window_surface.h

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Removed added printf statements; LocalFrameId::is_valid() no longer checks if nonce is 0. Created 4 years, 2 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 #ifndef SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 5 #ifndef SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
6 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 6 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // one FrameSink per ServerWindowSurface, it allows the window server 56 // one FrameSink per ServerWindowSurface, it allows the window server
57 // to uniquely identify the window, and the thus the client that generated the 57 // to uniquely identify the window, and the thus the client that generated the
58 // frame. 58 // frame.
59 const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; } 59 const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
60 60
61 // The LocalFrameId can be thought of as an identifier to a bucket of 61 // The LocalFrameId can be thought of as an identifier to a bucket of
62 // sequentially submitted CompositorFrames in the same FrameSink all sharing 62 // sequentially submitted CompositorFrames in the same FrameSink all sharing
63 // the same size and device scale factor. 63 // the same size and device scale factor.
64 const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; } 64 const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
65 65
66 bool has_frame() const { return !local_frame_id_.is_null(); } 66 bool has_frame() const { return local_frame_id_.is_valid(); }
67 67
68 cc::SurfaceId GetSurfaceId() const; 68 cc::SurfaceId GetSurfaceId() const;
69 69
70 // Creates a surface dependency token that expires when this 70 // Creates a surface dependency token that expires when this
71 // ServerWindowSurface goes away. 71 // ServerWindowSurface goes away.
72 cc::SurfaceSequence CreateSurfaceSequence(); 72 cc::SurfaceSequence CreateSurfaceSequence();
73 73
74 ServerWindow* window(); 74 ServerWindow* window();
75 75
76 private: 76 private:
(...skipping 19 matching lines...) Expand all
96 bool may_contain_video_ = false; 96 bool may_contain_video_ = false;
97 97
98 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface); 98 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface);
99 }; 99 };
100 100
101 } // namespace ws 101 } // namespace ws
102 102
103 } // namespace ui 103 } // namespace ui
104 104
105 #endif // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 105 #endif // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698