[Code health] Pass FloatSize to CSSPaintDefinition::Paint

Right now the CSSPaintDefinition::Paint takes a IntSize which is the
container size with subpixel snapping. At this moment there are two type
cast:
1. The call site of the CSSPaintDefinition::Paint converts a FloatSize
to IntSize
2. Inside the CSSPaintDefinition::Paint, GetSpecifiedSize is called
which type casts the IntSize to float and uses it.

This CL cleans it up by passing a FloatSize. That is, the Paint function
takes a FloatSize such that type casting can be avoided at the
GetSpecifiedSize. When we need to use the subpixel snapped size in the
Paint function, we then conver the FloatSize to an IntSize.

This CL should not introduce any behavior change.

Bug: None
Change-Id: I1387145c03b60380a0e0a53f2686647a54327e71
Reviewed-on: https://chromium-review.googlesource.com/c/1286440Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Reviewed-by: Anders Ruud <andruud@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600770}

third_party/blink/renderer/core/css/css_paint_image_generator.h

@@ -8,7 +8,7 @@
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/core/css_property_names.h"
-#include "third_party/blink/renderer/platform/geometry/int_size.h"
+#include "third_party/blink/renderer/platform/geometry/float_size.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 
 namespace blink {
@@ -50,7 +50,7 @@ class CORE_EXPORT CSSPaintImageGenerator
   // representing an invalid image if an error occurred.
   // The |container_size| is the container size with subpixel snapping.
   virtual scoped_refptr<Image> Paint(const ImageResourceObserver&,
-                                     const IntSize& container_size,
+                                     const FloatSize& container_size,
                                      const CSSStyleValueVector*) = 0;
 
   virtual const Vector<CSSPropertyID>& NativeInvalidationProperties() const = 0;

third_party/blink/renderer/core/css/css_paint_value.cc

@@ -61,8 +61,7 @@ scoped_refptr<Image> CSSPaintValue::GetImage(
   if (!ParseInputArguments(document))
     return nullptr;
 
-  return generator_->Paint(client, RoundedIntSize(target_size),
-                           parsed_input_arguments_);
+  return generator_->Paint(client, target_size, parsed_input_arguments_);
 }
 
 bool CSSPaintValue::ParseInputArguments(const Document& document) {

third_party/blink/renderer/modules/csspaint/css_paint_definition.cc

@@ -21,13 +21,12 @@ namespace blink {
 
 namespace {
 
-FloatSize GetSpecifiedSize(const IntSize& size, float zoom) {
+FloatSize GetSpecifiedSize(const FloatSize& size, float zoom) {
   float un_zoom_factor = 1 / zoom;
   auto un_zoom_fn = [un_zoom_factor](float a) -> float {
     return a * un_zoom_factor;
   };
-  return FloatSize(un_zoom_fn(static_cast<float>(size.Width())),
-                   un_zoom_fn(static_cast<float>(size.Height())));
+  return FloatSize(un_zoom_fn(size.Width()), un_zoom_fn(size.Height()));
 }
 
 }  // namespace
@@ -67,7 +66,7 @@ CSSPaintDefinition::~CSSPaintDefinition() = default;
 
 scoped_refptr<Image> CSSPaintDefinition::Paint(
     const ImageResourceObserver& client,
-    const IntSize& container_size,
+    const FloatSize& container_size,
     const CSSStyleValueVector* paint_arguments) {
   // TODO: Break dependency on LayoutObject. Passing the Node should work.
   const LayoutObject& layout_object = static_cast<const LayoutObject&>(client);
@@ -93,8 +92,9 @@ scoped_refptr<Image> CSSPaintDefinition::Paint(
     color_params.SetOpacityMode(kOpaque);
   }
 
+  // Do subpixel snapping for the |container_size|.
   PaintRenderingContext2D* rendering_context = PaintRenderingContext2D::Create(
-      container_size, color_params, context_settings_, zoom);
+      RoundedIntSize(container_size), color_params, context_settings_, zoom);
   PaintSize* paint_size = PaintSize::Create(specified_size);
   StylePropertyMapReadOnly* style_map =
       new PrepopulatedComputedStylePropertyMap(
@@ -131,7 +131,7 @@ scoped_refptr<Image> CSSPaintDefinition::Paint(
   }
 
   return PaintGeneratedImage::Create(rendering_context->GetRecord(),
-                                     FloatSize(container_size));
+                                     container_size);
 }
 
 void CSSPaintDefinition::MaybeCreatePaintInstance() {

third_party/blink/renderer/modules/csspaint/css_paint_definition.h

@@ -13,7 +13,7 @@
 #include "third_party/blink/renderer/platform/bindings/name_client.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/bindings/trace_wrapper_v8_reference.h"
-#include "third_party/blink/renderer/platform/geometry/int_size.h"
+#include "third_party/blink/renderer/platform/geometry/float_size.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "v8/include/v8.h"
 
@@ -47,9 +47,9 @@ class MODULES_EXPORT CSSPaintDefinition final
   // This may return a nullptr (representing an invalid image) if javascript
   // throws an error.
   //
-  // The |container_size| is the container size with subpixel snapping.
+  // The |container_size| is without subpixel snapping.
   scoped_refptr<Image> Paint(const ImageResourceObserver&,
-                             const IntSize& container_size,
+                             const FloatSize& container_size,
                              const CSSStyleValueVector*);
   const Vector<CSSPropertyID>& NativeInvalidationProperties() const {
     return native_invalidation_properties_;

third_party/blink/renderer/modules/csspaint/css_paint_image_generator_impl.cc

@@ -51,7 +51,7 @@ void CSSPaintImageGeneratorImpl::NotifyGeneratorReady() {
 
 scoped_refptr<Image> CSSPaintImageGeneratorImpl::Paint(
     const ImageResourceObserver& observer,
-    const IntSize& container_size,
+    const FloatSize& container_size,
     const CSSStyleValueVector* data) {
   return paint_worklet_->Paint(name_, observer, container_size, data);
 }

third_party/blink/renderer/modules/csspaint/css_paint_image_generator_impl.h

@@ -9,7 +9,7 @@
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/bindings/scoped_persistent.h"
-#include "third_party/blink/renderer/platform/geometry/int_size.h"
+#include "third_party/blink/renderer/platform/geometry/float_size.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "v8/include/v8.h"
 
@@ -29,9 +29,9 @@ class MODULES_EXPORT CSSPaintImageGeneratorImpl final
                                         Observer*);
   ~CSSPaintImageGeneratorImpl() override;
 
-  // The |container_size| is the container size with subpixel snapping.
+  // The |container_size| is without subpixel snapping.
   scoped_refptr<Image> Paint(const ImageResourceObserver&,
-                             const IntSize& container_size,
+                             const FloatSize& container_size,
                              const CSSStyleValueVector*) final;
   const Vector<CSSPropertyID>& NativeInvalidationProperties() const final;
   const Vector<AtomicString>& CustomInvalidationProperties() const final;

third_party/blink/renderer/modules/csspaint/paint_worklet.cc

@@ -88,7 +88,7 @@ size_t PaintWorklet::SelectNewGlobalScope() {
 
 scoped_refptr<Image> PaintWorklet::Paint(const String& name,
                                          const ImageResourceObserver& observer,
-                                         const IntSize& container_size,
+                                         const FloatSize& container_size,
                                          const CSSStyleValueVector* data) {
   if (!document_definition_map_.Contains(name))
     return nullptr;

third_party/blink/renderer/modules/csspaint/paint_worklet.h

@@ -36,10 +36,10 @@ class MODULES_EXPORT PaintWorklet : public Worklet,
   ~PaintWorklet() override;
 
   void AddPendingGenerator(const String& name, CSSPaintImageGeneratorImpl*);
-  // The |container_size| is the container size with subpixel snapping.
+  // The |container_size| is without subpixel snapping.
   scoped_refptr<Image> Paint(const String& name,
                              const ImageResourceObserver&,
-                             const IntSize& container_size,
+                             const FloatSize& container_size,
                              const CSSStyleValueVector*);
 
   typedef HeapHashMap<String, Member<DocumentPaintDefinition>>

third_party/blink/renderer/modules/csspaint/paint_worklet_test.cc

@@ -157,7 +157,7 @@ TEST_F(PaintWorkletTest, PaintWithNullPaintArguments) {
   ImageResourceObserver* observer = GetImageResourceObserver();
   ASSERT_TRUE(observer);
 
-  const IntSize container_size(100, 100);
+  const FloatSize container_size(100, 100);
   scoped_refptr<Image> image =
       definition->Paint(*observer, container_size, nullptr);
   EXPECT_NE(image, nullptr);