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

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

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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
« no previous file with comments | « Source/core/page/AutoscrollController.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/AutoscrollController.cpp
diff --git a/Source/core/page/AutoscrollController.cpp b/Source/core/page/AutoscrollController.cpp
index 93f9fd294beca4a13acc3324498a0378960be7ea..99949f73cd692eecabf575e13672a05c93b90e67 100644
--- a/Source/core/page/AutoscrollController.cpp
+++ b/Source/core/page/AutoscrollController.cpp
@@ -32,11 +32,11 @@
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/layout/HitTestResult.h"
+#include "core/layout/LayoutBox.h"
#include "core/layout/LayoutListBox.h"
#include "core/page/Chrome.h"
#include "core/page/EventHandler.h"
#include "core/page/Page.h"
-#include "core/rendering/RenderBox.h"
#include "wtf/CurrentTime.h"
namespace blink {
@@ -62,7 +62,7 @@ bool AutoscrollController::autoscrollInProgress() const
return m_autoscrollType == AutoscrollForSelection;
}
-bool AutoscrollController::autoscrollInProgress(const RenderBox* renderer) const
+bool AutoscrollController::autoscrollInProgress(const LayoutBox* renderer) const
{
return m_autoscrollRenderer == renderer;
}
@@ -72,7 +72,7 @@ void AutoscrollController::startAutoscrollForSelection(LayoutObject* renderer)
// We don't want to trigger the autoscroll or the panScroll if it's already active
if (m_autoscrollType != NoAutoscroll)
return;
- RenderBox* scrollable = RenderBox::findAutoscrollable(renderer);
+ LayoutBox* scrollable = LayoutBox::findAutoscrollable(renderer);
if (!scrollable)
scrollable = renderer->isListBox() ? toLayoutListBox(renderer) : nullptr;
if (!scrollable)
@@ -84,7 +84,7 @@ void AutoscrollController::startAutoscrollForSelection(LayoutObject* renderer)
void AutoscrollController::stopAutoscroll()
{
- RenderBox* scrollable = m_autoscrollRenderer;
+ LayoutBox* scrollable = m_autoscrollRenderer;
m_autoscrollRenderer = nullptr;
if (!scrollable)
@@ -125,9 +125,9 @@ void AutoscrollController::updateAutoscrollRenderer()
renderer = nodeAtPoint->renderer();
#endif
- while (renderer && !(renderer->isBox() && toRenderBox(renderer)->canAutoscroll()))
+ while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscroll()))
renderer = renderer->parent();
- m_autoscrollRenderer = renderer && renderer->isBox() ? toRenderBox(renderer) : nullptr;
+ m_autoscrollRenderer = renderer && renderer->isBox() ? toLayoutBox(renderer) : nullptr;
}
void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoint& eventPosition, double eventTime)
@@ -140,7 +140,7 @@ void AutoscrollController::updateDragAndDrop(Node* dropTargetNode, const IntPoin
if (m_autoscrollRenderer && m_autoscrollRenderer->frame() != dropTargetNode->renderer()->frame())
return;
- RenderBox* scrollable = RenderBox::findAutoscrollable(dropTargetNode->renderer());
+ LayoutBox* scrollable = LayoutBox::findAutoscrollable(dropTargetNode->renderer());
if (!scrollable) {
stopAutoscroll();
return;
@@ -192,7 +192,7 @@ bool AutoscrollController::panScrollInProgress() const
return m_autoscrollType == AutoscrollForPanCanStop || m_autoscrollType == AutoscrollForPan;
}
-void AutoscrollController::startPanScrolling(RenderBox* scrollable, const IntPoint& lastKnownMousePosition)
+void AutoscrollController::startPanScrolling(LayoutBox* scrollable, const IntPoint& lastKnownMousePosition)
{
// We don't want to trigger the autoscroll or the panScroll if it's already active
if (m_autoscrollType != NoAutoscroll)
« no previous file with comments | « Source/core/page/AutoscrollController.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698