From 5a423eaa86f4c990afcef8c55e3949d0872068b4 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Thu, 16 Feb 2017 14:10:39 -0800 Subject: Move FloatRect from libgfx to libui Moves FloatRect from libgfx (which is being disintegrated) to libui Test: Builds and sailfish boots Change-Id: I68c1b7d86a363066fe4d6f0c038ca9d92d7ab9c7 --- services/surfaceflinger/Layer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/surfaceflinger/Layer.cpp') diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index a854aec4bd..d04558623c 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -477,10 +477,10 @@ Rect Layer::computeInitialCrop(const sp& hw) const { return activeCrop; } -gfx::FloatRect Layer::computeCrop(const sp& hw) const { +FloatRect Layer::computeCrop(const sp& hw) const { // the content crop is the area of the content that gets scaled to the // layer's size. This is in buffer space. - gfx::FloatRect crop = getContentCrop().toFloatRect(); + FloatRect crop = getContentCrop().toFloatRect(); // In addition there is a WM-specified crop we pull from our drawing state. const State& s(getDrawingState()); @@ -674,7 +674,7 @@ void Layer::setGeometry( hwcInfo.displayFrame = transformedFrame; } - gfx::FloatRect sourceCrop = computeCrop(displayDevice); + FloatRect sourceCrop = computeCrop(displayDevice); error = hwcLayer->setSourceCrop(sourceCrop); if (error != HWC2::Error::None) { ALOGE("[%s] Failed to set source crop [%.3f, %.3f, %.3f, %.3f]: " @@ -2338,7 +2338,7 @@ void Layer::miniDump(String8& result, int32_t hwcId) const { const Rect& frame = hwcInfo.displayFrame; result.appendFormat("%4d %4d %4d %4d | ", frame.left, frame.top, frame.right, frame.bottom); - const gfx::FloatRect& crop = hwcInfo.sourceCrop; + const FloatRect& crop = hwcInfo.sourceCrop; result.appendFormat("%6.1f %6.1f %6.1f %6.1f\n", crop.left, crop.top, crop.right, crop.bottom); -- cgit v1.2.3-59-g8ed1b