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

Unified Diff: sky/engine/core/rendering/HitTestResult.cpp

Issue 879993004: Remove ScrollableArea and Scrollbar (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/HitTestResult.h ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/HitTestResult.cpp
diff --git a/sky/engine/core/rendering/HitTestResult.cpp b/sky/engine/core/rendering/HitTestResult.cpp
index cafdb9f59f1cd63875e879722258b2ba2e3904f7..3731c24bc20a712ddd02e8fe09f3b51f737f3e6f 100644
--- a/sky/engine/core/rendering/HitTestResult.cpp
+++ b/sky/engine/core/rendering/HitTestResult.cpp
@@ -33,7 +33,6 @@
#include "sky/engine/core/html/HTMLImageElement.h"
#include "sky/engine/core/html/parser/HTMLParserIdioms.h"
#include "sky/engine/core/rendering/RenderImage.h"
-#include "sky/engine/platform/scroll/Scrollbar.h"
namespace blink {
@@ -71,7 +70,6 @@ HitTestResult::HitTestResult(const HitTestResult& other)
, m_pointInInnerNodeFrame(other.m_pointInInnerNodeFrame)
, m_localPoint(other.localPoint())
, m_innerURLElement(other.URLElement())
- , m_scrollbar(other.scrollbar())
, m_isOverWidget(other.isOverWidget())
{
// Only copy the NodeSet in case of rect hit test.
@@ -91,7 +89,6 @@ HitTestResult& HitTestResult::operator=(const HitTestResult& other)
m_pointInInnerNodeFrame = other.m_pointInInnerNodeFrame;
m_localPoint = other.localPoint();
m_innerURLElement = other.URLElement();
- m_scrollbar = other.scrollbar();
m_isOverWidget = other.isOverWidget();
// Only copy the NodeSet in case of rect hit test.
@@ -133,11 +130,6 @@ void HitTestResult::setURLElement(Element* n)
m_innerURLElement = n;
}
-void HitTestResult::setScrollbar(Scrollbar* s)
-{
- m_scrollbar = s;
-}
-
LocalFrame* HitTestResult::innerNodeFrame() const
{
if (m_innerNonSharedNode)
@@ -293,10 +285,6 @@ void HitTestResult::append(const HitTestResult& other)
{
ASSERT(isRectBasedTest() && other.isRectBasedTest());
- if (!m_scrollbar && other.scrollbar()) {
- setScrollbar(other.scrollbar());
- }
-
if (!m_innerNode && other.innerNode()) {
m_innerNode = other.innerNode();
m_innerPossiblyPseudoNode = other.innerPossiblyPseudoNode();
« no previous file with comments | « sky/engine/core/rendering/HitTestResult.h ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698