| Index: ui/compositor/dip_util.cc
|
| diff --git a/ui/compositor/dip_util.cc b/ui/compositor/dip_util.cc
|
| index ae418f0030ec3401d2848848beb98710870a796b..7356383c838f83a3a5ce2041d5674ef66e8fceab 100644
|
| --- a/ui/compositor/dip_util.cc
|
| +++ b/ui/compositor/dip_util.cc
|
| @@ -18,7 +18,7 @@
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/gfx/geometry/size_conversions.h"
|
|
|
| -#if DCHECK_IS_ON
|
| +#if DCHECK_IS_ON()
|
| #include "ui/compositor/layer_animator.h"
|
| #endif
|
|
|
| @@ -63,7 +63,7 @@ gfx::Rect ConvertRectToPixel(const Layer* layer,
|
| return gfx::ConvertRectToPixel(GetDeviceScaleFactor(layer), rect_in_dip);
|
| }
|
|
|
| -#if DCHECK_IS_ON
|
| +#if DCHECK_IS_ON()
|
| namespace {
|
|
|
| void CheckSnapped(float snapped_position) {
|
| @@ -94,7 +94,7 @@ void SnapLayerToPhysicalPixelBoundary(ui::Layer* snapped_layer,
|
| gfx::Vector2dF fudge = view_offset_snapped - view_offset;
|
| fudge.Scale(1.0 / scale_factor);
|
| layer_to_snap->SetSubpixelPositionOffset(fudge);
|
| -#if DCHECK_IS_ON
|
| +#if DCHECK_IS_ON()
|
| gfx::Point layer_offset;
|
| gfx::PointF origin;
|
| Layer::ConvertPointToLayer(
|
|
|