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

Side by Side Diff: Source/core/css/CSSToLengthConversionData.cpp

Issue 1181023004: Move rem handling out of CSSParserValues.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Another attempt Created 5 years, 4 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 | « Source/core/css/CSSToLengthConversionData.h ('k') | Source/core/css/StyleSheetContents.h » ('j') | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 { 101 {
102 m_style->setHasViewportUnits(); 102 m_style->setHasViewportUnits();
103 return std::min(m_viewportSize.width(), m_viewportSize.height()) / 100; 103 return std::min(m_viewportSize.width(), m_viewportSize.height()) / 100;
104 } 104 }
105 double CSSToLengthConversionData::viewportMaxPercent() const 105 double CSSToLengthConversionData::viewportMaxPercent() const
106 { 106 {
107 m_style->setHasViewportUnits(); 107 m_style->setHasViewportUnits();
108 return std::max(m_viewportSize.width(), m_viewportSize.height()) / 100; 108 return std::max(m_viewportSize.width(), m_viewportSize.height()) / 100;
109 } 109 }
110 110
111 float CSSToLengthConversionData::remFontSize() const
112 {
113 m_style->setHasRemUnits();
114 return m_fontSizes.rem();
115 }
116
111 } // namespace blink 117 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSToLengthConversionData.h ('k') | Source/core/css/StyleSheetContents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698