[Code health] Using CompositorPaintWorkletInput::PropertyKeys in Blink

Right now we have places in Blink that uses
std::vector<std::pair<std::string, CompositorElementId>, which is
exactly the CompositorPaintWorkletInput::PropertyKeys.

This CL makes changes to those places, no behavior change is introduced.

Bug: None
Change-Id: I16b60f258ad54a7ae807d222a2472d9eeedcb67b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768894Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690950}

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

@@ -15,6 +15,7 @@
 #include "third_party/blink/renderer/core/layout/layout_object.h"
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/platform/graphics/image.h"
+#include "third_party/blink/renderer/platform/graphics/platform_paint_worklet_layer_painter.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
 
 namespace blink {
@@ -102,8 +103,7 @@ scoped_refptr<Image> CSSPaintValue::GetImage(
       Vector<AtomicString> custom_properties =
           generator_->CustomInvalidationProperties();
       float zoom = layout_object.StyleRef().EffectiveZoom();
-      std::vector<std::pair<std::string, CompositorElementId>>
-          input_property_keys;
+      CompositorPaintWorkletInput::PropertyKeys input_property_keys;
       auto style_data = PaintWorkletStylePropertyMap::BuildCrossThreadData(
           document, layout_object.UniqueId(), style, native_properties,
           custom_properties, input_property_keys);

third_party/blink/renderer/core/css/cssom/paint_worklet_style_property_map.cc

@@ -81,13 +81,13 @@ bool BuildNativeValues(const ComputedStyle& style,
   return true;
 }
 
-bool BuildCustomValues(const Document& document,
-                       UniqueObjectId unique_object_id,
-                       const ComputedStyle& style,
-                       const Vector<AtomicString>& custom_properties,
-                       PaintWorkletStylePropertyMap::CrossThreadData& data,
-                       std::vector<std::pair<std::string, CompositorElementId>>&
-                           input_property_keys) {
+bool BuildCustomValues(
+    const Document& document,
+    UniqueObjectId unique_object_id,
+    const ComputedStyle& style,
+    const Vector<AtomicString>& custom_properties,
+    PaintWorkletStylePropertyMap::CrossThreadData& data,
+    CompositorPaintWorkletInput::PropertyKeys& input_property_keys) {
   DCHECK(IsMainThread());
   for (const auto& property_name : custom_properties) {
     CSSPropertyRef ref(property_name, document);
@@ -128,8 +128,7 @@ PaintWorkletStylePropertyMap::BuildCrossThreadData(
     const ComputedStyle& style,
     const Vector<CSSPropertyID>& native_properties,
     const Vector<AtomicString>& custom_properties,
-    std::vector<std::pair<std::string, CompositorElementId>>&
-        input_property_keys) {
+    CompositorPaintWorkletInput::PropertyKeys& input_property_keys) {
   DCHECK(IsMainThread());
   PaintWorkletStylePropertyMap::CrossThreadData data;
   data.ReserveCapacityForSize(native_properties.size() +

third_party/blink/renderer/core/css/cssom/paint_worklet_style_property_map.h

@@ -11,6 +11,7 @@
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map_read_only.h"
 #include "third_party/blink/renderer/platform/graphics/compositor_element_id.h"
+#include "third_party/blink/renderer/platform/graphics/platform_paint_worklet_layer_painter.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
 namespace blink {
@@ -41,8 +42,7 @@ class CORE_EXPORT PaintWorkletStylePropertyMap
       const ComputedStyle&,
       const Vector<CSSPropertyID>& native_properties,
       const Vector<AtomicString>& custom_properties,
-      std::vector<std::pair<std::string, CompositorElementId>>&
-          input_property_ids);
+      CompositorPaintWorkletInput::PropertyKeys& input_property_keys);
 
   static CrossThreadData CopyCrossThreadData(const CrossThreadData& data);
 

third_party/blink/renderer/core/css/cssom/paint_worklet_style_property_map_test.cc

@@ -154,7 +154,7 @@ TEST_F(PaintWorkletStylePropertyMapTest, CreateSupportedCrossThreadData) {
   Node* node = PageNode();
 
   Vector<std::unique_ptr<CrossThreadStyleValue>> input_arguments;
-  std::vector<std::pair<std::string, CompositorElementId>> input_property_keys;
+  CompositorPaintWorkletInput::PropertyKeys input_property_keys;
   auto data = PaintWorkletStylePropertyMap::BuildCrossThreadData(
       GetDocument(), node->GetLayoutObject()->UniqueId(),
       node->ComputedStyleRef(), native_properties, custom_properties,
@@ -196,7 +196,7 @@ TEST_F(PaintWorkletStylePropertyMapTest, UnsupportedCrossThreadData) {
   Node* node = PageNode();
 
   Vector<std::unique_ptr<CrossThreadStyleValue>> input_arguments;
-  std::vector<std::pair<std::string, CompositorElementId>> input_property_keys;
+  CompositorPaintWorkletInput::PropertyKeys input_property_keys;
   auto data1 = PaintWorkletStylePropertyMap::BuildCrossThreadData(
       GetDocument(), node->GetLayoutObject()->UniqueId(),
       node->ComputedStyleRef(), native_properties1, custom_properties1,