Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_TEST_LAYER_TREE_PIXEL_TEST_H_ | |
| 6 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_ | |
| 7 | |
| 5 #include <vector> | 8 #include <vector> |
| 6 | 9 |
| 7 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 8 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/resources/single_release_callback.h" | 13 #include "cc/resources/single_release_callback.h" |
| 11 #include "cc/test/layer_tree_test.h" | 14 #include "cc/test/layer_tree_test.h" |
| 12 | 15 #include "ui/gl/gl_implementation.h" |
| 13 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_ | |
| 14 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_ | |
| 15 | 16 |
| 16 class SkBitmap; | 17 class SkBitmap; |
| 17 | 18 |
| 18 namespace gpu { | 19 namespace gpu { |
| 19 class GLInProcessContext; | 20 class GLInProcessContext; |
| 20 } | 21 } |
| 21 | 22 |
| 22 namespace cc { | 23 namespace cc { |
| 23 class CopyOutputRequest; | 24 class CopyOutputRequest; |
| 24 class CopyOutputResult; | 25 class CopyOutputResult; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 uint32 sync_point, | 89 uint32 sync_point, |
| 89 bool lost_resource); | 90 bool lost_resource); |
| 90 | 91 |
| 91 // Common CSS colors defined for tests to use. | 92 // Common CSS colors defined for tests to use. |
| 92 enum Colors { | 93 enum Colors { |
| 93 kCSSOrange = 0xffffa500, | 94 kCSSOrange = 0xffffa500, |
| 94 kCSSBrown = 0xffa52a2a, | 95 kCSSBrown = 0xffa52a2a, |
| 95 kCSSGreen = 0xff008000, | 96 kCSSGreen = 0xff008000, |
| 96 }; | 97 }; |
| 97 | 98 |
| 99 scoped_ptr<gfx::DisableNullDrawGLBindings> enable_pixel_output_; | |
|
enne (OOO)
2014/02/21 21:05:33
Could this just be a member, or does it need to be
danakj
2014/02/21 21:08:31
It means we'd toggle state in the GL bindings for
enne (OOO)
2014/02/21 21:11:37
That is a little weird. I could go either way.
danakj
2014/02/21 21:12:39
Well, I made the other one a simple member instead
| |
| 98 scoped_ptr<PixelComparator> pixel_comparator_; | 100 scoped_ptr<PixelComparator> pixel_comparator_; |
| 99 PixelTestType test_type_; | 101 PixelTestType test_type_; |
| 100 scoped_refptr<Layer> content_root_; | 102 scoped_refptr<Layer> content_root_; |
| 101 Layer* readback_target_; | 103 Layer* readback_target_; |
| 102 base::FilePath ref_file_; | 104 base::FilePath ref_file_; |
| 103 scoped_ptr<SkBitmap> result_bitmap_; | 105 scoped_ptr<SkBitmap> result_bitmap_; |
| 104 std::vector<scoped_refptr<TextureLayer> > texture_layers_; | 106 std::vector<scoped_refptr<TextureLayer> > texture_layers_; |
| 105 int pending_texture_mailbox_callbacks_; | 107 int pending_texture_mailbox_callbacks_; |
| 106 bool impl_side_painting_; | 108 bool impl_side_painting_; |
| 107 }; | 109 }; |
| 108 | 110 |
| 109 } // namespace cc | 111 } // namespace cc |
| 110 | 112 |
| 111 #endif // CC_TEST_LAYER_TREE_PIXEL_TEST_H_ | 113 #endif // CC_TEST_LAYER_TREE_PIXEL_TEST_H_ |
| OLD | NEW |