[SPv2] Implement effect compositing for indirect reasons

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

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
index 50aed967eb27513a481fe7e6816be1f6c0abac32..33a1c25af389bf99f3229db917cd612f3ea628a6 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.h
@@ -92,13 +92,17 @@ class PLATFORM_EXPORT PaintArtifactCompositor {
   // A pending layer is a collection of paint chunks that will end up in
   // the same cc::Layer.
   struct PLATFORM_EXPORT PendingLayer {
-    PendingLayer(const PaintChunk& firstPaintChunk);
-    void add(const PaintChunk&, GeometryMapper*);
+    PendingLayer(const PaintChunk& firstPaintChunk,
+                 bool chunkIsForeign,
+                 GeometryMapper&);
+    void merge(const PendingLayer&, GeometryMapper&);
+    void upcast(const PropertyTreeState&, GeometryMapper&);

[chrishtr, 2017/02/28 22:50:35]

Document these methods.

[trchen, 2017/03/01 01:26:11]

Acknowledged.

[trchen, 2017/03/07 01:41:24]

Done.

     FloatRect bounds;
     Vector<const PaintChunk*> paintChunks;
     bool knownToBeOpaque;
     bool backfaceHidden;
     PropertyTreeState propertyTreeState;
+    bool isForeign;
   };
 
   PaintArtifactCompositor();
@@ -142,18 +146,11 @@ class PLATFORM_EXPORT PaintArtifactCompositor {
       const gfx::Rect& combinedBounds,
       GeometryMapper&);
 
-  static bool canMergeInto(const PaintArtifact&,
-                           const PaintChunk& newChunk,
-                           const PendingLayer& candidatePendingLayer);
-
-  // Returns true if |newChunk| might overlap |candidatePendingLayer| in the
-  // root property tree space. If it does overlap, it will always return true.
-  // If it doesn't overlap, it might return true in cases were we can't
-  // efficiently determine a false value, or the truth depends on
-  // compositor animations.
-  static bool mightOverlap(const PaintChunk& newChunk,
-                           const PendingLayer& candidatePendingLayer,
-                           GeometryMapper&);
+  static void layerizeGroup(const PaintArtifact&,

[chrishtr, 2017/02/28 22:50:35]

Document this method.

[trchen, 2017/03/01 01:26:11]

Acknowledged.

[trchen, 2017/03/07 01:41:24]

Done.

+                            Vector<PendingLayer>& pendingLayers,
+                            GeometryMapper&,
+                            const EffectPaintPropertyNode&,
+                            Vector<PaintChunk>::const_iterator& chunkCursor);
 
   scoped_refptr<cc::Layer> m_rootLayer;
   std::unique_ptr<WebLayer> m_webLayer;