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

Unified Diff: sky/engine/core/css/CSSToLengthConversionData.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSToLengthConversionData.h ('k') | sky/engine/core/css/CSSValuePool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSToLengthConversionData.cpp
diff --git a/sky/engine/core/css/CSSToLengthConversionData.cpp b/sky/engine/core/css/CSSToLengthConversionData.cpp
index c2871410fd3451c546d513f50ba2765746113fed..eaedf260d42f3846c503b58c6444871d789b0fcc 100644
--- a/sky/engine/core/css/CSSToLengthConversionData.cpp
+++ b/sky/engine/core/css/CSSToLengthConversionData.cpp
@@ -36,47 +36,15 @@
namespace blink {
-CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, float zoom, bool computingFontSize)
- : m_style(style)
- , m_rootStyle(rootStyle)
- , m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
- , m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
- , m_zoom(zoom)
- , m_useEffectiveZoom(false)
- , m_computingFontSize(computingFontSize)
-{
- ASSERT(zoom > 0);
-}
-
CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSize)
: m_style(style)
, m_rootStyle(rootStyle)
, m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
, m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
- , m_useEffectiveZoom(true)
, m_computingFontSize(computingFontSize)
{
}
-CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingFontSize)
- : m_style(style)
- , m_rootStyle(rootStyle)
- , m_viewportWidth(viewportWidth)
- , m_viewportHeight(viewportHeight)
- , m_zoom(zoom)
- , m_useEffectiveZoom(false)
- , m_computingFontSize(computingFontSize)
-{
- ASSERT(zoom > 0);
-}
-
-float CSSToLengthConversionData::zoom() const
-{
- if (m_useEffectiveZoom)
- return m_style ? m_style->effectiveZoom() : 1;
- return m_zoom;
-}
-
double CSSToLengthConversionData::viewportWidthPercent() const
{
m_style->setHasViewportUnits();
« no previous file with comments | « sky/engine/core/css/CSSToLengthConversionData.h ('k') | sky/engine/core/css/CSSValuePool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698