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

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

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/CSSPrimitiveValue.cpp ('k') | sky/engine/core/css/CSSToLengthConversionData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSToLengthConversionData.h
diff --git a/sky/engine/core/css/CSSToLengthConversionData.h b/sky/engine/core/css/CSSToLengthConversionData.h
index e9595dea95e20eb2f705e28638713fd05d90536f..fcbd83e914a49be5bf8b27e689a4880b6bf94e2e 100644
--- a/sky/engine/core/css/CSSToLengthConversionData.h
+++ b/sky/engine/core/css/CSSToLengthConversionData.h
@@ -41,13 +41,10 @@ class RenderView;
class CSSToLengthConversionData {
public:
- CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, const RenderView*, float zoom, bool computingFontSize = false);
CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, const RenderView*, bool computingFontSize = false);
- CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingFontSize = false);
const RenderStyle& style() const { return *m_style; }
const RenderStyle* rootStyle() const { return m_rootStyle; }
- float zoom() const;
bool computingFontSize() const { return m_computingFontSize; }
// Accessing these marks the style as having viewport units
@@ -59,18 +56,11 @@ public:
void setStyle(const RenderStyle* style) { m_style = style; }
void setRootStyle(const RenderStyle* rootStyle) { m_rootStyle = rootStyle; }
- CSSToLengthConversionData copyWithAdjustedZoom(float newZoom) const
- {
- return CSSToLengthConversionData(m_style, m_rootStyle, m_viewportWidth, m_viewportHeight, newZoom, m_computingFontSize);
- }
-
private:
const RenderStyle* m_style;
const RenderStyle* m_rootStyle;
float m_viewportWidth;
float m_viewportHeight;
- float m_zoom;
- bool m_useEffectiveZoom;
bool m_computingFontSize;
};
« no previous file with comments | « sky/engine/core/css/CSSPrimitiveValue.cpp ('k') | sky/engine/core/css/CSSToLengthConversionData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698