Slimming Paint phase 2 compositing algorithm plumbing

Source/platform/graphics/GraphicsLayer.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 #include "platform/geometry/FloatPoint3D.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/ContentLayerDelegate.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/graphics/GraphicsLayerDebugInfo.h"
 #include "platform/graphics/PaintInvalidationReason.h"
 #include "platform/graphics/filters/FilterOperations.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
+#include "platform/graphics/paint/DisplayItemTransformTree.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "public/platform/WebCompositorAnimationDelegate.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebImageLayer.h"
 #include "public/platform/WebLayerClient.h"
 #include "public/platform/WebLayerScrollClient.h"
 #include "public/platform/WebScrollBlocksOn.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
@@ skipping 189 matching lines @@
 
     // WebCompositorAnimationDelegate implementation.
     void notifyAnimationStarted(double monotonicTime, int group) override;
     void notifyAnimationFinished(double monotonicTime, int group) override;
 
     // WebLayerScrollClient implementation.
     void didScroll() override;
 
     DisplayItemList* displayItemList() override;
 
+    void setTransformTree(PassOwnPtr<const DisplayItemTransformTree> transformTree) { m_transformTree = transformTree; }

[chrishtr, 2015/08/13 17:28:32]

Revert changes to this class, per earlier comments.

[pdr., 2015/08/13 20:55:00]

These changes are needed for test coverage until we find a new home for the new
transform tree. I've added a comment that these will be moved.

+    const DisplayItemTransformTree* transformTree() const { return m_transformTree.get(); }
+
     // Exposed for tests.
     virtual WebLayer* contentsLayer() const { return m_contentsLayer; }
 
 #ifndef NDEBUG
     DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
     String debugName() const { return m_client->debugName(this) + " debug red fill"; }
 #endif
 
 protected:
     String debugName(WebLayer*) const;
@@ skipping 89 matching lines @@
 
     Vector<LinkHighlight*> m_linkHighlights;
 
     OwnPtr<ContentLayerDelegate> m_contentLayerDelegate;
 
     ScrollableArea* m_scrollableArea;
     GraphicsLayerDebugInfo m_debugInfo;
     int m_3dRenderingContext;
 
     OwnPtr<DisplayItemList> m_displayItemList;
+
+    OwnPtr<const DisplayItemTransformTree> m_transformTree;
 };
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the blink namespace for ease of invocation from gdb.
 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
 #endif
 
 #endif // GraphicsLayer_h