Commit 04283387 authored by jbroman@chromium.org's avatar jbroman@chromium.org

Simplify InlineFlowBox::paintBoxDecorations.

This change:
* simplifies the paintPhase checks in InlineFlowBox::paint
* clarifies and moves the "should paint box decorations" check above
  other work, including the roundedFrameRect computation
* makes some internal painting methods private
* fixes the name of "adjustedPaintOffset"
* resolves lint errors that arose during the above

3% reduction in record time on desktop Wikipedia.
Negligible impact on N7 key_silk_cases.

BUG=388946

Review URL: https://codereview.chromium.org/352903002

git-svn-id: svn://svn.chromium.org/blink/trunk@177180 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 5a38d268
......@@ -112,11 +112,6 @@ public:
IntRect roundedFrameRect() const;
void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
void paintMask(PaintInfo&, const LayoutPoint&);
void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const LayoutRect&);
virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
......@@ -301,6 +296,12 @@ public:
}
private:
void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
void paintMask(PaintInfo&, const LayoutPoint&);
void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const LayoutRect&);
void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);
void addBorderOutsetVisualOverflow(LayoutRect& logicalVisualOverflow);
void addOutlineVisualOverflow(LayoutRect& logicalVisualOverflow);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment