summaryrefslogtreecommitdiffstats
path: root/cc/output/software_renderer.cc
diff options
context:
space:
mode:
authorStephen White <senorblanco@chromium.org>2014-10-07 15:01:36 -0400
committerStephen White <senorblanco@chromium.org>2014-10-07 19:02:38 +0000
commitac87ab0c79d04f620b84ed04a81685aebfc0e691 (patch)
treeca649437463ac1fe2d4a260f68390efced11441c /cc/output/software_renderer.cc
parent85a4a581610cf3016769de48e3f96bcd4f060147 (diff)
downloadchromium_src-ac87ab0c79d04f620b84ed04a81685aebfc0e691.zip
chromium_src-ac87ab0c79d04f620b84ed04a81685aebfc0e691.tar.gz
chromium_src-ac87ab0c79d04f620b84ed04a81685aebfc0e691.tar.bz2
Revert "Change FlippedFramebuffer return for surfaceless"
This reverts commit 38542d51c9d4bedc79ac78aca67259b7c0bdc214. This was causing at least 5000 layout tests to fail, e.g., http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28deps%29/builds/34932 TBR=achaulk@chromium.org BUG= Review URL: https://codereview.chromium.org/637593004 Cr-Commit-Position: refs/heads/master@{#298534}
Diffstat (limited to 'cc/output/software_renderer.cc')
-rw-r--r--cc/output/software_renderer.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index a88dba2..ae58b63 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -127,7 +127,7 @@ void SoftwareRenderer::ReceiveSwapBuffersAck(const CompositorFrameAck& ack) {
output_device_->ReclaimSoftwareFrame(ack.last_software_frame_id);
}
-bool SoftwareRenderer::FlippedRootFramebuffer() const {
+bool SoftwareRenderer::FlippedFramebuffer() const {
return false;
}
@@ -162,12 +162,10 @@ bool SoftwareRenderer::BindFramebufferToTexture(
new ResourceProvider::ScopedWriteLockSoftware(
resource_provider_, texture->id()));
current_canvas_ = current_framebuffer_lock_->sk_canvas();
- bool flipped_framebuffer = false;
InitializeViewport(frame,
target_rect,
gfx::Rect(target_rect.size()),
- target_rect.size(),
- flipped_framebuffer);
+ target_rect.size());
return true;
}