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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (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/SpatialNavigation.cpp ('k') | Source/core/page/TouchDisambiguation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/TouchAdjustment.cpp
diff --git a/Source/core/page/TouchAdjustment.cpp b/Source/core/page/TouchAdjustment.cpp
index 5ab56fb839fb46b57426a8e9bf150b1f60df6122..4e2327b6d3b2f28d6819471ddd5cda72be447aaf 100644
--- a/Source/core/page/TouchAdjustment.cpp
+++ b/Source/core/page/TouchAdjustment.cpp
@@ -29,8 +29,8 @@
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/html/HTMLFrameOwnerElement.h"
+#include "core/layout/LayoutObject.h"
#include "core/rendering/RenderBox.h"
-#include "core/rendering/RenderObject.h"
#include "core/rendering/RenderText.h"
#include "core/rendering/style/RenderStyle.h"
#include "platform/geometry/FloatPoint.h"
@@ -131,7 +131,7 @@ bool providesContextMenuItems(Node* node)
return true;
// Only the selected part of the renderer is a valid target, but this will be corrected in
// appendContextSubtargetsForNode.
- if (node->renderer()->selectionState() != RenderObject::SelectionNone)
+ if (node->renderer()->selectionState() != LayoutObject::SelectionNone)
return true;
}
return false;
@@ -185,24 +185,24 @@ static inline void appendContextSubtargetsForNode(Node* node, SubtargetGeometryL
lastOffset = offset;
}
} else {
- if (textRenderer->selectionState() == RenderObject::SelectionNone)
+ if (textRenderer->selectionState() == LayoutObject::SelectionNone)
return appendBasicSubtargetsForNode(node, subtargets);
// If selected, make subtargets out of only the selected part of the text.
int startPos, endPos;
switch (textRenderer->selectionState()) {
- case RenderObject::SelectionInside:
+ case LayoutObject::SelectionInside:
startPos = 0;
endPos = textRenderer->textLength();
break;
- case RenderObject::SelectionStart:
+ case LayoutObject::SelectionStart:
textRenderer->selectionStartEnd(startPos, endPos);
endPos = textRenderer->textLength();
break;
- case RenderObject::SelectionEnd:
+ case LayoutObject::SelectionEnd:
textRenderer->selectionStartEnd(startPos, endPos);
startPos = 0;
break;
- case RenderObject::SelectionBoth:
+ case LayoutObject::SelectionBoth:
textRenderer->selectionStartEnd(startPos, endPos);
break;
default:
« no previous file with comments | « Source/core/page/SpatialNavigation.cpp ('k') | Source/core/page/TouchDisambiguation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698