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

Unified Diff: sky/engine/core/dom/Element.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/resolver/TransformBuilder.cpp ('k') | sky/engine/core/fetch/ImageResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Element.cpp
diff --git a/sky/engine/core/dom/Element.cpp b/sky/engine/core/dom/Element.cpp
index 16ad8b10284046148d2a8235b0bdd8ae48cc5855..b0695676b064bd247006190970a9a3927bbd5f21 100644
--- a/sky/engine/core/dom/Element.cpp
+++ b/sky/engine/core/dom/Element.cpp
@@ -305,42 +305,11 @@ void Element::scrollIntoViewIfNeeded(bool centerIfNeeded)
renderer()->scrollRectToVisible(bounds, ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignToEdgeIfNeeded);
}
-static float localZoomForRenderer(RenderObject& renderer)
-{
- // FIXME: This does the wrong thing if two opposing zooms are in effect and canceled each
- // other out, but the alternative is that we'd have to crawl up the whole render tree every
- // time (or store an additional bit in the RenderStyle to indicate that a zoom was specified).
- float zoomFactor = 1;
- if (renderer.style()->effectiveZoom() != 1) {
- // Need to find the nearest enclosing RenderObject that set up
- // a differing zoom, and then we divide our result by it to eliminate the zoom.
- RenderObject* prev = &renderer;
- for (RenderObject* curr = prev->parent(); curr; curr = curr->parent()) {
- if (curr->style()->effectiveZoom() != prev->style()->effectiveZoom()) {
- zoomFactor = prev->style()->zoom();
- break;
- }
- prev = curr;
- }
- if (prev->isRenderView())
- zoomFactor = prev->style()->zoom();
- }
- return zoomFactor;
-}
-
-static double adjustForLocalZoom(LayoutUnit value, RenderObject& renderer)
-{
- float zoomFactor = localZoomForRenderer(renderer);
- if (zoomFactor == 1)
- return value.toDouble();
- return value.toDouble() / zoomFactor;
-}
-
int Element::offsetLeft()
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBoxModelObject* renderer = renderBoxModelObject())
- return lroundf(adjustForLocalZoom(renderer->offsetLeft(), *renderer));
+ return renderer->offsetLeft();
return 0;
}
@@ -348,7 +317,7 @@ int Element::offsetTop()
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBoxModelObject* renderer = renderBoxModelObject())
- return lroundf(adjustForLocalZoom(renderer->pixelSnappedOffsetTop(), *renderer));
+ return renderer->pixelSnappedOffsetTop();
return 0;
}
@@ -454,7 +423,7 @@ void Element::setScrollLeft(int newLeft)
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
- rend->setScrollLeft(LayoutUnit::fromFloatRound(newLeft * rend->style()->effectiveZoom()));
+ rend->setScrollLeft(newLeft);
}
}
@@ -485,7 +454,7 @@ void Element::setScrollTop(int newTop)
if (document().documentElement() != this) {
if (RenderBox* rend = renderBox())
- rend->setScrollTop(LayoutUnit::fromFloatRound(newTop * rend->style()->effectiveZoom()));
+ rend->setScrollTop(newTop);
}
}
« no previous file with comments | « sky/engine/core/css/resolver/TransformBuilder.cpp ('k') | sky/engine/core/fetch/ImageResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698