| OLD | NEW |
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 CC_QUADS_SHARED_QUAD_STATE_H_ | 5 #ifndef CC_QUADS_SHARED_QUAD_STATE_H_ |
| 6 #define CC_QUADS_SHARED_QUAD_STATE_H_ | 6 #define CC_QUADS_SHARED_QUAD_STATE_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include <memory> |
| 9 |
| 9 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| 10 #include "third_party/skia/include/core/SkXfermode.h" | 11 #include "third_party/skia/include/core/SkXfermode.h" |
| 11 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 12 #include "ui/gfx/transform.h" | 13 #include "ui/gfx/transform.h" |
| 13 | 14 |
| 14 namespace base { | 15 namespace base { |
| 15 namespace trace_event { | 16 namespace trace_event { |
| 16 class TracedValue; | 17 class TracedValue; |
| 17 } | 18 } |
| 18 class Value; | 19 class Value; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 gfx::Rect clip_rect; | 54 gfx::Rect clip_rect; |
| 54 bool is_clipped; | 55 bool is_clipped; |
| 55 float opacity; | 56 float opacity; |
| 56 SkXfermode::Mode blend_mode; | 57 SkXfermode::Mode blend_mode; |
| 57 int sorting_context_id; | 58 int sorting_context_id; |
| 58 }; | 59 }; |
| 59 | 60 |
| 60 } // namespace cc | 61 } // namespace cc |
| 61 | 62 |
| 62 #endif // CC_QUADS_SHARED_QUAD_STATE_H_ | 63 #endif // CC_QUADS_SHARED_QUAD_STATE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1866203004:
Convert //cc from scoped_ptr to std::unique_ptr. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master