Merge "Move FloatRect from libgfx to libui"

1 files changed, 4 insertions, 4 deletions

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 0eef708afd..46a7338b10 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -477,10 +477,10 @@ Rect Layer::computeInitialCrop(const sp<const DisplayDevice>& hw) const {
     return activeCrop;
 }
 
-gfx::FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const {
+FloatRect Layer::computeCrop(const sp<const DisplayDevice>& 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]: "
@@ -2339,7 +2339,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);