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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1402793002: RoundOff scrollableArea scrollHeight. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed review comments Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 } 448 }
449 449
450 int LayoutBox::pixelSnappedScrollWidth() const 450 int LayoutBox::pixelSnappedScrollWidth() const
451 { 451 {
452 return snapSizeToPixel(scrollWidth(), location().x() + clientLeft()); 452 return snapSizeToPixel(scrollWidth(), location().x() + clientLeft());
453 } 453 }
454 454
455 int LayoutBox::pixelSnappedScrollHeight() const 455 int LayoutBox::pixelSnappedScrollHeight() const
456 { 456 {
457 if (hasOverflowClip()) 457 if (hasOverflowClip())
458 return layer()->scrollableArea()->scrollHeight(); 458 return snapSizeToPixel(layer()->scrollableArea()->scrollHeight(), locati on().y() + clientTop());
459 // For objects with visible overflow, this matches IE. 459 // For objects with visible overflow, this matches IE.
460 // FIXME: Need to work right with writing modes. 460 // FIXME: Need to work right with writing modes.
461 return snapSizeToPixel(scrollHeight(), location().y() + clientTop()); 461 return snapSizeToPixel(scrollHeight(), location().y() + clientTop());
462 } 462 }
463 463
464 void LayoutBox::setScrollLeft(LayoutUnit newLeft) 464 void LayoutBox::setScrollLeft(LayoutUnit newLeft)
465 { 465 {
466 // This doesn't hit in any tests, but since the equivalent code in setScroll Top 466 // This doesn't hit in any tests, but since the equivalent code in setScroll Top
467 // does, presumably this code does as well. 467 // does, presumably this code does as well.
468 DisableCompositingQueryAsserts disabler; 468 DisableCompositingQueryAsserts disabler;
(...skipping 4365 matching lines...) Expand 10 before | Expand all | Expand 10 after
4834 StyleImage* borderImage = style()->borderImage().image(); 4834 StyleImage* borderImage = style()->borderImage().image();
4835 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); 4835 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded();
4836 } 4836 }
4837 4837
4838 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const 4838 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
4839 { 4839 {
4840 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; 4840 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
4841 } 4841 }
4842 4842
4843 } // namespace blink 4843 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698