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

Unified Diff: sky/engine/core/page/EventHandler.cpp

Issue 689283003: Remove scroll corners and resizers. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/page/EventHandler.h ('k') | sky/engine/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/page/EventHandler.cpp
diff --git a/sky/engine/core/page/EventHandler.cpp b/sky/engine/core/page/EventHandler.cpp
index 7ae123a095dc7bce2d73ecfb3d4bdc0b560be63a..6aff760bbb04c8e243a15d82d0af4f0a4815d833 100644
--- a/sky/engine/core/page/EventHandler.cpp
+++ b/sky/engine/core/page/EventHandler.cpp
@@ -164,7 +164,6 @@ EventHandler::EventHandler(LocalFrame* frame)
, m_cursorUpdateTimer(this, &EventHandler::cursorUpdateTimerFired)
, m_mouseDownMayStartAutoscroll(false)
, m_fakeMouseMoveEventTimer(this, &EventHandler::fakeMouseMoveEventTimerFired)
- , m_resizeScrollableArea(0)
, m_eventHandlerWillResetCapturingMouseEventsNode(0)
, m_clickCount(0)
, m_shouldOnlyFireDragOverEvent(false)
@@ -211,7 +210,6 @@ void EventHandler::clear()
m_cursorUpdateTimer.stop();
m_fakeMouseMoveEventTimer.stop();
m_activeIntervalTimer.stop();
- m_resizeScrollableArea = 0;
m_nodeUnderMouse = nullptr;
m_lastNodeUnderMouse = nullptr;
m_lastScrollbarUnderMouse = nullptr;
@@ -852,9 +850,6 @@ void EventHandler::updateCursor()
OptionalCursor EventHandler::selectCursor(const HitTestResult& result)
{
- if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode())
- return NoCursorChange;
-
Page* page = m_frame->page();
if (!page)
return NoCursorChange;
@@ -994,13 +989,6 @@ OptionalCursor EventHandler::selectAutoCursor(const HitTestResult& result, Node*
if (useHandCursor(node, result.isOverLink()))
return handCursor();
- bool inResizer = false;
- RenderObject* renderer = node ? node->renderer() : 0;
- if (renderer && m_frame->view()) {
- RenderLayer* layer = renderer->enclosingLayer();
- inResizer = layer->scrollableArea() && layer->scrollableArea()->isPointInResizeControl(result.roundedPointInMainFrame(), ResizerForPointer);
- }
-
// During selection, use an I-beam no matter what we're over.
// If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
if (m_mousePressed && m_mouseDownMayStartSelect
@@ -1010,7 +998,8 @@ OptionalCursor EventHandler::selectAutoCursor(const HitTestResult& result, Node*
return iBeam;
}
- if ((editable || (renderer && renderer->isText() && node->canStartSelection())) && !inResizer && !result.scrollbar())
+ RenderObject* renderer = node ? node->renderer() : 0;
+ if ((editable || (renderer && renderer->isText() && node->canStartSelection())) && !result.scrollbar())
return iBeam;
return pointerCursor();
}
@@ -1067,16 +1056,6 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
m_clickCount = mouseEvent.clickCount();
m_clickNode = mev.targetNode()->isTextNode() ? NodeRenderingTraversal::parent(mev.targetNode()) : mev.targetNode();
- RenderLayer* layer = mev.targetNode()->renderer() ? mev.targetNode()->renderer()->enclosingLayer() : 0;
- IntPoint p = mouseEvent.position();
- if (layer && layer->scrollableArea() && layer->scrollableArea()->isPointInResizeControl(p, ResizerForPointer)) {
- m_resizeScrollableArea = layer->scrollableArea();
- m_resizeScrollableArea->setInResizeMode(true);
- m_offsetFromResizeCorner = m_resizeScrollableArea->offsetFromResizeCorner(p);
- invalidateClick();
- return true;
- }
-
m_frame->selection().setCaretBlinkingSuspended(true);
bool swallowEvent = !dispatchMouseEvent(EventTypeNames::mousedown, mev.targetNode(), m_clickCount, mouseEvent, true);
@@ -1207,16 +1186,10 @@ bool EventHandler::handleMouseMoveOrLeaveEvent(const PlatformMouseEvent& mouseEv
if (hoveredNode)
*hoveredNode = mev.hitTestResult();
- Scrollbar* scrollbar = 0;
-
- if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode())
- m_resizeScrollableArea->resize(mouseEvent, m_offsetFromResizeCorner);
- else {
- scrollbar = mev.scrollbar();
- updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
- if (onlyUpdateScrollbars)
- return true;
- }
+ Scrollbar* scrollbar = mev.scrollbar();
+ updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
+ if (onlyUpdateScrollbars)
+ return true;
bool swallowEvent = false;
@@ -1288,11 +1261,6 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
swallowClickEvent = !dispatchMouseEvent(EventTypeNames::click, clickTargetNode, m_clickCount, mouseEvent, true);
}
- if (m_resizeScrollableArea) {
- m_resizeScrollableArea->setInResizeMode(false);
- m_resizeScrollableArea = 0;
- }
-
bool swallowMouseReleaseEvent = false;
if (!swallowMouseUpEvent)
swallowMouseReleaseEvent = handleMouseReleaseEvent(mev);
@@ -1674,13 +1642,8 @@ bool EventHandler::handleGestureScrollEvent(const PlatformGestureEvent& gestureE
return true;
}
- if (eventTarget) {
- bool eventSwallowed = handleScrollGestureOnResizer(eventTarget.get(), gestureEvent);
- if (!eventSwallowed)
- eventSwallowed = eventTarget->dispatchGestureEvent(gestureEvent);
- if (eventSwallowed)
- return true;
- }
+ if (eventTarget && eventTarget->dispatchGestureEvent(gestureEvent))
+ return true;
switch (gestureEvent.type()) {
case PlatformEvent::GestureScrollBegin:
@@ -1806,33 +1769,6 @@ bool EventHandler::handleGestureLongTap(const GestureEventWithHitTestResults& ta
return false;
}
-bool EventHandler::handleScrollGestureOnResizer(Node* eventTarget, const PlatformGestureEvent& gestureEvent) {
- if (gestureEvent.type() == PlatformEvent::GestureScrollBegin) {
- RenderLayer* layer = eventTarget->renderer() ? eventTarget->renderer()->enclosingLayer() : 0;
- IntPoint p = gestureEvent.position();
- if (layer && layer->scrollableArea() && layer->scrollableArea()->isPointInResizeControl(p, ResizerForTouch)) {
- m_resizeScrollableArea = layer->scrollableArea();
- m_resizeScrollableArea->setInResizeMode(true);
- m_offsetFromResizeCorner = m_resizeScrollableArea->offsetFromResizeCorner(p);
- return true;
- }
- } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate ||
- gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation) {
- if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
- m_resizeScrollableArea->resize(gestureEvent, m_offsetFromResizeCorner);
- return true;
- }
- } else if (gestureEvent.type() == PlatformEvent::GestureScrollEnd) {
- if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
- m_resizeScrollableArea->setInResizeMode(false);
- m_resizeScrollableArea = 0;
- return false;
- }
- }
-
- return false;
-}
-
bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& gestureEvent, RenderObject* renderer)
{
ASSERT(gestureEvent.isScrollEvent());
@@ -2204,12 +2140,6 @@ bool EventHandler::isCursorVisible() const
return m_frame->page()->isCursorVisible();
}
-void EventHandler::resizeScrollableAreaDestroyed()
-{
- ASSERT(m_resizeScrollableArea);
- m_resizeScrollableArea = 0;
-}
-
void EventHandler::hoverTimerFired(Timer<EventHandler>*)
{
m_hoverTimer.stop();
« no previous file with comments | « sky/engine/core/page/EventHandler.h ('k') | sky/engine/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698