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

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

Issue 2577973002: Moved text-align to be generated in ComputedStyleBase. (Closed)
Patch Set: Removed unneeded comment about text-align keyword ordering. 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 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 m_styleInheritedData->font != other.m_styleInheritedData->font || 805 m_styleInheritedData->font != other.m_styleInheritedData->font ||
806 m_styleInheritedData->horizontal_border_spacing != 806 m_styleInheritedData->horizontal_border_spacing !=
807 other.m_styleInheritedData->horizontal_border_spacing || 807 other.m_styleInheritedData->horizontal_border_spacing ||
808 m_styleInheritedData->vertical_border_spacing != 808 m_styleInheritedData->vertical_border_spacing !=
809 other.m_styleInheritedData->vertical_border_spacing) 809 other.m_styleInheritedData->vertical_border_spacing)
810 return true; 810 return true;
811 } 811 }
812 812
813 if (boxDirection() != other.boxDirection() || 813 if (boxDirection() != other.boxDirection() ||
814 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering || 814 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering ||
815 m_inheritedData.m_textAlign != other.m_inheritedData.m_textAlign || 815 textAlign() != other.textAlign() ||
816 textTransform() != other.textTransform() || 816 textTransform() != other.textTransform() ||
817 m_inheritedData.m_direction != other.m_inheritedData.m_direction || 817 m_inheritedData.m_direction != other.m_inheritedData.m_direction ||
818 whiteSpace() != other.whiteSpace() || 818 whiteSpace() != other.whiteSpace() ||
819 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode) 819 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode)
820 return true; 820 return true;
821 821
822 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX || 822 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX ||
823 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY || 823 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
824 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear || 824 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
825 m_nonInheritedData.m_unicodeBidi != 825 m_nonInheritedData.m_unicodeBidi !=
(...skipping 1648 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 if (value < 0) 2474 if (value < 0)
2475 fvalue -= 0.5f; 2475 fvalue -= 0.5f;
2476 else 2476 else
2477 fvalue += 0.5f; 2477 fvalue += 0.5f;
2478 } 2478 }
2479 2479
2480 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2480 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2481 } 2481 }
2482 2482
2483 } // namespace blink 2483 } // 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