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

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

Issue 2704343003: Catch up the spec update in CSS Rhythmic Sizing (Closed)
Patch Set: Sorted CSSProperties.json5 alphabetically (meade@'s nit) 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 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 m_rareInheritedData->m_textOrientation != 767 m_rareInheritedData->m_textOrientation !=
768 other.m_rareInheritedData->m_textOrientation || 768 other.m_rareInheritedData->m_textOrientation ||
769 m_rareInheritedData->m_textCombine != 769 m_rareInheritedData->m_textCombine !=
770 other.m_rareInheritedData->m_textCombine || 770 other.m_rareInheritedData->m_textCombine ||
771 m_rareInheritedData->m_tabSize != 771 m_rareInheritedData->m_tabSize !=
772 other.m_rareInheritedData->m_tabSize || 772 other.m_rareInheritedData->m_tabSize ||
773 m_rareInheritedData->m_textSizeAdjust != 773 m_rareInheritedData->m_textSizeAdjust !=
774 other.m_rareInheritedData->m_textSizeAdjust || 774 other.m_rareInheritedData->m_textSizeAdjust ||
775 m_rareInheritedData->listStyleImage != 775 m_rareInheritedData->listStyleImage !=
776 other.m_rareInheritedData->listStyleImage || 776 other.m_rareInheritedData->listStyleImage ||
777 m_rareInheritedData->m_snapHeightUnit != 777 m_rareInheritedData->m_lineHeightStep !=
778 other.m_rareInheritedData->m_snapHeightUnit || 778 other.m_rareInheritedData->m_lineHeightStep ||
779 m_rareInheritedData->m_snapHeightPosition !=
780 other.m_rareInheritedData->m_snapHeightPosition ||
781 m_rareInheritedData->textStrokeWidth != 779 m_rareInheritedData->textStrokeWidth !=
782 other.m_rareInheritedData->textStrokeWidth) 780 other.m_rareInheritedData->textStrokeWidth)
783 return true; 781 return true;
784 782
785 if (!m_rareInheritedData->shadowDataEquivalent( 783 if (!m_rareInheritedData->shadowDataEquivalent(
786 *other.m_rareInheritedData.get())) 784 *other.m_rareInheritedData.get()))
787 return true; 785 return true;
788 786
789 if (!m_rareInheritedData->quotesDataEquivalent( 787 if (!m_rareInheritedData->quotesDataEquivalent(
790 *other.m_rareInheritedData.get())) 788 *other.m_rareInheritedData.get()))
(...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
2498 if (value < 0) 2496 if (value < 0)
2499 fvalue -= 0.5f; 2497 fvalue -= 0.5f;
2500 else 2498 else
2501 fvalue += 0.5f; 2499 fvalue += 0.5f;
2502 } 2500 }
2503 2501
2504 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2502 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2505 } 2503 }
2506 2504
2507 } // namespace blink 2505 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698