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

Unified Diff: ui/compositor/dip_util.cc

Issue 851853002: It is time. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Trying to reup because the last upload failed. Created 5 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 | « ui/compositor/dip_util.h ('k') | ui/compositor/float_animation_curve_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/dip_util.cc
diff --git a/ui/compositor/dip_util.cc b/ui/compositor/dip_util.cc
deleted file mode 100644
index 69a33a7960182a8360d52c49480d94c6f4e649bc..0000000000000000000000000000000000000000
--- a/ui/compositor/dip_util.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/compositor/dip_util.h"
-
-#include "base/command_line.h"
-#include "cc/layers/layer.h"
-#include "ui/compositor/compositor.h"
-#include "ui/compositor/compositor_switches.h"
-#include "ui/compositor/layer.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/geometry/safe_integer_conversions.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/point_conversions.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_conversions.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/size_conversions.h"
-
-#if DCHECK_IS_ON()
-#include "ui/compositor/layer_animator.h"
-#endif
-
-namespace ui {
-
-float GetDeviceScaleFactor(const Layer* layer) {
- return layer->device_scale_factor();
-}
-
-gfx::Point ConvertPointToDIP(const Layer* layer,
- const gfx::Point& point_in_pixel) {
- return gfx::ToFlooredPoint(
- gfx::ScalePoint(point_in_pixel, 1.0f / GetDeviceScaleFactor(layer)));
-}
-
-gfx::PointF ConvertPointToDIP(const Layer* layer,
- const gfx::PointF& point_in_pixel) {
- return gfx::ScalePoint(point_in_pixel, 1.0f / GetDeviceScaleFactor(layer));
-}
-
-gfx::Size ConvertSizeToDIP(const Layer* layer,
- const gfx::Size& size_in_pixel) {
- return gfx::ToFlooredSize(
- gfx::ScaleSize(size_in_pixel, 1.0f / GetDeviceScaleFactor(layer)));
-}
-
-gfx::Rect ConvertRectToDIP(const Layer* layer,
- const gfx::Rect& rect_in_pixel) {
- float scale = 1.0f / GetDeviceScaleFactor(layer);
- return gfx::ToFlooredRectDeprecated(gfx::ScaleRect(rect_in_pixel, scale));
-}
-
-gfx::Point ConvertPointToPixel(const Layer* layer,
- const gfx::Point& point_in_dip) {
- return gfx::ToFlooredPoint(
- gfx::ScalePoint(point_in_dip, GetDeviceScaleFactor(layer)));
-}
-
-gfx::Size ConvertSizeToPixel(const Layer* layer,
- const gfx::Size& size_in_dip) {
- return gfx::ToFlooredSize(
- gfx::ScaleSize(size_in_dip, GetDeviceScaleFactor(layer)));
-}
-
-gfx::Rect ConvertRectToPixel(const Layer* layer,
- const gfx::Rect& rect_in_dip) {
- float scale = GetDeviceScaleFactor(layer);
- // Use ToEnclosingRect() to ensure we paint all the possible pixels
- // touched. ToEnclosingRect() floors the origin, and ceils the max
- // coordinate. To do otherwise (such as flooring the size) potentially
- // results in rounding down and not drawing all the pixels that are
- // touched.
- return gfx::ToEnclosingRect(
- gfx::RectF(gfx::ScalePoint(rect_in_dip.origin(), scale),
- gfx::ScaleSize(rect_in_dip.size(), scale)));
-}
-
-#if DCHECK_IS_ON()
-namespace {
-
-void CheckSnapped(float snapped_position) {
- const float kEplison = 0.0001f;
- float diff = std::abs(snapped_position - gfx::ToRoundedInt(snapped_position));
- DCHECK_LT(diff, kEplison);
-}
-
-} // namespace
-#endif
-
-void SnapLayerToPhysicalPixelBoundary(ui::Layer* snapped_layer,
- ui::Layer* layer_to_snap) {
- DCHECK_NE(snapped_layer, layer_to_snap);
- DCHECK(snapped_layer);
- DCHECK(snapped_layer->Contains(layer_to_snap));
-
- gfx::Point view_offset_dips = layer_to_snap->GetTargetBounds().origin();
- ui::Layer::ConvertPointToLayer(
- layer_to_snap->parent(), snapped_layer, &view_offset_dips);
- gfx::PointF view_offset = view_offset_dips;
-
- float scale_factor = GetDeviceScaleFactor(layer_to_snap);
- view_offset.Scale(scale_factor);
- gfx::PointF view_offset_snapped(gfx::ToRoundedInt(view_offset.x()),
- gfx::ToRoundedInt(view_offset.y()));
-
- gfx::Vector2dF fudge = view_offset_snapped - view_offset;
- fudge.Scale(1.0 / scale_factor);
- layer_to_snap->SetSubpixelPositionOffset(fudge);
-#if DCHECK_IS_ON()
- gfx::Point layer_offset;
- gfx::PointF origin;
- Layer::ConvertPointToLayer(
- layer_to_snap->parent(), snapped_layer, &layer_offset);
- if (layer_to_snap->GetAnimator()->is_animating()) {
- origin = layer_to_snap->GetTargetBounds().origin() +
- layer_to_snap->subpixel_position_offset();
- } else {
- cc::Layer* cc_layer = layer_to_snap->cc_layer();
- origin = cc_layer->position();
- }
- CheckSnapped((layer_offset.x() + origin.x()) * scale_factor);
- CheckSnapped((layer_offset.y() + origin.y()) * scale_factor);
-#endif
-}
-
-} // namespace ui
« no previous file with comments | « ui/compositor/dip_util.h ('k') | ui/compositor/float_animation_curve_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698