Source/core/rendering/RenderLayer.h - Issue 218053002: Friendship is not optimal.

Unified Diff: Source/core/rendering/RenderLayer.h

Issue 218053002: Friendship is not optimal. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Expose usedTransparency Created 6 years, 9 months 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: Source/core/rendering/RenderLayer.h

diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h

index fecae4f2ba50a72ce9f8f55a7d789bf398d231dd..5597613b1426b0c09ee9549af83371c9dbc2a8ba 100644

--- a/Source/core/rendering/RenderLayer.h

+++ b/Source/core/rendering/RenderLayer.h

@@ -101,12 +101,6 @@ private:

class RenderLayer {

WTF_MAKE_NONCOPYABLE(RenderLayer);

public:

- friend class RenderReplica;

- // FIXME: Needed until we move all the necessary bits to the new class.

- friend class RenderLayerStackingNode;

- // FIXME: Needed until we move all the necessary bits to the new class.

- friend class RenderLayerScrollableArea;

RenderLayer(RenderLayerModelObject*, LayerType);

~RenderLayer();

@@ -238,6 +232,8 @@ public:

bool hasVisibleNonLayerContent() const { return m_hasVisibleNonLayerContent; }

void updateHasVisibleNonLayerContent();

+ bool usedTransparency() const { return m_usedTransparency; }

// Gets the nearest enclosing positioned ancestor layer (also includes

// the <html> layer and the root layer).

RenderLayer* enclosingPositionedAncestor() const;

@@ -494,6 +490,35 @@ public:

const AncestorDependentProperties& ancestorDependentProperties() { ASSERT(!m_needsToUpdateAncestorDependentProperties); return m_ancestorDependentProperties; }

+ bool lostGroupedMapping() const { return m_compositingProperties.lostGroupedMapping; }

+ void setLostGroupedMapping(bool b) { m_compositingProperties.lostGroupedMapping = b; }

+ CompositingReasons compositingReasons() const { return m_compositingProperties.compositingReasons; }

+ void setCompositingReasons(CompositingReasons, CompositingReasons mask = CompositingReasonAll);

+ bool hasCompositingDescendant() const { return m_compositingProperties.hasCompositingDescendant; }

+ void setHasCompositingDescendant(bool b) { m_compositingProperties.hasCompositingDescendant = b; }

+ bool hasNonCompositedChild() const { return m_compositingProperties.hasNonCompositedChild; }

+ void setHasNonCompositedChild(bool b) { m_compositingProperties.hasNonCompositedChild = b; }

+ bool shouldIsolateCompositedDescendants() const { return m_compositingProperties.shouldIsolateCompositedDescendants; }

+ void setShouldIsolateCompositedDescendants(bool b) { m_compositingProperties.shouldIsolateCompositedDescendants = b; }

+ void updateDescendantDependentFlags();

+ void updateOrRemoveFilterEffectRenderer();

+ void updateLayerPositions(RenderGeometryMap* = 0, UpdateLayerPositionsFlags = defaultFlags);

+ void updateSelfPaintingLayer();

+ void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);

+ RenderLayer* enclosingTransformedAncestor() const;

+ void didUpdateNeedsCompositedScrolling();

private:

// FIXME: Merge with AncestorDependentProperties.

class AncestorDependentPropertyCache {

@@ -536,17 +561,11 @@ private:

void clipToRect(const LayerPaintingInfo&, GraphicsContext*, const ClipRect&, BorderRadiusClippingRule = IncludeSelfForBorderRadius);

void restoreClip(GraphicsContext*, const LayoutRect& paintDirtyRect, const ClipRect&);

- void updateSelfPaintingLayer();

void updateOutOfFlowPositioned(const RenderStyle* oldStyle);

- void didUpdateNeedsCompositedScrolling();

// Returns true if the position changed.

bool updateLayerPosition();

- void updateLayerPositions(RenderGeometryMap* = 0, UpdateLayerPositionsFlags = defaultFlags);

enum UpdateLayerPositionsAfterScrollFlag {

NoFlag = 0,

IsOverflowScroll = 1 << 0,

@@ -567,7 +586,6 @@ private:

void paintLayerContentsAndReflection(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);

void paintLayerByApplyingTransform(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags, const LayoutPoint& translationOffset = LayoutPoint());

- void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);

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

void paintPaginatedChildLayer(RenderLayer* childLayer, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);

void paintChildLayerIntoColumns(RenderLayer* childLayer, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags, const Vector<RenderLayer*>& columnLayers, size_t columnIndex);

@@ -635,43 +653,19 @@ private:

void dirtyAncestorChainVisibleDescendantStatus();

void setAncestorChainHasVisibleDescendant();

- void updateDescendantDependentFlags();

void dirty3DTransformedDescendantStatus();

// Both updates the status, and returns true if descendants of this have 3d.

bool update3DTransformedDescendantStatus();

void updateOrRemoveFilterClients();

- void updateOrRemoveFilterEffectRenderer();

LayoutRect paintingExtent(const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior);

- RenderLayer* enclosingTransformedAncestor() const;

void updatePagination();

// FIXME: Temporary. Remove when new columns come online.

bool useRegionBasedColumns() const;

- bool hasCompositingDescendant() const { return m_compositingProperties.hasCompositingDescendant; }

- void setHasCompositingDescendant(bool b) { m_compositingProperties.hasCompositingDescendant = b; }

- bool hasNonCompositedChild() const { return m_compositingProperties.hasNonCompositedChild; }

- void setHasNonCompositedChild(bool b) { m_compositingProperties.hasNonCompositedChild = b; }

- bool shouldIsolateCompositedDescendants() const { return m_compositingProperties.shouldIsolateCompositedDescendants; }

- void setShouldIsolateCompositedDescendants(bool b) { m_compositingProperties.shouldIsolateCompositedDescendants = b; }

- bool lostGroupedMapping() const { return m_compositingProperties.lostGroupedMapping; }

- void setLostGroupedMapping(bool b) { m_compositingProperties.lostGroupedMapping = b; }

- CompositingReasons compositingReasons() const { return m_compositingProperties.compositingReasons; }

- void setCompositingReasons(CompositingReasons, CompositingReasons mask = CompositingReasonAll);

- friend class CompositedLayerMapping;

- friend class RenderLayerCompositor;

- friend class RenderLayerModelObject;

LayerType m_layerType;

// Self-painting layer is an optimization where we avoid the heavy RenderLayer painting

« no previous file with comments | « no previous file | Source/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »