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

Unified Diff: Source/core/page/EventHandler.cpp

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix unit test failures 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
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 0ebaf637de48208ea8abef9b6889e0b2f92654d2..01aa73c82f71b75a3898418e63fcd4e7886ef891 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -79,9 +79,9 @@
#include "core/rendering/HitTestResult.h"
#include "core/rendering/RenderFlowThread.h"
#include "core/rendering/RenderLayer.h"
+#include "core/rendering/RenderPart.h"
#include "core/rendering/RenderTextControlSingleLine.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
#include "core/rendering/style/RenderStyle.h"
#include "core/svg/SVGDocumentExtensions.h"
#include "platform/PlatformGestureEvent.h"
@@ -957,7 +957,7 @@ static LocalFrame* subframeForTargetNode(Node* node)
if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFrame() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary())
return 0;
- Widget* widget = toRenderWidget(renderer)->widget();
+ Widget* widget = toRenderPart(renderer)->widget();
if (!widget || !widget->isFrameView())
return 0;
@@ -1992,7 +1992,7 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
RenderObject* target = node->renderer();
if (isOverWidget && target && target->isWidget()) {
- Widget* widget = toRenderWidget(target)->widget();
+ Widget* widget = toRenderPart(target)->widget();
if (widget && passWheelEventToWidget(event, widget))
RETURN_WHEEL_EVENT_HANDLED();
}
@@ -2377,7 +2377,7 @@ bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& ge
if (!renderer || !renderer->isWidget())
return false;
- Widget* widget = toRenderWidget(renderer)->widget();
+ Widget* widget = toRenderPart(renderer)->widget();
if (!widget || !widget->isFrameView())
return false;

Powered by Google App Engine
This is Rietveld 408576698