Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

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

Issue 892033003: Consolidate and delete a bunch of paint methods. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
Download patch
« no previous file with comments | « sky/engine/core/rendering/InlineBox.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlock.h
diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
index a78a3e485004f77bdc911bb6a6670a4743ea42fc..807c43ad7d8d0b1e7a6d3ba5aaa95d2babc1fb08 100644
--- a/sky/engine/core/rendering/RenderBlock.h
+++ b/sky/engine/core/rendering/RenderBlock.h
@@ -191,11 +191,6 @@ public:
void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0) const;
#endif
- // inline-block elements paint all phases atomically. This function ensures that. Certain other elements
- // (flex items) require this behavior as well, and this function exists as a helper for them.
- // It is expected that the caller will call this function independent of the value of paintInfo.phase.
- static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint&);
-
bool recalcChildOverflowAfterStyleChange();
bool recalcOverflowAfterStyleChange();
@@ -218,8 +213,6 @@ protected:
virtual void paint(PaintInfo&, const LayoutPoint&) override;
virtual void paintObject(PaintInfo&, const LayoutPoint&) override;
virtual void paintChildren(PaintInfo&, const LayoutPoint&);
- void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&);
- void paintChildAsInlineBlock(RenderBox*, PaintInfo&, const LayoutPoint&);
virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunityCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { }
@@ -252,8 +245,6 @@ protected:
virtual bool isInlineBlock() const override final { return isInline() && isReplaced(); }
- virtual void paintContents(PaintInfo&, const LayoutPoint&);
-
virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
private:
« no previous file with comments | « sky/engine/core/rendering/InlineBox.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698