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 3565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3576 texture_id = output_surface_->GetOverlayTextureId(); | 3576 texture_id = output_surface_->GetOverlayTextureId(); |
3577 DCHECK(texture_id || IsContextLost()); | 3577 DCHECK(texture_id || IsContextLost()); |
3578 } else { | 3578 } else { |
3579 pending_overlay_resources_.push_back( | 3579 pending_overlay_resources_.push_back( |
3580 make_scoped_ptr(new ResourceProvider::ScopedReadLockGL( | 3580 make_scoped_ptr(new ResourceProvider::ScopedReadLockGL( |
3581 resource_provider_, overlay.resource_id))); | 3581 resource_provider_, overlay.resource_id))); |
3582 texture_id = pending_overlay_resources_.back()->texture_id(); | 3582 texture_id = pending_overlay_resources_.back()->texture_id(); |
3583 } | 3583 } |
3584 | 3584 |
3585 context_support_->ScheduleOverlayPlane( | 3585 context_support_->ScheduleOverlayPlane( |
3586 overlay.plane_z_order, overlay.transform, texture_id, | 3586 overlay.plane_z_order, overlay.transform, overlay.storage_format, |
3587 ToNearestRect(overlay.display_rect), overlay.uv_rect); | 3587 texture_id, ToNearestRect(overlay.display_rect), overlay.uv_rect, |
| 3588 overlay.handle_scaling); |
3588 } | 3589 } |
3589 } | 3590 } |
3590 | 3591 |
3591 } // namespace cc | 3592 } // namespace cc |
OLD | NEW |