[css-typed-om] Remove unused computed style decl from filtered style map

FilteredComputedStylePropertyMap currently takes a
ComputedStyleDeclaration in its constructor, but doesn't do anything
with it. This patch removes it and moves the node parameter to the front
(makes more sense).

Bug: 785132
Change-Id: I6897004f98bef50df5d1129fd3eacd560e0b6e78
Reviewed-on: https://chromium-review.googlesource.com/790115
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521091}

third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp

@@ -7,10 +7,9 @@
 namespace blink {
 
 FilteredComputedStylePropertyMap::FilteredComputedStylePropertyMap(
-    CSSComputedStyleDeclaration* computed_style_declaration,
+    Node* node,
     const Vector<CSSPropertyID>& native_properties,
-    const Vector<AtomicString>& custom_properties,
-    Node* node)
+    const Vector<AtomicString>& custom_properties)
     : ComputedStylePropertyMap(node) {
   for (const auto& native_property : native_properties) {
     native_properties_.insert(native_property);

third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.h

@@ -16,22 +16,20 @@ class CORE_EXPORT FilteredComputedStylePropertyMap
     : public ComputedStylePropertyMap {
  public:
   static FilteredComputedStylePropertyMap* Create(
-      CSSComputedStyleDeclaration* computed_style_declaration,
+      Node* node,
       const Vector<CSSPropertyID>& native_properties,
-      const Vector<AtomicString>& custom_properties,
-      Node* node) {
-    return new FilteredComputedStylePropertyMap(
-        computed_style_declaration, native_properties, custom_properties, node);
+      const Vector<AtomicString>& custom_properties) {
+    return new FilteredComputedStylePropertyMap(node, native_properties,
+                                                custom_properties);
   }
 
   Vector<String> getProperties() override;
 
  private:
   FilteredComputedStylePropertyMap(
-      CSSComputedStyleDeclaration*,
+      Node*,
       const Vector<CSSPropertyID>& native_properties,
-      const Vector<AtomicString>& custom_properties,
-      Node*);
+      const Vector<AtomicString>& custom_properties);
 
   const CSSValue* GetProperty(CSSPropertyID) override;
   const CSSValue* GetCustomProperty(AtomicString) override;

third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMapTest.cpp

@@ -38,20 +38,20 @@ TEST_F(FilteredComputedStylePropertyMapTest, GetProperties) {
   Vector<AtomicString> empty_custom_properties;
 
   FilteredComputedStylePropertyMap* map =
-      FilteredComputedStylePropertyMap::Create(Declaration(), native_properties,
-                                               custom_properties, PageNode());
+      FilteredComputedStylePropertyMap::Create(PageNode(), native_properties,
+                                               custom_properties);
   EXPECT_TRUE(map->getProperties().Contains("color"));
   EXPECT_TRUE(map->getProperties().Contains("align-items"));
   EXPECT_TRUE(map->getProperties().Contains("--foo"));
   EXPECT_TRUE(map->getProperties().Contains("--bar"));
 
-  map = FilteredComputedStylePropertyMap::Create(
-      Declaration(), native_properties, empty_custom_properties, PageNode());
+  map = FilteredComputedStylePropertyMap::Create(PageNode(), native_properties,
+                                                 empty_custom_properties);
   EXPECT_TRUE(map->getProperties().Contains("color"));
   EXPECT_TRUE(map->getProperties().Contains("align-items"));
 
   map = FilteredComputedStylePropertyMap::Create(
-      Declaration(), empty_native_properties, custom_properties, PageNode());
+      PageNode(), empty_native_properties, custom_properties);
   EXPECT_TRUE(map->getProperties().Contains("--foo"));
   EXPECT_TRUE(map->getProperties().Contains("--bar"));
 }
@@ -61,9 +61,8 @@ TEST_F(FilteredComputedStylePropertyMapTest, NativePropertyAccessors) {
       {CSSPropertyColor, CSSPropertyAlignItems});
   Vector<AtomicString> empty_custom_properties;
   FilteredComputedStylePropertyMap* map =
-      FilteredComputedStylePropertyMap::Create(Declaration(), native_properties,
-                                               empty_custom_properties,
-                                               PageNode());
+      FilteredComputedStylePropertyMap::Create(PageNode(), native_properties,
+                                               empty_custom_properties);
 
   DummyExceptionStateForTesting exception_state;
 
@@ -93,9 +92,8 @@ TEST_F(FilteredComputedStylePropertyMapTest, CustomPropertyAccessors) {
   Vector<CSSPropertyID> empty_native_properties;
   Vector<AtomicString> custom_properties({"--foo", "--bar"});
   FilteredComputedStylePropertyMap* map =
-      FilteredComputedStylePropertyMap::Create(Declaration(),
-                                               empty_native_properties,
-                                               custom_properties, PageNode());
+      FilteredComputedStylePropertyMap::Create(
+          PageNode(), empty_native_properties, custom_properties);
 
   DummyExceptionStateForTesting exception_state;
 

third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp

@@ -105,10 +105,9 @@ scoped_refptr<Image> CSSPaintDefinition::Paint(
       context_settings_, zoom);
   PaintSize* paint_size = PaintSize::Create(specified_size);
   StylePropertyMapReadonly* style_map =
-      FilteredComputedStylePropertyMap::Create(
-          CSSComputedStyleDeclaration::Create(layout_object.GetNode()),
-          native_invalidation_properties_, custom_invalidation_properties_,
-          layout_object.GetNode());
+      FilteredComputedStylePropertyMap::Create(layout_object.GetNode(),
+                                               native_invalidation_properties_,
+                                               custom_invalidation_properties_);
 
   v8::Local<v8::Value> argv[] = {
       ToV8(rendering_context, script_state_->GetContext()->Global(), isolate),