Ignore scroll node when checking whether a chunk can merge.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

 // Copyright 2015 The Chromium 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/compositing_display_item.h"
@@ skipping 567 matching lines @@
 
   if (newChunk.properties.backfaceHidden !=
       pendingLayerFirstChunk.properties.backfaceHidden)
     return false;
 
   DCHECK_GE(candidatePendingLayer.paintChunks.size(), 1u);
   PropertyTreeStateIterator iterator(newChunk.properties.propertyTreeState);
   for (const PropertyTreeState* currentState =
            &newChunk.properties.propertyTreeState;
        currentState; currentState = iterator.next()) {
-    if (*currentState == candidatePendingLayer.propertyTreeState)
+    if (currentState->equivalentGeometry(
+            candidatePendingLayer.propertyTreeState))
       return true;
     if (currentState->hasDirectCompositingReasons())
       return false;
   }
   return false;
 }
 
 bool PaintArtifactCompositor::mightOverlap(
     const PaintChunk& paintChunk,
     const PendingLayer& candidatePendingLayer,
@@ skipping 150 matching lines @@
 #ifndef NDEBUG
 void PaintArtifactCompositor::showDebugData() {
   LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
                     ->toPrettyJSONString()
                     .utf8()
                     .data();
 }
 #endif
 
 }  // namespace blink