| Index: third_party/WebKit/Source/core/layout/HitTestResult.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/HitTestResult.cpp b/third_party/WebKit/Source/core/layout/HitTestResult.cpp
|
| index 916722f438f4b337e2f5bcda2c989a6d7ec015f5..0e4ce899159275281c484bd0309a996356c2d400 100644
|
| --- a/third_party/WebKit/Source/core/layout/HitTestResult.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/HitTestResult.cpp
|
| @@ -48,7 +48,7 @@ using namespace HTMLNames;
|
| HitTestResult::HitTestResult()
|
| : m_hitTestRequest(HitTestRequest::ReadOnly | HitTestRequest::Active),
|
| m_cacheable(true),
|
| - m_isOverWidget(false) {}
|
| + m_isOverFrameViewBase(false) {}
|
|
|
| HitTestResult::HitTestResult(const HitTestRequest& request,
|
| const LayoutPoint& point)
|
| @@ -56,7 +56,7 @@ HitTestResult::HitTestResult(const HitTestRequest& request,
|
| m_hitTestRequest(request),
|
| m_cacheable(true),
|
| m_pointInInnerNodeFrame(point),
|
| - m_isOverWidget(false) {}
|
| + m_isOverFrameViewBase(false) {}
|
|
|
| HitTestResult::HitTestResult(const HitTestRequest& request,
|
| const LayoutPoint& centerPoint,
|
| @@ -72,7 +72,7 @@ HitTestResult::HitTestResult(const HitTestRequest& request,
|
| m_hitTestRequest(request),
|
| m_cacheable(true),
|
| m_pointInInnerNodeFrame(centerPoint),
|
| - m_isOverWidget(false) {}
|
| + m_isOverFrameViewBase(false) {}
|
|
|
| HitTestResult::HitTestResult(const HitTestRequest& otherRequest,
|
| const HitTestLocation& other)
|
| @@ -80,7 +80,7 @@ HitTestResult::HitTestResult(const HitTestRequest& otherRequest,
|
| m_hitTestRequest(otherRequest),
|
| m_cacheable(true),
|
| m_pointInInnerNodeFrame(m_hitTestLocation.point()),
|
| - m_isOverWidget(false) {}
|
| + m_isOverFrameViewBase(false) {}
|
|
|
| HitTestResult::HitTestResult(const HitTestResult& other)
|
| : m_hitTestLocation(other.m_hitTestLocation),
|
| @@ -92,7 +92,7 @@ HitTestResult::HitTestResult(const HitTestResult& other)
|
| m_localPoint(other.localPoint()),
|
| m_innerURLElement(other.URLElement()),
|
| m_scrollbar(other.scrollbar()),
|
| - m_isOverWidget(other.isOverWidget()),
|
| + m_isOverFrameViewBase(other.isOverFrameViewBase()),
|
| m_canvasRegionId(other.canvasRegionId()) {
|
| // Only copy the NodeSet in case of list hit test.
|
| m_listBasedTestResult = other.m_listBasedTestResult
|
| @@ -118,7 +118,7 @@ bool HitTestResult::equalForCacheability(const HitTestResult& other) const {
|
| m_localPoint == other.localPoint() &&
|
| m_innerURLElement == other.URLElement() &&
|
| m_scrollbar == other.scrollbar() &&
|
| - m_isOverWidget == other.isOverWidget();
|
| + m_isOverFrameViewBase == other.isOverFrameViewBase();
|
| }
|
|
|
| void HitTestResult::cacheValues(const HitTestResult& other) {
|
| @@ -134,7 +134,7 @@ void HitTestResult::populateFromCachedResult(const HitTestResult& other) {
|
| m_localPoint = other.localPoint();
|
| m_innerURLElement = other.URLElement();
|
| m_scrollbar = other.scrollbar();
|
| - m_isOverWidget = other.isOverWidget();
|
| + m_isOverFrameViewBase = other.isOverFrameViewBase();
|
| m_cacheable = other.m_cacheable;
|
| m_canvasRegionId = other.canvasRegionId();
|
|
|
| @@ -439,7 +439,7 @@ void HitTestResult::append(const HitTestResult& other) {
|
| m_localPoint = other.localPoint();
|
| m_pointInInnerNodeFrame = other.m_pointInInnerNodeFrame;
|
| m_innerURLElement = other.URLElement();
|
| - m_isOverWidget = other.isOverWidget();
|
| + m_isOverFrameViewBase = other.isOverFrameViewBase();
|
| m_canvasRegionId = other.canvasRegionId();
|
| }
|
|
|
|
|