| Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| index de05d72579c0858efbae7164cd76909ca4bf45d5..61043f4452b9273f1aa3ea98e10f0cd5343c8b72 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -324,6 +324,7 @@ protected:
|
| // this condition.
|
| virtual bool shouldIgnoreOverflowPropertyForInlineBlockBaseline() const { return false; }
|
|
|
| + bool hitTestChildren(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
|
| void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
|
|
|
| // Delay update scrollbar until finishDelayUpdateScrollInfo() will be
|
| @@ -408,9 +409,6 @@ private:
|
| {
|
| return hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChildBlockBackground;
|
| }
|
| - bool hitTestChildren(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
|
| - // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to LayoutBlockFlow
|
| - virtual bool hitTestFloats(HitTestResult&, const HitTestLocation&, const LayoutPoint&) { return false; }
|
|
|
| bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset) const;
|
|
|
|
|