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

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

Issue 2506033003: Move list-style-position to be generated in ComputedStyleBase (Closed)
Patch Set: Rebase Created 4 years 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 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 (borderLeftStyle() == BorderStyleNone && 863 (borderLeftStyle() == BorderStyleNone &&
864 other.borderLeftStyle() == BorderStyleHidden) || 864 other.borderLeftStyle() == BorderStyleHidden) ||
865 (borderRightStyle() == BorderStyleHidden && 865 (borderRightStyle() == BorderStyleHidden &&
866 other.borderRightStyle() == BorderStyleNone) || 866 other.borderRightStyle() == BorderStyleNone) ||
867 (borderRightStyle() == BorderStyleNone && 867 (borderRightStyle() == BorderStyleNone &&
868 other.borderRightStyle() == BorderStyleHidden))) 868 other.borderRightStyle() == BorderStyleHidden)))
869 return true; 869 return true;
870 } else if (display() == EDisplay::ListItem) { 870 } else if (display() == EDisplay::ListItem) {
871 if (m_inheritedData.m_listStyleType != 871 if (m_inheritedData.m_listStyleType !=
872 other.m_inheritedData.m_listStyleType || 872 other.m_inheritedData.m_listStyleType ||
873 m_inheritedData.m_listStylePosition != 873 listStylePosition() != other.listStylePosition())
874 other.m_inheritedData.m_listStylePosition)
875 return true; 874 return true;
876 } 875 }
877 876
878 if ((visibility() == EVisibility::Collapse) != 877 if ((visibility() == EVisibility::Collapse) !=
879 (other.visibility() == EVisibility::Collapse)) 878 (other.visibility() == EVisibility::Collapse))
880 return true; 879 return true;
881 880
882 if (hasPseudoStyle(PseudoIdScrollbar) != 881 if (hasPseudoStyle(PseudoIdScrollbar) !=
883 other.hasPseudoStyle(PseudoIdScrollbar)) 882 other.hasPseudoStyle(PseudoIdScrollbar))
884 return true; 883 return true;
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
2446 if (value < 0) 2445 if (value < 0)
2447 fvalue -= 0.5f; 2446 fvalue -= 0.5f;
2448 else 2447 else
2449 fvalue += 0.5f; 2448 fvalue += 0.5f;
2450 } 2449 }
2451 2450
2452 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2451 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2453 } 2452 }
2454 2453
2455 } // namespace blink 2454 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698