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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 9 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 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 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 other.borderBottomStyle() == BorderStyleHidden) || 823 other.borderBottomStyle() == BorderStyleHidden) ||
824 (borderLeftStyle() == BorderStyleHidden && 824 (borderLeftStyle() == BorderStyleHidden &&
825 other.borderLeftStyle() == BorderStyleNone) || 825 other.borderLeftStyle() == BorderStyleNone) ||
826 (borderLeftStyle() == BorderStyleNone && 826 (borderLeftStyle() == BorderStyleNone &&
827 other.borderLeftStyle() == BorderStyleHidden) || 827 other.borderLeftStyle() == BorderStyleHidden) ||
828 (borderRightStyle() == BorderStyleHidden && 828 (borderRightStyle() == BorderStyleHidden &&
829 other.borderRightStyle() == BorderStyleNone) || 829 other.borderRightStyle() == BorderStyleNone) ||
830 (borderRightStyle() == BorderStyleNone && 830 (borderRightStyle() == BorderStyleNone &&
831 other.borderRightStyle() == BorderStyleHidden))) 831 other.borderRightStyle() == BorderStyleHidden)))
832 return true; 832 return true;
833 } else if (display() == EDisplay::ListItem) { 833 } else if (display() == EDisplay::kListItem) {
834 if (listStyleType() != other.listStyleType() || 834 if (listStyleType() != other.listStyleType() ||
835 listStylePosition() != other.listStylePosition()) 835 listStylePosition() != other.listStylePosition())
836 return true; 836 return true;
837 } 837 }
838 838
839 if ((visibility() == EVisibility::kCollapse) != 839 if ((visibility() == EVisibility::kCollapse) !=
840 (other.visibility() == EVisibility::kCollapse)) 840 (other.visibility() == EVisibility::kCollapse))
841 return true; 841 return true;
842 842
843 if (hasPseudoStyle(PseudoIdScrollbar) != 843 if (hasPseudoStyle(PseudoIdScrollbar) !=
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2481 if (value < 0) 2481 if (value < 0)
2482 fvalue -= 0.5f; 2482 fvalue -= 0.5f;
2483 else 2483 else
2484 fvalue += 0.5f; 2484 fvalue += 0.5f;
2485 } 2485 }
2486 2486
2487 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2487 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2488 } 2488 }
2489 2489
2490 } // namespace blink 2490 } // 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