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

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

Issue 82083002: Move viewport unit resolution to style recalc time (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: rename browser zoom to page zoom Created 6 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 | « Source/core/css/CSSToLengthConversionData.h ('k') | Source/core/css/MediaQueryEvaluator.cpp » ('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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/css/CSSToLengthConversionData.h" 32 #include "core/css/CSSToLengthConversionData.h"
33 33
34 #include "core/rendering/RenderView.h"
34 #include "core/rendering/style/RenderStyle.h" 35 #include "core/rendering/style/RenderStyle.h"
35 36
36 namespace WebCore { 37 namespace WebCore {
37 38
39 CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, c onst RenderStyle* rootStyle, const RenderView* renderView, float zoom, bool comp utingFontSize)
40 : m_style(style)
41 , m_rootStyle(rootStyle)
42 , m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
43 , m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
44 , m_zoom(zoom)
45 , m_useEffectiveZoom(false)
46 , m_computingFontSize(computingFontSize)
47 {
48 ASSERT(zoom > 0);
49 }
50
51 CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, c onst RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSiz e)
52 : m_style(style)
53 , m_rootStyle(rootStyle)
54 , m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
55 , m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
56 , m_useEffectiveZoom(true)
57 , m_computingFontSize(computingFontSize)
58 {
59 }
60
61 CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, c onst RenderStyle* rootStyle, float viewportWidth, float viewportHeight, float zo om, bool computingFontSize)
62 : m_style(style)
63 , m_rootStyle(rootStyle)
64 , m_viewportWidth(viewportWidth)
65 , m_viewportHeight(viewportHeight)
66 , m_zoom(zoom)
67 , m_useEffectiveZoom(false)
68 , m_computingFontSize(computingFontSize)
69 {
70 ASSERT(zoom > 0);
71 }
72
38 float CSSToLengthConversionData::zoom() const 73 float CSSToLengthConversionData::zoom() const
39 { 74 {
40 if (m_useEffectiveZoom) 75 if (m_useEffectiveZoom)
41 return m_style ? m_style->effectiveZoom() : 1; 76 return m_style ? m_style->effectiveZoom() : 1;
42 return m_zoom; 77 return m_zoom;
43 } 78 }
44 79
80 double CSSToLengthConversionData::viewportWidthPercent() const
81 {
82 m_style->setHasViewportUnits();
83 return m_viewportWidth / 100;
84 }
85 double CSSToLengthConversionData::viewportHeightPercent() const
86 {
87 m_style->setHasViewportUnits();
88 return m_viewportHeight / 100;
89 }
90 double CSSToLengthConversionData::viewportMinPercent() const
91 {
92 m_style->setHasViewportUnits();
93 return std::min(m_viewportWidth, m_viewportHeight) / 100;
94 }
95 double CSSToLengthConversionData::viewportMaxPercent() const
96 {
97 m_style->setHasViewportUnits();
98 return std::max(m_viewportWidth, m_viewportHeight) / 100;
99 }
100
45 } // namespace WebCore 101 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSToLengthConversionData.h ('k') | Source/core/css/MediaQueryEvaluator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698