Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7686)

Unified Diff: chrome/renderer/automation/automation_renderer_helper.cc

Issue 15006004: Correct scroll offset range for WebFrame in AutomationRendererHelper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-enable disabled test Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/automation/automation_renderer_helper_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/automation/automation_renderer_helper.cc
diff --git a/chrome/renderer/automation/automation_renderer_helper.cc b/chrome/renderer/automation/automation_renderer_helper.cc
index 71f13408b32b3866558b691a2bc42375de8d0ab3..e856f63d35d678768e8f7e6c92a4524eb46f4e2e 100644
--- a/chrome/renderer/automation/automation_renderer_helper.cc
+++ b/chrome/renderer/automation/automation_renderer_helper.cc
@@ -54,8 +54,6 @@ bool AutomationRendererHelper::SnapshotEntirePage(
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();
@@ -65,7 +63,7 @@ bool AutomationRendererHelper::SnapshotEntirePage(
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));
@@ -78,8 +76,7 @@ bool AutomationRendererHelper::SnapshotEntirePage(
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);
« no previous file with comments | « no previous file | chrome/renderer/automation/automation_renderer_helper_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698