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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2181953004: Changed ComputedStyle's EVisibility to be an enum class and fixed naming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_move_computedstyle_around
Patch Set: Rebase Created 4 years, 4 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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 || (borderLeftStyle() == BorderStyleNone && other.borderLeftStyl e() == BorderStyleHidden) 659 || (borderLeftStyle() == BorderStyleNone && other.borderLeftStyl e() == BorderStyleHidden)
660 || (borderRightStyle() == BorderStyleHidden && other.borderRight Style() == BorderStyleNone) 660 || (borderRightStyle() == BorderStyleHidden && other.borderRight Style() == BorderStyleNone)
661 || (borderRightStyle() == BorderStyleNone && other.borderRightSt yle() == BorderStyleHidden))) 661 || (borderRightStyle() == BorderStyleNone && other.borderRightSt yle() == BorderStyleHidden)))
662 return true; 662 return true;
663 } else if (m_nonInheritedData.m_effectiveDisplay == LIST_ITEM) { 663 } else if (m_nonInheritedData.m_effectiveDisplay == LIST_ITEM) {
664 if (m_inheritedData.m_listStyleType != other.m_inheritedData.m_listStyle Type 664 if (m_inheritedData.m_listStyleType != other.m_inheritedData.m_listStyle Type
665 || m_inheritedData.m_listStylePosition != other.m_inheritedData.m_li stStylePosition) 665 || m_inheritedData.m_listStylePosition != other.m_inheritedData.m_li stStylePosition)
666 return true; 666 return true;
667 } 667 }
668 668
669 if ((visibility() == COLLAPSE) != (other.visibility() == COLLAPSE)) 669 if ((visibility() == EVisibility::Collapse) != (other.visibility() == EVisib ility::Collapse))
670 return true; 670 return true;
671 671
672 if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScroll bar)) 672 if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScroll bar))
673 return true; 673 return true;
674 674
675 // Movement of non-static-positioned object is special cased in ComputedStyl e::visualInvalidationDiff(). 675 // Movement of non-static-positioned object is special cased in ComputedStyl e::visualInvalidationDiff().
676 676
677 return false; 677 return false;
678 } 678 }
679 679
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 if (value < 0) 1958 if (value < 0)
1959 fvalue -= 0.5f; 1959 fvalue -= 0.5f;
1960 else 1960 else
1961 fvalue += 0.5f; 1961 fvalue += 0.5f;
1962 } 1962 }
1963 1963
1964 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 1964 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
1965 } 1965 }
1966 1966
1967 } // namespace blink 1967 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698