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

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

Issue 2528283002: Move text-transform 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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 m_styleInheritedData->horizontal_border_spacing != 814 m_styleInheritedData->horizontal_border_spacing !=
815 other.m_styleInheritedData->horizontal_border_spacing || 815 other.m_styleInheritedData->horizontal_border_spacing ||
816 m_styleInheritedData->vertical_border_spacing != 816 m_styleInheritedData->vertical_border_spacing !=
817 other.m_styleInheritedData->vertical_border_spacing) 817 other.m_styleInheritedData->vertical_border_spacing)
818 return true; 818 return true;
819 } 819 }
820 820
821 if (m_inheritedData.m_boxDirection != other.m_inheritedData.m_boxDirection || 821 if (m_inheritedData.m_boxDirection != other.m_inheritedData.m_boxDirection ||
822 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering || 822 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering ||
823 m_inheritedData.m_textAlign != other.m_inheritedData.m_textAlign || 823 m_inheritedData.m_textAlign != other.m_inheritedData.m_textAlign ||
824 m_inheritedData.m_textTransform != 824 textTransform() != other.textTransform() ||
825 other.m_inheritedData.m_textTransform ||
826 m_inheritedData.m_direction != other.m_inheritedData.m_direction || 825 m_inheritedData.m_direction != other.m_inheritedData.m_direction ||
827 m_inheritedData.m_whiteSpace != other.m_inheritedData.m_whiteSpace || 826 m_inheritedData.m_whiteSpace != other.m_inheritedData.m_whiteSpace ||
828 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode) 827 m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode)
829 return true; 828 return true;
830 829
831 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX || 830 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX ||
832 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY || 831 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
833 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear || 832 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
834 m_nonInheritedData.m_unicodeBidi != 833 m_nonInheritedData.m_unicodeBidi !=
835 other.m_nonInheritedData.m_unicodeBidi || 834 other.m_nonInheritedData.m_unicodeBidi ||
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
2445 if (value < 0) 2444 if (value < 0)
2446 fvalue -= 0.5f; 2445 fvalue -= 0.5f;
2447 else 2446 else
2448 fvalue += 0.5f; 2447 fvalue += 0.5f;
2449 } 2448 }
2450 2449
2451 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2450 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2452 } 2451 }
2453 2452
2454 } // namespace blink 2453 } // 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