| Index: sky/engine/core/rendering/RenderBlock.h
|
| diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
|
| index 2a33359c6370791a3fbea36f90603820df81dffd..3dab0c761a4d50a8de53c546533db4b5a1fdb940 100644
|
| --- a/sky/engine/core/rendering/RenderBlock.h
|
| +++ b/sky/engine/core/rendering/RenderBlock.h
|
| @@ -266,7 +266,6 @@ public:
|
| protected:
|
| virtual void addOverflowFromChildren();
|
| void addOverflowFromPositionedObjects();
|
| - void addOverflowFromBlockChildren();
|
|
|
| virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) const override;
|
|
|
| @@ -276,6 +275,10 @@ protected:
|
|
|
| virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override;
|
|
|
| + virtual void paintContents(PaintInfo&, const LayoutPoint&);
|
| +
|
| + virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| +
|
| private:
|
| virtual RenderObjectChildList* virtualChildren() override final { return children(); }
|
| virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
|
| @@ -291,14 +294,11 @@ private:
|
| void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&);
|
| static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&);
|
|
|
| - void paintContents(PaintInfo&, const LayoutPoint&);
|
| void paintSelection(PaintInfo&, const LayoutPoint&);
|
| void paintCarets(PaintInfo&, const LayoutPoint&);
|
|
|
| bool hasCaret() const;
|
|
|
| - bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| -
|
| void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
|
|
|
| // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline
|
|
|