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