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

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

Issue 682263003: Remove RenderWidget. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/page/EventHandler.h ('k') | sky/engine/core/rendering/HitTestResult.h » ('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 85654b9bd63947b84e11ff37740e699bb66cb878..16842801ab218be01f194ae1e3c0acf287d69dac 100644
--- a/sky/engine/core/page/EventHandler.cpp
+++ b/sky/engine/core/page/EventHandler.cpp
@@ -64,7 +64,6 @@
#include "core/rendering/HitTestResult.h"
#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
#include "core/rendering/style/RenderStyle.h"
#include "platform/PlatformGestureEvent.h"
#include "platform/PlatformKeyboardEvent.h"
@@ -1529,15 +1528,6 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
}
if (node) {
- // Figure out which view to send the event to.
- RenderObject* target = node->renderer();
-
- if (isOverWidget && target && target->isWidget()) {
- Widget* widget = toRenderWidget(target)->widget();
- if (widget && passWheelEventToWidget(event, widget))
- RETURN_WHEEL_EVENT_HANDLED();
- }
-
if (node && !node->dispatchWheelEvent(event))
RETURN_WHEEL_EVENT_HANDLED();
}
@@ -1866,18 +1856,8 @@ bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& ge
{
ASSERT(gestureEvent.isScrollEvent());
- if (!m_lastGestureScrollOverWidget)
- return false;
-
- if (!renderer || !renderer->isWidget())
- return false;
-
- Widget* widget = toRenderWidget(renderer)->widget();
-
- if (!widget || !widget->isFrameView())
- return false;
-
- return toFrameView(widget)->frame().eventHandler().handleGestureScrollEvent(gestureEvent);
+ // FIXME(sky): Remove this.
+ return false;
}
bool EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEvent) {
« no previous file with comments | « sky/engine/core/page/EventHandler.h ('k') | sky/engine/core/rendering/HitTestResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698