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

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: fix compile on mac Created 7 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) 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
38 float CSSToLengthConversionData::zoom() const 39 float CSSToLengthConversionData::zoom() const
39 { 40 {
40 if (m_useEffectiveZoom) 41 if (m_useEffectiveZoom)
41 return m_style ? m_style->effectiveZoom() : 1; 42 return m_style ? m_style->effectiveZoom() : 1;
42 return m_zoom; 43 return m_zoom;
43 } 44 }
44 45
46 double CSSToLengthConversionData::viewportWidthPercent() const
47 {
48 m_style->setHasViewportUnits();
49 return m_renderView ? m_renderView->viewportWidthPercent() : 0;
50 }
51 double CSSToLengthConversionData::viewportHeightPercent() const
52 {
53 m_style->setHasViewportUnits();
54 return m_renderView ? m_renderView->viewportHeightPercent() : 0;
55 }
56 double CSSToLengthConversionData::viewportMinPercent() const
57 {
58 m_style->setHasViewportUnits();
59 return m_renderView ? m_renderView->viewportMinPercent() : 0;
60 }
61 double CSSToLengthConversionData::viewportMaxPercent() const
62 {
63 m_style->setHasViewportUnits();
64 return m_renderView ? m_renderView->viewportMaxPercent() : 0;
65 }
66
45 } // namespace WebCore 67 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698