Correct scroll offset range for WebFrame in AutomationRendererHelper

chrome/renderer/automation/automation_renderer_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/automation/automation_renderer_helper.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
@@ skipping 36 matching lines @@
 
 AutomationRendererHelper::~AutomationRendererHelper() { }
 
 bool AutomationRendererHelper::SnapshotEntirePage(
     WebView* view,
     std::vector<unsigned char>* png_data,
     std::string* error_msg) {
   WebFrame* frame = view->mainFrame();
   WebSize old_size = view->size();
   WebSize new_size = frame->contentsSize();
-  // For RTL, the minimum scroll offset may be negative.
-  WebSize min_scroll = frame->minimumScrollOffset();
   WebSize old_scroll = frame->scrollOffset();
   bool fixed_layout_enabled = view->isFixedLayoutModeEnabled();
   WebSize fixed_size = view->fixedLayoutSize();
 
   frame->setCanHaveScrollbars(false);
   view->setFixedLayoutSize(old_size);
   view->enableFixedLayoutMode(true);
   view->resize(new_size);
   view->layout();
-  frame->setScrollOffset(WebSize(0, 0));
+  frame->setScrollOffset(frame->minimumScrollOffset());
 
   skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(
       skia::CreatePlatformCanvas(new_size.width, new_size.height, true));
 
   view->paint(webkit_glue::ToWebCanvas(canvas.get()),
               gfx::Rect(0, 0, new_size.width, new_size.height));
 
   frame->setCanHaveScrollbars(true);
   view->setFixedLayoutSize(fixed_size);
   view->enableFixedLayoutMode(fixed_layout_enabled);
   view->resize(old_size);
   view->layout();
-  frame->setScrollOffset(WebSize(old_scroll.width - min_scroll.width,
-                                 old_scroll.height - min_scroll.height));
+  frame->setScrollOffset(old_scroll);
 
   const SkBitmap& bmp = skia::GetTopDevice(*canvas)->accessBitmap(false);
   SkAutoLockPixels lock_pixels(bmp);
   // EncodeBGRA uses FORMAT_SkBitmap, which doesn't work on windows for some
   // cases dealing with transparency. See crbug.com/96317. Use FORMAT_BGRA.
   bool encode_success = gfx::PNGCodec::Encode(
       reinterpret_cast<unsigned char*>(bmp.getPixels()),
       gfx::PNGCodec::FORMAT_BGRA,
       gfx::Size(bmp.width(), bmp.height()),
       bmp.rowBytes(),
@@ skipping 189 matching lines @@
       routing_id(), frame->identifier()));
 }
 
 void AutomationRendererHelper::OnProcessMouseEvent(
     const AutomationMouseEvent& event) {
   std::string error_msg;
   bool success = ProcessMouseEvent(event, &error_msg);
   Send(new AutomationMsg_ProcessMouseEventACK(
       routing_id(), success, error_msg));
 }