Removing the staging flag for Google3 (SK_PARAGRAPH_ROUND_POSITION)

Change-Id: I45ff82fb1e6083c90248b174b8d088d91be75825
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398216
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni
index 4a8b493..2c7e175 100644
--- a/gn/flutter_defines.gni
+++ b/gn/flutter_defines.gni
@@ -14,9 +14,6 @@
   # Things we do for Flutter but don't want in general text layout
   "SK_PARAGRAPH_LIBTXT_SPACES_RESOLUTION",
 
-  # Staging changes for Google3 (want to test it first)
-  "SK_PARAGRAPH_ROUND_POSITION",
-
   # Staging
 
   # Fast low-precision software rendering isn't a priority for Flutter.
diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
index 8d0e8ba..7275c0c 100644
--- a/modules/skparagraph/src/TextLine.cpp
+++ b/modules/skparagraph/src/TextLine.cpp
@@ -1155,12 +1155,12 @@
 
                 SkScalar offsetX = this->offset().fX;
                 ClipContext context = context0;
-#ifndef SK_PARAGRAPH_ROUND_POSITION
+
                 // This patch will help us to avoid a floating point error
                 if (SkScalarNearlyEqual(context.clip.fRight, dx - offsetX, 0.01f)) {
                     context.clip.fRight = dx - offsetX;
                 }
-#endif
+
                 if (dx < context.clip.fLeft + offsetX) {
                     // All the other runs are placed right of this one
                     auto utf16Index = fOwner->getUTF16Index(context.run->globalClusterIndex(context.pos));