sky/engine/core/rendering/RenderLayer.h - Issue 793123002: Reverted the wrong one.

Unified Diff: sky/engine/core/rendering/RenderLayer.h

Issue 793123002: Reverted the wrong one. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: sky/engine/core/rendering/RenderLayer.h

diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h

index 8d333f7f4c25fb717a9acfb1124b83765cbce39c..e4abe477177c092af626804fa3020627122b44ae 100644

--- a/sky/engine/core/rendering/RenderLayer.h

+++ b/sky/engine/core/rendering/RenderLayer.h

@@ -45,7 +45,6 @@

#ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_

#define SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_

-#include "sky/engine/core/rendering/LayerFragment.h"

#include "sky/engine/core/rendering/LayerPaintingInfo.h"

#include "sky/engine/core/rendering/RenderBox.h"

#include "sky/engine/core/rendering/RenderLayerClipper.h"

@@ -450,16 +449,20 @@ private:

void paintChildren(unsigned childrenToVisit, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);

- void updatePaintingInfoForFragments(LayerFragments&, const LayerPaintingInfo&, bool shouldPaintContent, const LayoutPoint* offsetFromRoot);

- void paintBackgroundForFragments(const LayerFragments&, GraphicsContext*, GraphicsContext* transparencyLayerContext,

- const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);

- void paintForegroundForFragments(const LayerFragments&, GraphicsContext*, GraphicsContext* transparencyLayerContext,

- const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);

- void paintForegroundForFragmentsWithPhase(PaintPhase, const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);

- void paintOutlineForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);

- void paintOverflowControlsForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&);

- void paintMaskForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);

- void paintChildClippingMaskForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer, PaintLayerFlags);

+ void paintBackground(GraphicsContext*, GraphicsContext* transparencyLayerContext,

+ const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,

+ LayoutPoint& layerLocation, ClipRect& layerBackgroundRect);

+ void paintForeground(GraphicsContext*, GraphicsContext* transparencyLayerContext,

+ const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,

+ LayoutPoint& layerLocation, ClipRect& layerForegroundRect);

+ void paintForegroundWithPhase(PaintPhase, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,

+ LayoutPoint& layerLocation, ClipRect& layerForegroundRect);

+ void paintOutline(GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,

+ LayoutPoint& layerLocation, ClipRect& layerOutlineRect);

+ void paintOverflowControls(GraphicsContext*, const LayerPaintingInfo&,

+ LayoutPoint& layerLocation, ClipRect& layerBackgroundRect);

+ void paintMask(GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,

+ LayoutPoint& layerLocation, ClipRect& layerBackgroundRect);

RenderLayer* hitTestLayer(RenderLayer* rootLayer, RenderLayer* containerLayer, const HitTestRequest& request, HitTestResult& result,

const LayoutRect& hitTestRect, const HitTestLocation&, bool appliedTransform,

« no previous file with comments | « sky/engine/core/rendering/LayerFragment.h ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »