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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2635143002: Changed EBoxSizing to an enum class and renamed its members (Closed)
Patch Set: Aded k prefix Created 3 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@gmail.com> 10 * Christian Biesinger <cbiesinger@gmail.com>
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 oldOffset.height() / zoomFactor); 1567 oldOffset.height() / zoomFactor);
1568 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) { 1568 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) {
1569 newOffset.setWidth(-newOffset.width()); 1569 newOffset.setWidth(-newOffset.width());
1570 adjustedOldOffset.setWidth(-adjustedOldOffset.width()); 1570 adjustedOldOffset.setWidth(-adjustedOldOffset.width());
1571 } 1571 }
1572 1572
1573 LayoutSize difference( 1573 LayoutSize difference(
1574 (currentSize + newOffset - adjustedOldOffset).expandedTo(minimumSize) - 1574 (currentSize + newOffset - adjustedOldOffset).expandedTo(minimumSize) -
1575 currentSize); 1575 currentSize);
1576 1576
1577 bool isBoxSizingBorder = box().style()->boxSizing() == BoxSizingBorderBox; 1577 bool isBoxSizingBorder = box().style()->boxSizing() == EBoxSizing::kBorderBox;
1578 1578
1579 EResize resize = box().style()->resize(); 1579 EResize resize = box().style()->resize();
1580 if (resize != RESIZE_VERTICAL && difference.width()) { 1580 if (resize != RESIZE_VERTICAL && difference.width()) {
1581 if (element->isFormControlElement()) { 1581 if (element->isFormControlElement()) {
1582 // Make implicit margins from the theme explicit (see 1582 // Make implicit margins from the theme explicit (see
1583 // <http://bugs.webkit.org/show_bug.cgi?id=9547>). 1583 // <http://bugs.webkit.org/show_bug.cgi?id=9547>).
1584 element->setInlineStyleProperty(CSSPropertyMarginLeft, 1584 element->setInlineStyleProperty(CSSPropertyMarginLeft,
1585 box().marginLeft() / zoomFactor, 1585 box().marginLeft() / zoomFactor,
1586 CSSPrimitiveValue::UnitType::Pixels); 1586 CSSPrimitiveValue::UnitType::Pixels);
1587 element->setInlineStyleProperty(CSSPropertyMarginRight, 1587 element->setInlineStyleProperty(CSSPropertyMarginRight,
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 2105
2106 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: 2106 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
2107 clampScrollableAreas() { 2107 clampScrollableAreas() {
2108 for (auto& scrollableArea : *s_needsClamp) 2108 for (auto& scrollableArea : *s_needsClamp)
2109 scrollableArea->clampScrollOffsetAfterOverflowChange(); 2109 scrollableArea->clampScrollOffsetAfterOverflowChange();
2110 delete s_needsClamp; 2110 delete s_needsClamp;
2111 s_needsClamp = nullptr; 2111 s_needsClamp = nullptr;
2112 } 2112 }
2113 2113
2114 } // namespace blink 2114 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698