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}

1 files changed, 6 insertions, 6 deletions

diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index 97f290c..ad39f1a 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -81,8 +81,9 @@ void DirectRenderer::QuadRectTransform(gfx::Transform* quad_rect_transform,
 void DirectRenderer::InitializeViewport(DrawingFrame* frame,
                                         const gfx::Rect& draw_rect,
                                         const gfx::Rect& viewport_rect,
-                                        const gfx::Size& surface_size,
-                                        bool flip_y) {
+                                        const gfx::Size& surface_size) {
+  bool flip_y = FlippedFramebuffer();
+
   DCHECK_GE(viewport_rect.x(), 0);
   DCHECK_GE(viewport_rect.y(), 0);
   DCHECK_LE(viewport_rect.right(), surface_size.width());
@@ -118,7 +119,7 @@ gfx::Rect DirectRenderer::MoveFromDrawToWindowSpace(
   gfx::Rect window_rect = draw_rect;
   window_rect -= current_draw_rect_.OffsetFromOrigin();
   window_rect += current_viewport_rect_.OffsetFromOrigin();
-  if (FlippedRootFramebuffer())
+  if (FlippedFramebuffer())
     window_rect.set_y(current_surface_size_.height() - window_rect.bottom());
   return window_rect;
 }
@@ -278,7 +279,7 @@ bool DirectRenderer::NeedDeviceClip(const DrawingFrame* frame) const {
 gfx::Rect DirectRenderer::DeviceClipRectInWindowSpace(const DrawingFrame* frame)
     const {
   gfx::Rect device_clip_rect = frame->device_clip_rect;
-  if (FlippedRootFramebuffer())
+  if (FlippedFramebuffer())
     device_clip_rect.set_y(current_surface_size_.height() -
                            device_clip_rect.bottom());
   return device_clip_rect;
@@ -396,8 +397,7 @@ bool DirectRenderer::UseRenderPass(DrawingFrame* frame,
     InitializeViewport(frame,
                        render_pass->output_rect,
                        frame->device_viewport_rect,
-                       output_surface_->SurfaceSize(),
-                       FlippedRootFramebuffer());
+                       output_surface_->SurfaceSize());
     return true;
   }