| Index: third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp
|
| index 95c705b74b96ba744d0637b3af9a8f004222fc9b..fd08dd69b63b65772abb01273b31a793191faa42 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp
|
| @@ -94,8 +94,6 @@ class PropertyTreePrinterTraits<TransformPaintPropertyNode> {
|
| public:
|
| static void addFrameViewProperties(const FrameView& frameView, PropertyTreePrinter<TransformPaintPropertyNode>& printer)
|
| {
|
| - if (const TransformPaintPropertyNode* rootTransform = frameView.rootTransform())
|
| - printer.addPropertyNode(rootTransform, "RootTransform (FrameView)");
|
| if (const TransformPaintPropertyNode* preTranslation = frameView.preTranslation())
|
| printer.addPropertyNode(preTranslation, "PreTranslation (FrameView)");
|
| if (const TransformPaintPropertyNode* scrollTranslation = frameView.scrollTranslation())
|
| @@ -144,8 +142,6 @@ class PropertyTreePrinterTraits<ClipPaintPropertyNode> {
|
| public:
|
| static void addFrameViewProperties(const FrameView& frameView, PropertyTreePrinter<ClipPaintPropertyNode>& printer)
|
| {
|
| - if (const ClipPaintPropertyNode* rootClip = frameView.rootClip())
|
| - printer.addPropertyNode(rootClip, "RootClip (FrameView)");
|
| if (const ClipPaintPropertyNode* contentClip = frameView.contentClip())
|
| printer.addPropertyNode(contentClip, "ContentClip (FrameView)");
|
| }
|
| @@ -174,8 +170,6 @@ class PropertyTreePrinterTraits<EffectPaintPropertyNode> {
|
| public:
|
| static void addFrameViewProperties(const FrameView& frameView, PropertyTreePrinter<EffectPaintPropertyNode>& printer)
|
| {
|
| - if (const EffectPaintPropertyNode* rootEffect = frameView.rootEffect())
|
| - printer.addPropertyNode(rootEffect, "RootEffect (FrameView)");
|
| }
|
|
|
| static void addObjectPaintProperties(const LayoutObject& object, const ObjectPaintProperties& paintProperties, PropertyTreePrinter<EffectPaintPropertyNode>& printer)
|
| @@ -195,8 +189,6 @@ class PropertyTreePrinterTraits<ScrollPaintPropertyNode> {
|
| public:
|
| static void addFrameViewProperties(const FrameView& frameView, PropertyTreePrinter<ScrollPaintPropertyNode>& printer)
|
| {
|
| - if (const ScrollPaintPropertyNode* rootScroll = frameView.rootScroll())
|
| - printer.addPropertyNode(rootScroll, "RootScroll (FrameView)");
|
| if (const ScrollPaintPropertyNode* scroll = frameView.scroll())
|
| printer.addPropertyNode(scroll, "Scroll (FrameView)");
|
| }
|
| @@ -387,11 +379,8 @@ private:
|
| if (cssClipFixedPosition)
|
| writePaintPropertyNode(*cssClipFixedPosition, &object, "cssClipFixedPosition");
|
| const ClipPaintPropertyNode* overflowClip = properties->overflowClip();
|
| - if (overflowClip) {
|
| + if (overflowClip)
|
| writePaintPropertyNode(*overflowClip, &object, "overflowClip");
|
| - if (object.isLayoutView() && overflowClip->parent())
|
| - writePaintPropertyNode(*overflowClip->parent(), nullptr, "rootClip");
|
| - }
|
| const ScrollPaintPropertyNode* scroll = properties->scroll();
|
| if (scroll)
|
| writePaintPropertyNode(*scroll, &object, "scroll");
|
| @@ -399,15 +388,6 @@ private:
|
|
|
| void writeFrameViewPaintPropertyNodes(const FrameView& frameView)
|
| {
|
| - TransformPaintPropertyNode* rootTransform = frameView.rootTransform();
|
| - if (rootTransform)
|
| - writePaintPropertyNode(*rootTransform, &frameView, "rootTransform");
|
| - ClipPaintPropertyNode* rootClip = frameView.rootClip();
|
| - if (rootClip)
|
| - writePaintPropertyNode(*rootClip, &frameView, "rootClip");
|
| - EffectPaintPropertyNode* rootEffect = frameView.rootEffect();
|
| - if (rootEffect)
|
| - writePaintPropertyNode(*rootEffect, &frameView, "rootEffect");
|
| TransformPaintPropertyNode* preTranslation = frameView.preTranslation();
|
| if (preTranslation)
|
| writePaintPropertyNode(*preTranslation, &frameView, "preTranslation");
|
|
|