| Index: cc/output/software_renderer.cc
|
| diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
|
| index b555b57e6abbb11aea15779530a0d98dd857c8f6..5716bb044e9daa29a726c7bd853b98cd65c2fd68 100644
|
| --- a/cc/output/software_renderer.cc
|
| +++ b/cc/output/software_renderer.cc
|
| @@ -53,11 +53,10 @@ scoped_ptr<SoftwareRenderer> SoftwareRenderer::Create(
|
| SoftwareRenderer::SoftwareRenderer(RendererClient* client,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider)
|
| - : DirectRenderer(client, resource_provider),
|
| + : DirectRenderer(client, output_surface, resource_provider),
|
| visible_(true),
|
| is_scissor_enabled_(false),
|
| is_viewport_changed_(true),
|
| - output_surface_(output_surface),
|
| output_device_(output_surface->software_device()),
|
| current_canvas_(NULL) {
|
| if (resource_provider_) {
|
| @@ -88,7 +87,7 @@ void SoftwareRenderer::BeginDrawingFrame(DrawingFrame* frame) {
|
| TRACE_EVENT0("cc", "SoftwareRenderer::BeginDrawingFrame");
|
| if (is_viewport_changed_) {
|
| is_viewport_changed_ = false;
|
| - output_device_->Resize(ViewportSize());
|
| + output_device_->Resize(client_->DeviceViewport().size());
|
| }
|
| root_canvas_ = output_device_->BeginPaint(
|
| gfx::ToEnclosingRect(frame->root_damage_rect));
|
| @@ -146,14 +145,15 @@ void SoftwareRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) {
|
| bool SoftwareRenderer::BindFramebufferToTexture(
|
| DrawingFrame* frame,
|
| const ScopedResource* texture,
|
| - gfx::Rect framebuffer_rect) {
|
| + gfx::Rect target_rect) {
|
| current_framebuffer_lock_.reset();
|
| current_framebuffer_lock_ = make_scoped_ptr(
|
| new ResourceProvider::ScopedWriteLockSoftware(
|
| resource_provider_, texture->id()));
|
| current_canvas_ = current_framebuffer_lock_->sk_canvas();
|
| - InitializeMatrices(frame, framebuffer_rect, false);
|
| - SetDrawViewportSize(framebuffer_rect.size());
|
| + InitializeMatrices(
|
| + frame, target_rect, gfx::Rect(target_rect.size()), false);
|
| + SetDrawViewport(gfx::Rect(target_rect.size()));
|
|
|
| return true;
|
| }
|
| @@ -193,7 +193,7 @@ void SoftwareRenderer::ClearFramebuffer(DrawingFrame* frame) {
|
| }
|
| }
|
|
|
| -void SoftwareRenderer::SetDrawViewportSize(gfx::Size viewport_size) {}
|
| +void SoftwareRenderer::SetDrawViewport(gfx::Rect viewport) {}
|
|
|
| bool SoftwareRenderer::IsSoftwareResource(
|
| ResourceProvider::ResourceId resource_id) const {
|
|
|