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

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

Issue 2563913002: Added functionality in ComputedStyleBase to use platform/ types (Closed)
Patch Set: Rebase 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
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('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 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 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 other.m_styleInheritedData->horizontal_border_spacing || 805 other.m_styleInheritedData->horizontal_border_spacing ||
806 m_styleInheritedData->vertical_border_spacing != 806 m_styleInheritedData->vertical_border_spacing !=
807 other.m_styleInheritedData->vertical_border_spacing) 807 other.m_styleInheritedData->vertical_border_spacing)
808 return true; 808 return true;
809 } 809 }
810 810
811 if (boxDirection() != other.boxDirection() || 811 if (boxDirection() != other.boxDirection() ||
812 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering || 812 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering ||
813 textAlign() != other.textAlign() || 813 textAlign() != other.textAlign() ||
814 textTransform() != other.textTransform() || 814 textTransform() != other.textTransform() ||
815 m_inheritedData.m_direction != other.m_inheritedData.m_direction || 815 direction() != other.direction() || whiteSpace() != other.whiteSpace() ||
816 whiteSpace() != other.whiteSpace() ||
817 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode) 816 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode)
818 return true; 817 return true;
819 818
820 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX || 819 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX ||
821 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY || 820 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
822 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear || 821 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
823 m_nonInheritedData.m_unicodeBidi != 822 m_nonInheritedData.m_unicodeBidi !=
824 other.m_nonInheritedData.m_unicodeBidi || 823 other.m_nonInheritedData.m_unicodeBidi ||
825 floating() != other.floating() || 824 floating() != other.floating() ||
826 m_nonInheritedData.m_originalDisplay != 825 m_nonInheritedData.m_originalDisplay !=
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2464 if (value < 0) 2463 if (value < 0)
2465 fvalue -= 0.5f; 2464 fvalue -= 0.5f;
2466 else 2465 else
2467 fvalue += 0.5f; 2466 fvalue += 0.5f;
2468 } 2467 }
2469 2468
2470 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2469 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2471 } 2470 }
2472 2471
2473 } // namespace blink 2472 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698