Change BackgroundPart::location from pp::Rect to gfx::Rect

This CL changes BackgroundPart::location from pp::Rect to gfx::Rect so
that `background_parts_` can be migrated to PdfViewPluginBase later.

Bug: 1101101
Change-Id: Ib2ab5ab6cfb4c58bde3a2a4e71fd2886231a8a4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625088
Commit-Queue: Hui Yingst <nigi@chromium.org>
Reviewed-by: K. Moon <kmoon@chromium.org>
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843242}

pdf/out_of_process_instance.cc

@@ -1218,7 +1218,7 @@ void OutOfProcessInstance::DoPaint(const std::vector<gfx::Rect>& paint_rects,
 
     for (const auto& background_part : background_parts_) {
       gfx::Rect intersection =
-          gfx::IntersectRects(RectFromPPRect(background_part.location), rect);
+          gfx::IntersectRects(background_part.location, rect);
       if (!intersection.IsEmpty()) {
         FillRect(intersection, background_part.color);
         ready->push_back(PaintReadyRect(intersection, image_data_));
@@ -1246,15 +1246,14 @@ void OutOfProcessInstance::CalculateBackgroundParts() {
 
   // Add the left, right, and bottom rectangles.  Note: we assume only
   // horizontal centering.
-  BackgroundPart part = {pp::Rect(0, 0, left_width, bottom),
-                         GetBackgroundColor()};
+  BackgroundPart part = {gfx::Rect(left_width, bottom), GetBackgroundColor()};
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
-  part.location = pp::Rect(right_start, 0, right_width, bottom);
+  part.location = gfx::Rect(right_start, 0, right_width, bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
-  part.location = pp::Rect(0, bottom, plugin_size().width(),
-                           plugin_size().height() - bottom);
+  part.location = gfx::Rect(0, bottom, plugin_size().width(),
+                            plugin_size().height() - bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
 }

pdf/out_of_process_instance.h

@@ -26,9 +26,9 @@
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/private/find_private.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace gfx {
-class Rect;
 class Size;
 class Vector2d;
 }  // namespace gfx
@@ -378,7 +378,7 @@ class OutOfProcessInstance : public PdfViewPluginBase,
   std::vector<gfx::Rect> deferred_invalidates_;
 
   struct BackgroundPart {
-    pp::Rect location;
+    gfx::Rect location;
     uint32_t color;
   };
   std::vector<BackgroundPart> background_parts_;