Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fsdk_baseform_embeddertest.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "fpdfsdk/include/fsdk_baseform.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "testing/embedder_test.h"
 #include "testing/embedder_test_mock_delegate.h"
 #include "testing/embedder_test_timer_handling_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-void CheckRect(const CFX_FloatRect& actual, const CFX_FloatRect& expected) {
+void CheckRect(const CPDF_Rect& actual, const CPDF_Rect& expected) {
   EXPECT_EQ(expected.left, actual.left);
   EXPECT_EQ(expected.bottom, actual.bottom);
   EXPECT_EQ(expected.right, actual.right);
   EXPECT_EQ(expected.top, actual.top);
 }
 
 }  // namespace
 
 class FSDKBaseFormEmbeddertest : public EmbedderTest {};
 
 TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   EXPECT_TRUE(OpenDocument("annotiter.pdf"));
   EXPECT_TRUE(LoadPage(0));
   EXPECT_TRUE(LoadPage(1));
   EXPECT_TRUE(LoadPage(2));
 
-  CFX_FloatRect LeftBottom(200, 200, 220, 220);
-  CFX_FloatRect RightBottom(400, 201, 420, 221);
-  CFX_FloatRect LeftTop(201, 400, 221, 420);
-  CFX_FloatRect RightTop(401, 401, 421, 421);
+  CPDF_Rect LeftBottom(200, 200, 220, 220);
+  CPDF_Rect RightBottom(400, 201, 420, 221);
+  CPDF_Rect LeftTop(201, 400, 221, 420);
+  CPDF_Rect RightTop(401, 401, 421, 421);
 
   CPDFSDK_Document* pSDKDoc =
       CPDFSDK_Document::FromFPDFFormHandle(form_handle());
   {
     // Page 0 specifies "row order".
     CBA_AnnotIterator iter(pSDKDoc->GetPageView(0), "Widget", "");
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
     CheckRect(pAnnot->GetRect(), LeftTop);
@@ skipping 59 matching lines @@
     pAnnot = iter.GetPrevAnnot(pAnnot);
     CheckRect(pAnnot->GetRect(), LeftTop);
     pAnnot = iter.GetPrevAnnot(pAnnot);
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetPrevAnnot(pAnnot);
     CheckRect(pAnnot->GetRect(), LeftBottom);
     pAnnot = iter.GetPrevAnnot(pAnnot);
     EXPECT_EQ(iter.GetLastAnnot(), pAnnot);
   }
 }