| OLD | NEW |
| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 bool has_contents() const { return !!current_buffer_; } | 231 bool has_contents() const { return !!current_buffer_; } |
| 232 | 232 |
| 233 // This is true if the buffer contents should be put in a SurfaceLayer | 233 // This is true if the buffer contents should be put in a SurfaceLayer |
| 234 // rather than a TextureLayer. | 234 // rather than a TextureLayer. |
| 235 static bool use_surface_layer_; | 235 static bool use_surface_layer_; |
| 236 | 236 |
| 237 // This is true when Attach() has been called and new contents should take | 237 // This is true when Attach() has been called and new contents should take |
| 238 // effect next time Commit() is called. | 238 // effect next time Commit() is called. |
| 239 bool has_pending_contents_; | 239 bool has_pending_contents_; |
| 240 | 240 |
| 241 bool changed_viewport_or_crop_ = false; |
| 242 |
| 241 // The buffer that will become the content of surface when Commit() is called. | 243 // The buffer that will become the content of surface when Commit() is called. |
| 242 base::WeakPtr<Buffer> pending_buffer_; | 244 base::WeakPtr<Buffer> pending_buffer_; |
| 243 | 245 |
| 244 cc::SurfaceManager* surface_manager_; | 246 cc::SurfaceManager* surface_manager_; |
| 245 | 247 |
| 246 scoped_refptr<SurfaceFactoryOwner> factory_owner_; | 248 scoped_refptr<SurfaceFactoryOwner> factory_owner_; |
| 247 | 249 |
| 248 // The Surface Id currently attached to the window. | 250 // The Surface Id currently attached to the window. |
| 249 cc::SurfaceId surface_id_; | 251 cc::SurfaceId surface_id_; |
| 250 | 252 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 334 |
| 333 // Surface observer list. Surface does not own the observers. | 335 // Surface observer list. Surface does not own the observers. |
| 334 base::ObserverList<SurfaceObserver, true> observers_; | 336 base::ObserverList<SurfaceObserver, true> observers_; |
| 335 | 337 |
| 336 DISALLOW_COPY_AND_ASSIGN(Surface); | 338 DISALLOW_COPY_AND_ASSIGN(Surface); |
| 337 }; | 339 }; |
| 338 | 340 |
| 339 } // namespace exo | 341 } // namespace exo |
| 340 | 342 |
| 341 #endif // COMPONENTS_EXO_SURFACE_H_ | 343 #endif // COMPONENTS_EXO_SURFACE_H_ |
| OLD | NEW |