| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/compositor/layer.h" | 5 #include "ui/compositor/layer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_), | 607 canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_), |
| 608 SkFloatToScalar(device_scale_factor_)); | 608 SkFloatToScalar(device_scale_factor_)); |
| 609 } | 609 } |
| 610 | 610 |
| 611 if (delegate_) | 611 if (delegate_) |
| 612 delegate_->OnPaintLayer(canvas.get()); | 612 delegate_->OnPaintLayer(canvas.get()); |
| 613 if (scale_content) | 613 if (scale_content) |
| 614 canvas->Restore(); | 614 canvas->Restore(); |
| 615 } | 615 } |
| 616 | 616 |
| 617 unsigned Layer::prepareTexture(cc::ResourceUpdateQueue&) { | 617 unsigned Layer::PrepareTexture(cc::ResourceUpdateQueue* queue) { |
| 618 DCHECK(texture_layer_); | 618 DCHECK(texture_layer_); |
| 619 return texture_->PrepareTexture(); | 619 return texture_->PrepareTexture(); |
| 620 } | 620 } |
| 621 | 621 |
| 622 WebKit::WebGraphicsContext3D* Layer::context() { | 622 WebKit::WebGraphicsContext3D* Layer::Context3d() { |
| 623 DCHECK(texture_layer_); | 623 DCHECK(texture_layer_); |
| 624 return texture_->HostContext3D(); | 624 return texture_->HostContext3D(); |
| 625 } | 625 } |
| 626 | 626 |
| 627 void Layer::SetForceRenderSurface(bool force) { | 627 void Layer::SetForceRenderSurface(bool force) { |
| 628 if (force_render_surface_ == force) | 628 if (force_render_surface_ == force) |
| 629 return; | 629 return; |
| 630 | 630 |
| 631 force_render_surface_ = force; | 631 force_render_surface_ = force; |
| 632 cc_layer_->SetForceRenderSurface(force_render_surface_); | 632 cc_layer_->SetForceRenderSurface(force_render_surface_); |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 926 texture_layer_->SetUV(uv_top_left, uv_bottom_right); | 926 texture_layer_->SetUV(uv_top_left, uv_bottom_right); |
| 927 } else if (delegated_renderer_layer_.get()) { | 927 } else if (delegated_renderer_layer_.get()) { |
| 928 delegated_renderer_layer_->SetDisplaySize( | 928 delegated_renderer_layer_->SetDisplaySize( |
| 929 ConvertSizeToPixel(this, delegated_frame_size_in_dip_)); | 929 ConvertSizeToPixel(this, delegated_frame_size_in_dip_)); |
| 930 size.ClampToMax(delegated_frame_size_in_dip_); | 930 size.ClampToMax(delegated_frame_size_in_dip_); |
| 931 } | 931 } |
| 932 cc_layer_->SetBounds(ConvertSizeToPixel(this, size)); | 932 cc_layer_->SetBounds(ConvertSizeToPixel(this, size)); |
| 933 } | 933 } |
| 934 | 934 |
| 935 } // namespace ui | 935 } // namespace ui |
| OLD | NEW |