| 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 CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_ | 5 #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| 6 #define CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_ | 6 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 10 #include "cc/resources/display_item.h" | 10 #include "cc/playback/display_item.h" |
| 11 #include "skia/ext/refptr.h" | 11 #include "skia/ext/refptr.h" |
| 12 #include "third_party/skia/include/core/SkColorFilter.h" | 12 #include "third_party/skia/include/core/SkColorFilter.h" |
| 13 #include "third_party/skia/include/core/SkRect.h" | 13 #include "third_party/skia/include/core/SkRect.h" |
| 14 #include "third_party/skia/include/core/SkXfermode.h" | 14 #include "third_party/skia/include/core/SkXfermode.h" |
| 15 #include "ui/gfx/geometry/rect_f.h" | 15 #include "ui/gfx/geometry/rect_f.h" |
| 16 | 16 |
| 17 class SkCanvas; | 17 class SkCanvas; |
| 18 class SkDrawPictureCallback; | 18 class SkDrawPictureCallback; |
| 19 | 19 |
| 20 namespace cc { | 20 namespace cc { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 48 static scoped_ptr<EndCompositingDisplayItem> Create() { | 48 static scoped_ptr<EndCompositingDisplayItem> Create() { |
| 49 return make_scoped_ptr(new EndCompositingDisplayItem()); | 49 return make_scoped_ptr(new EndCompositingDisplayItem()); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override; | 52 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override; |
| 53 void AsValueInto(base::trace_event::TracedValue* array) const override; | 53 void AsValueInto(base::trace_event::TracedValue* array) const override; |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 } // namespace cc | 56 } // namespace cc |
| 57 | 57 |
| 58 #endif // CC_RESOURCES_COMPOSITING_DISPLAY_ITEM_H_ | 58 #endif // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| OLD | NEW |