| 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 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); | 176 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); |
| 177 | 177 |
| 178 quad->SetNew(sqs.get(), | 178 quad->SetNew(sqs.get(), |
| 179 output_rect, | 179 output_rect, |
| 180 id, | 180 id, |
| 181 false, // is_replica | 181 false, // is_replica |
| 182 0, // mask_resource_id | 182 0, // mask_resource_id |
| 183 damage_rect, | 183 damage_rect, |
| 184 gfx::Rect(0, 0, 1, 1), // mask_uv_rect | 184 gfx::Rect(0, 0, 1, 1), // mask_uv_rect |
| 185 filters, | 185 filters, |
| 186 skia::RefPtr<SkImageFilter>(), | |
| 187 background_filters); | 186 background_filters); |
| 188 frame->render_pass_list[0]->shared_quad_state_list.push_back(sqs.Pass()); | 187 frame->render_pass_list[0]->shared_quad_state_list.push_back(sqs.Pass()); |
| 189 frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>()); | 188 frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>()); |
| 190 } | 189 } |
| 191 | 190 |
| 192 scoped_ptr<DelegatedFrameData> CreateEmptyFrameData() { | 191 scoped_ptr<DelegatedFrameData> CreateEmptyFrameData() { |
| 193 scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData); | 192 scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData); |
| 194 return frame.Pass(); | 193 return frame.Pass(); |
| 195 } | 194 } |
| 196 | 195 |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1840 base::WaitableEvent wait_event_; | 1839 base::WaitableEvent wait_event_; |
| 1841 base::Lock activate_lock_; | 1840 base::Lock activate_lock_; |
| 1842 int activate_count_; | 1841 int activate_count_; |
| 1843 }; | 1842 }; |
| 1844 | 1843 |
| 1845 SINGLE_AND_MULTI_THREAD_TEST_F( | 1844 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 1846 DelegatedFrameIsActivatedDuringCommit); | 1845 DelegatedFrameIsActivatedDuringCommit); |
| 1847 | 1846 |
| 1848 } // namespace | 1847 } // namespace |
| 1849 } // namespace cc | 1848 } // namespace cc |
| OLD | NEW |