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

Unified Diff: Source/core/editing/EditorCommand.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/editing/EditingStyle.cpp ('k') | Source/core/editing/iterators/BitStack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/EditorCommand.cpp
diff --git a/Source/core/editing/EditorCommand.cpp b/Source/core/editing/EditorCommand.cpp
index ca89aae1ddfaf592cd3748badadf9b3f14f1fbc3..619fcfcaa9eae3dbf5485d5215f4e65156080372 100644
--- a/Source/core/editing/EditorCommand.cpp
+++ b/Source/core/editing/EditorCommand.cpp
@@ -56,10 +56,10 @@
#include "core/html/HTMLFontElement.h"
#include "core/html/HTMLHRElement.h"
#include "core/html/HTMLImageElement.h"
+#include "core/layout/LayoutBox.h"
#include "core/page/Chrome.h"
#include "core/page/EditorClient.h"
#include "core/page/EventHandler.h"
-#include "core/rendering/RenderBox.h"
#include "platform/KillRing.h"
#include "platform/UserGestureIndicator.h"
#include "platform/scroll/Scrollbar.h"
@@ -270,13 +270,13 @@ static unsigned verticalScrollDistance(LocalFrame& frame)
LayoutObject* renderer = focusedElement->renderer();
if (!renderer || !renderer->isBox())
return 0;
- RenderBox& renderBox = toRenderBox(*renderer);
- LayoutStyle* style = renderBox.style();
+ LayoutBox& layoutBox = toLayoutBox(*renderer);
+ LayoutStyle* style = layoutBox.style();
if (!style)
return 0;
if (!(style->overflowY() == OSCROLL || style->overflowY() == OAUTO || focusedElement->hasEditableStyle()))
return 0;
- int height = std::min<int>(renderBox.clientHeight(), frame.view()->visibleHeight());
+ int height = std::min<int>(layoutBox.clientHeight(), frame.view()->visibleHeight());
return static_cast<unsigned>(max(max<int>(height * ScrollableArea::minFractionToStepWhenPaging(), height - ScrollableArea::maxOverlapBetweenPages()), 1));
}
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/iterators/BitStack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698