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

Unified Diff: cc/layer_tree_host.cc

Issue 12045002: Delete zoomed_viewport_offset_ and its users. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add imports for DisabledTest and rebase to 179449 Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host.h ('k') | cc/layer_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index c237d1a04b6b36bd9d576389e3c6dc94f792ab3b..9386699d42d4b2aa84fb560332e621d5c45565aa 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -752,33 +752,6 @@ void LayerTreeHost::applyScrollAndScale(const ScrollAndScaleSet& info)
m_client->applyScrollAndScale(rootScrollDelta, info.pageScaleDelta);
}
-gfx::PointF LayerTreeHost::adjustEventPointForPinchZoom(const gfx::PointF& zoomedViewportPoint)
- const
-{
- if (m_implTransform.IsIdentity())
- return zoomedViewportPoint;
-
- DCHECK(m_implTransform.IsInvertible());
-
- // Scale to screen space before applying implTransform inverse.
- gfx::PointF zoomedScreenspacePoint = gfx::ScalePoint(zoomedViewportPoint, deviceScaleFactor());
-
- gfx::Transform inverseImplTransform(gfx::Transform::kSkipInitialization);
- if (!m_implTransform.GetInverse(&inverseImplTransform)) {
- // TODO(shawnsingh): Either we need to handle uninvertible transforms
- // here, or DCHECK that the transform is invertible.
- }
-
- bool wasClipped = false;
- gfx::PointF unzoomedScreenspacePoint = MathUtil::projectPoint(inverseImplTransform, zoomedScreenspacePoint, wasClipped);
- DCHECK(!wasClipped);
-
- // Convert back to logical pixels for hit testing.
- gfx::PointF unzoomedViewportPoint = gfx::ScalePoint(unzoomedScreenspacePoint, 1 / deviceScaleFactor());
-
- return unzoomedViewportPoint;
-}
-
void LayerTreeHost::setImplTransform(const gfx::Transform& transform)
{
m_implTransform = transform;
« no previous file with comments | « cc/layer_tree_host.h ('k') | cc/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698