| Index: ui/gfx/rect_conversions.h
|
| diff --git a/ui/gfx/rect_conversions.h b/ui/gfx/rect_conversions.h
|
| index 988f6c76418869653081b9add77044157ed26e5e..537435120c02378f2d9a0e380c02dc3c5d00de9a 100644
|
| --- a/ui/gfx/rect_conversions.h
|
| +++ b/ui/gfx/rect_conversions.h
|
| @@ -1,36 +1,7 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 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.
|
|
|
| -#ifndef UI_GFX_RECT_CONVERSIONS_H_
|
| -#define UI_GFX_RECT_CONVERSIONS_H_
|
| +// TODO(beng): remove once callsites are patched.
|
| +#include "ui/gfx/geometry/rect_conversions.h"
|
|
|
| -#include "ui/gfx/rect.h"
|
| -#include "ui/gfx/rect_f.h"
|
| -
|
| -namespace gfx {
|
| -
|
| -// Returns the smallest Rect that encloses the given RectF.
|
| -GFX_EXPORT Rect ToEnclosingRect(const RectF& rect);
|
| -
|
| -// Returns the largest Rect that is enclosed by the given RectF.
|
| -GFX_EXPORT Rect ToEnclosedRect(const RectF& rect);
|
| -
|
| -// Returns the Rect after snapping the corners of the RectF to an integer grid.
|
| -// This should only be used when the RectF you provide is expected to be an
|
| -// integer rect with floating point error. If it is an arbitrary RectF, then
|
| -// you should use a different method.
|
| -GFX_EXPORT Rect ToNearestRect(const RectF& rect);
|
| -
|
| -// Returns true if the Rect produced after snapping the corners of the RectF
|
| -// to an integer grid is withing |distance|.
|
| -GFX_EXPORT bool IsNearestRectWithinDistance(
|
| - const gfx::RectF& rect, float distance);
|
| -
|
| -// Returns a Rect obtained by flooring the values of the given RectF.
|
| -// Please prefer the previous two functions in new code.
|
| -GFX_EXPORT Rect ToFlooredRectDeprecated(const RectF& rect);
|
| -
|
| -} // namespace gfx
|
| -
|
| -#endif // UI_GFX_RECT_CONVERSIONS_H_
|
|
|