OLD | NEW |
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/output/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 3563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3574 texture_id = output_surface_->GetOverlayTextureId(); | 3574 texture_id = output_surface_->GetOverlayTextureId(); |
3575 DCHECK(texture_id || IsContextLost()); | 3575 DCHECK(texture_id || IsContextLost()); |
3576 } else { | 3576 } else { |
3577 pending_overlay_resources_.push_back( | 3577 pending_overlay_resources_.push_back( |
3578 make_scoped_ptr(new ResourceProvider::ScopedReadLockGL( | 3578 make_scoped_ptr(new ResourceProvider::ScopedReadLockGL( |
3579 resource_provider_, overlay.resource_id))); | 3579 resource_provider_, overlay.resource_id))); |
3580 texture_id = pending_overlay_resources_.back()->texture_id(); | 3580 texture_id = pending_overlay_resources_.back()->texture_id(); |
3581 } | 3581 } |
3582 | 3582 |
3583 context_support_->ScheduleOverlayPlane( | 3583 context_support_->ScheduleOverlayPlane( |
3584 overlay.plane_z_order, overlay.transform, texture_id, | 3584 overlay.plane_z_order, overlay.transform, overlay.storage_format, |
3585 ToNearestRect(overlay.display_rect), overlay.uv_rect); | 3585 texture_id, ToNearestRect(overlay.display_rect), overlay.uv_rect, |
| 3586 overlay.handle_scaling); |
3586 } | 3587 } |
3587 } | 3588 } |
3588 | 3589 |
3589 } // namespace cc | 3590 } // namespace cc |
OLD | NEW |