Switch to null root property tree nodes [spv2]

third_party/WebKit/Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 23 matching lines @@
 #include "core/layout/ScrollAnchor.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/Widget.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
-#include "platform/graphics/paint/EffectPaintPropertyNode.h"
 #include "platform/graphics/paint/ScrollPaintPropertyNode.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/Scrollbar.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebRect.h"
 #include "wtf/Allocator.h"
 #include "wtf/AutoReset.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
@@ skipping 545 matching lines @@
 
     void setScrollTranslation(PassRefPtr<TransformPaintPropertyNode> scrollTranslation) { m_scrollTranslation = scrollTranslation; }
     TransformPaintPropertyNode* scrollTranslation() const { return m_scrollTranslation.get(); }
 
     void setScroll(PassRefPtr<ScrollPaintPropertyNode> scroll) { m_scroll = scroll; }
     ScrollPaintPropertyNode* scroll() const { return m_scroll.get(); }
 
     void setContentClip(PassRefPtr<ClipPaintPropertyNode> contentClip) { m_contentClip = contentClip; }
     ClipPaintPropertyNode* contentClip() const { return m_contentClip.get(); }
 
-    // We store no-op paint property tree nodes at the root of the tree.
-    // TODO(pdr): Remove this concept in favor of null nodes, see: crbug.com/645615
-    void setRootTransform(PassRefPtr<TransformPaintPropertyNode> rootTransform) { m_rootTransform = rootTransform; }
-    TransformPaintPropertyNode* rootTransform() const { return m_rootTransform.get(); }
-    void setRootClip(PassRefPtr<ClipPaintPropertyNode> rootClip) { m_rootClip = rootClip; }
-    ClipPaintPropertyNode* rootClip() const { return m_rootClip.get(); }
-    void setRootEffect(PassRefPtr<EffectPaintPropertyNode> rootEffect) { m_rootEffect = rootEffect; }
-    EffectPaintPropertyNode* rootEffect() const { return m_rootEffect.get(); }
-    void setRootScroll(PassRefPtr<ScrollPaintPropertyNode> rootScroll) { m_rootScroll = rootScroll; }
-    ScrollPaintPropertyNode* rootScroll() const { return m_rootScroll.get(); }
-
     // TODO(ojan): Merge this with IntersectionObserver once it lands.
     IntRect computeVisibleArea();
 
     // Viewport size that should be used for viewport units (i.e. 'vh'/'vw').
     FloatSize viewportSizeForViewportUnits() const;
 
     ScrollAnchor& scrollAnchor() { return m_scrollAnchor; }
     void clearScrollAnchor();
     bool shouldPerformScrollAnchoring() const override;
 
@@ skipping 291 matching lines @@
     // [ preTranslation ]               The offset from Widget::frameRect. Establishes viewport.
     //     +---[ scrollTranslation ]    Frame scrolling.
     // TODO(trchen): These will not be needed once settings->rootLayerScrolls() is enabled.
     RefPtr<TransformPaintPropertyNode> m_preTranslation;
     RefPtr<TransformPaintPropertyNode> m_scrollTranslation;
     RefPtr<ScrollPaintPropertyNode> m_scroll;
     // The content clip clips the document (= LayoutView) but not the scrollbars.
     // TODO(trchen): This will not be needed once settings->rootLayerScrolls() is enabled.
     RefPtr<ClipPaintPropertyNode> m_contentClip;
 
-    // These nodes represent the root nodes of each property tree.
-    // Only the root frame should create them and they will be no-op.
-    RefPtr<TransformPaintPropertyNode> m_rootTransform;
-    RefPtr<ClipPaintPropertyNode> m_rootClip;
-    RefPtr<EffectPaintPropertyNode> m_rootEffect;
-    RefPtr<ScrollPaintPropertyNode> m_rootScroll;
-
     // This is set on the local root frame view only.
     DocumentLifecycle::LifecycleState m_currentUpdateLifecyclePhasesTargetState;
 
     ScrollAnchor m_scrollAnchor;
 
     bool m_needsScrollbarsUpdate;
     bool m_suppressAdjustViewSize;
     bool m_allowsLayoutInvalidationAfterLayoutClean;
 
     // For testing.
@@ skipping 26 matching lines @@
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 DEFINE_TYPE_CASTS(FrameView, ScrollableArea, scrollableArea, scrollableArea->isFrameView(), scrollableArea.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h