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

Unified Diff: Source/core/editing/VisiblePosition.cpp

Issue 15017002: WebFrame::selectRange and moveCaret should behave like mouse selection (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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/editing/VisiblePosition.cpp
diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
index 115309666004370cb14c669f280f4fc261d8b77d..da43c2f80ffa68922aae16a79a3bd33188d47c13 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -32,11 +32,13 @@
#include "core/dom/Document.h"
#include "core/dom/Range.h"
#include "core/dom/Text.h"
+#include "core/editing/VisibleSelection.h"
#include "core/editing/VisibleUnits.h"
#include "core/editing/htmlediting.h"
#include "core/html/HTMLElement.h"
#include "core/platform/Logging.h"
#include "core/platform/graphics/FloatQuad.h"
+#include "core/platform/graphics/LayoutPoint.h"
#include "core/rendering/InlineTextBox.h"
#include "core/rendering/RenderBlock.h"
#include "core/rendering/RootInlineBox.h"
@@ -743,6 +745,26 @@ bool isLastVisiblePositionInNode(const VisiblePosition &visiblePosition, const N
return next.isNull() || !next.deepEquivalent().deprecatedNode()->isDescendantOf(node);
}
+VisiblePosition visiblePositionRespectingEditingBoundary(const VisibleSelection& currentSelection, const LayoutPoint& localPoint, Node* targetNode)
+{
+ LayoutPoint selectionEndPoint = localPoint;
+ Element* editableElement = currentSelection.rootEditableElement();
+
+ if (!targetNode->renderer())
+ return VisiblePosition();
+
+ if (editableElement && !editableElement->contains(targetNode)) {
+ if (!editableElement->renderer())
+ return VisiblePosition();
+
+ FloatPoint absolutePoint = targetNode->renderer()->localToAbsolute(FloatPoint(selectionEndPoint));
+ selectionEndPoint = roundedLayoutPoint(editableElement->renderer()->absoluteToLocal(absolutePoint));
+ targetNode = editableElement;
+ }
+
+ return targetNode->renderer()->positionForPoint(selectionEndPoint);
+}
+
} // namespace WebCore
#ifndef NDEBUG

Powered by Google App Engine
This is Rietveld 408576698