Source/core/paint/BoxPainter.h - Issue 1145993002: Refactor root element background painting

Unified Diff: Source/core/paint/BoxPainter.h

Issue 1145993002: Refactor root element background painting (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: revise for xianzhu's comment Created 5 years, 7 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

« Source/core/layout/LayoutBoxModelObject.cpp ('K') | « Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp ('k') | Source/core/paint/BoxPainter.cpp » ('j') | Source/core/paint/BoxPainter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/paint/BoxPainter.h

diff --git a/Source/core/paint/BoxPainter.h b/Source/core/paint/BoxPainter.h

index e2a1cbc96c5bde3e39c95c0e21ed2e53f80d3067..4636414ed712d6f5675946976ebb72ebc04bb3cd 100644

--- a/Source/core/paint/BoxPainter.h

+++ b/Source/core/paint/BoxPainter.h

@@ -25,11 +25,12 @@ public:

void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&);

void paintMask(const PaintInfo&, const LayoutPoint&);

void paintClippingMask(const PaintInfo&, const LayoutPoint&);

- void paintFillLayers(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, LayoutObject* backgroundObject = 0);

+ bool calculateFillLayerOcclusionCulling(Vector<const FillLayer*, 8> &reversedPaintList, const FillLayer&);

Xianzhu 2015/06/03 04:40:34 Would it be better to define a type for Vector<con

Xianzhu 2015/06/03 04:40:34 Need a comment at least for the bool return value.

trchen 2015/06/03 23:15:24 Acknowledged.

+ void paintFillLayers(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, LayoutObject* backgroundObject = nullptr);

void paintMaskImages(const PaintInfo&, const LayoutRect&);

void paintBoxDecorationBackgroundWithRect(const PaintInfo&, const LayoutPoint&, const LayoutRect&);

- static void paintFillLayerExtended(LayoutBoxModelObject&, const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const LayoutSize& = LayoutSize(), SkXfermode::Mode = SkXfermode::kSrcOver_Mode, LayoutObject* backgroundObject = 0, bool skipBaseColor = false);

- static void calculateBackgroundImageGeometry(LayoutBoxModelObject&, const LayoutBoxModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, LayoutObject* = 0);

+ static void paintFillLayerExtended(LayoutBoxModelObject&, const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = nullptr, const LayoutSize& = LayoutSize(), SkXfermode::Mode = SkXfermode::kSrcOver_Mode, LayoutObject* backgroundObject = nullptr);

+ static void calculateBackgroundImageGeometry(LayoutBoxModelObject&, const LayoutBoxModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, LayoutObject* backgroundObject = nullptr);

static InterpolationQuality chooseInterpolationQuality(LayoutObject&, GraphicsContext*, Image*, const void*, const LayoutSize&);

static bool paintNinePieceImage(LayoutBoxModelObject&, GraphicsContext*, const LayoutRect&, const ComputedStyle&, const NinePieceImage&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode);

static void paintBorder(LayoutBoxModelObject&, const PaintInfo&, const LayoutRect&, const ComputedStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);

@@ -39,19 +40,15 @@ public:

private:

void paintBackground(const PaintInfo&, const LayoutRect&, const Color& backgroundColor, BackgroundBleedAvoidance = BackgroundBleedNone);

- void paintRootBoxFillLayers(const PaintInfo&);

- void paintFillLayer(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, SkXfermode::Mode, LayoutObject* backgroundObject, bool skipBaseColor = false);

- static void paintRootBackgroundColor(LayoutObject&, const PaintInfo&, const LayoutRect&, const Color&);

+ void paintFillLayer(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, SkXfermode::Mode, LayoutObject* backgroundObject = nullptr);

static FloatRoundedRect backgroundRoundedRectAdjustedForBleedAvoidance(LayoutObject&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox*, const LayoutSize&, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);

static FloatRoundedRect getBackgroundRoundedRect(LayoutObject&, const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,

bool includeLogicalLeftEdge, bool includeLogicalRightEdge);

- static bool isDocumentElementWithOpaqueBackground(LayoutObject&);

static void applyBoxShadowForBackground(GraphicsContext*, LayoutObject&);

static bool fixedBackgroundPaintsInLocalCoordinates(const LayoutObject&);

static IntSize calculateFillTileSize(const LayoutBoxModelObject&, const FillLayer&, const IntSize& scaledPositioningAreaSize);

LayoutRect boundsForDrawingRecorder(const LayoutPoint& paintOffset);

- LayoutRect rootBackgroundRect();

// FIXME: this should be const.

LayoutBox& m_layoutBox;