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

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

Issue 931003002: Move and rename RenderPart to LayoutPart. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 34a55cd1b9d627b8a6ccae870668fba6966bb2e3..21dfce9e19426c39d2e97bd4351f39fb2dcde650 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -63,6 +63,7 @@
#include "core/layout/HitTestRequest.h"
#include "core/layout/HitTestResult.h"
#include "core/layout/Layer.h"
+#include "core/layout/LayoutPart.h"
#include "core/layout/LayoutTextControlSingleLine.h"
#include "core/layout/style/LayoutStyle.h"
#include "core/loader/FrameLoader.h"
@@ -78,7 +79,6 @@
#include "core/page/Page.h"
#include "core/page/SpatialNavigation.h"
#include "core/page/TouchAdjustment.h"
-#include "core/rendering/RenderPart.h"
#include "core/rendering/RenderView.h"
#include "core/svg/SVGDocumentExtensions.h"
#include "platform/PlatformGestureEvent.h"
@@ -978,10 +978,10 @@ static LocalFrame* subframeForTargetNode(Node* node)
return nullptr;
LayoutObject* renderer = node->renderer();
- if (!renderer || !renderer->isRenderPart())
+ if (!renderer || !renderer->isLayoutPart())
return nullptr;
- Widget* widget = toRenderPart(renderer)->widget();
+ Widget* widget = toLayoutPart(renderer)->widget();
if (!widget || !widget->isFrameView())
return nullptr;
@@ -2024,8 +2024,8 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
// Figure out which view to send the event to.
LayoutObject* target = node->renderer();
- if (isOverWidget && target && target->isRenderPart()) {
- Widget* widget = toRenderPart(target)->widget();
+ if (isOverWidget && target && target->isLayoutPart()) {
+ Widget* widget = toLayoutPart(target)->widget();
if (widget && passWheelEventToWidget(event, *widget))
RETURN_WHEEL_EVENT_HANDLED();
}
@@ -2442,10 +2442,10 @@ bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& ge
if (!m_lastGestureScrollOverWidget)
return false;
- if (!renderer || !renderer->isRenderPart())
+ if (!renderer || !renderer->isLayoutPart())
return false;
- Widget* widget = toRenderPart(renderer)->widget();
+ Widget* widget = toLayoutPart(renderer)->widget();
if (!widget || !widget->isFrameView())
return false;
@@ -3881,7 +3881,7 @@ bool EventHandler::passWheelEventToWidget(const PlatformWheelEvent& wheelEvent,
bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event)
{
// Figure out which view to send the event to.
- if (!event.innerNode() || !event.innerNode()->renderer() || !event.innerNode()->renderer()->isRenderPart())
+ if (!event.innerNode() || !event.innerNode()->renderer() || !event.innerNode()->renderer()->isLayoutPart())
return false;
return false;
}
« no previous file with comments | « Source/core/layout/compositing/LayerCompositor.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698