Changeset 109013 in webkit

Timestamp:

Feb 27, 2012 12:03:09 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Dragging a selection handle outside of the content bounding box does not update the selection range correctly
​https://bugs.webkit.org/show_bug.cgi?id=78608

Ensure that when selection handles leave the content bounding box that
the handle not being dragged remains fixed. Do not apply padding to a
direction that would cause the selection to shrink when performing the
handle direction detection.

Patch by Ed Baker <​edbaker@rim.com> on 2012-02-27
Reviewed by Antonio Gomes.

• WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::convertPointToFrame):

• WebKitSupport/DOMSupport.h:
• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::clamp):
(BlackBerry::WebKit::directionalVisiblePositionAtExtentOfBox):
(BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):
(BlackBerry::WebKit::SelectionHandler::setSelection):
(BlackBerry::WebKit::SelectionHandler::clipPointToVisibleContainer):

• WebKitSupport/SelectionHandler.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/DOMSupport.cpp (modified) (3 diffs)
• WebKitSupport/DOMSupport.h (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (8 diffs)
• WebKitSupport/SelectionHandler.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-02-27  Ed Baker  <edbaker@rim.com>
+
+        [BlackBerry] Dragging a selection handle outside of the content bounding box does not update the selection range correctly
+        https://bugs.webkit.org/show_bug.cgi?id=78608
+
+        Ensure that when selection handles leave the content bounding box that
+        the handle not being dragged remains fixed. Do not apply padding to a
+        direction that would cause the selection to shrink when performing the
+        handle direction detection.
+
+        Reviewed by Antonio Gomes.
+
+        * WebKitSupport/DOMSupport.cpp:
+        (BlackBerry::WebKit::DOMSupport::convertPointToFrame):
+        * WebKitSupport/DOMSupport.h:
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::clamp):
+        (BlackBerry::WebKit::directionalVisiblePositionAtExtentOfBox):
+        (BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):
+        (BlackBerry::WebKit::SelectionHandler::setSelection):
+        (BlackBerry::WebKit::SelectionHandler::clipPointToVisibleContainer):
+        * WebKitSupport/SelectionHandler.h:
+
 2012-02-27  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp

@@ -337 +337 @@
 }
 
-IntPoint convertPointToFrame(const Frame* sourceFrame, const Frame* targetFrame, const IntPoint& point)
+IntPoint convertPointToFrame(const Frame* sourceFrame, const Frame* targetFrame, const IntPoint& point, const bool clampToTargetFrame)
 {
     ASSERT(sourceFrame && targetFrame);
@@ -348 +348 @@
     Frame* targetFrameParent = targetFrame->tree()->parent();
     IntRect targetFrameRect = targetFrame->view()->frameRect();
+    IntPoint targetPoint = point;
 
     // Convert the target frame rect to source window content coordinates. This is only required
@@ -356 +357 @@
 
     // Requested point is outside of target frame, return InvalidPoint.
-    if (!targetFrameRect.contains(point))
+    if (clampToTargetFrame && !targetFrameRect.contains(targetPoint))
+        targetPoint = IntPoint(targetPoint.x() < targetFrameRect.x() ? targetFrameRect.x() : std::min(targetPoint.x(), targetFrameRect.maxX()),
+                targetPoint.y() < targetFrameRect.y() ? targetFrameRect.y() : std::min(targetPoint.y(), targetFrameRect.maxY()));
+    else if (!targetFrameRect.contains(targetPoint))
         return InvalidPoint;
 
     // Adjust the points to be relative to the target.
-    return targetFrame->view()->windowToContents(sourceFrame->view()->contentsToWindow(point));
+    return targetFrame->view()->windowToContents(sourceFrame->view()->contentsToWindow(targetPoint));
 }
 

trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h

@@ -73 +73 @@
 bool elementIdOrNameIndicatesNoAutocomplete(const WebCore::Element*);
 
-WebCore::IntPoint convertPointToFrame(const WebCore::Frame* sourceFrame, const WebCore::Frame* targetFrame, const WebCore::IntPoint& sourcePoint);
+WebCore::IntPoint convertPointToFrame(const WebCore::Frame* sourceFrame, const WebCore::Frame* targetFrame, const WebCore::IntPoint& sourcePoint, const bool clampToTargetFrame = false);
 
 static const WebCore::IntPoint InvalidPoint = WebCore::IntPoint(-1, -1);

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

@@ -272 +272 @@
 }
 
+static int clamp(const int min, const int value, const int max)
+{
+    return value < min ? min : std::min(value, max);
+}
+
 static VisiblePosition directionalVisiblePositionAtExtentOfBox(Frame* frame, const WebCore::IntRect& boundingBox, unsigned short direction, const WebCore::IntPoint& basePoint)
 {
@@ -281 +286 @@
     switch (direction) {
     case KEYCODE_LEFT:
-        // Extend x to start without modifying y.
-        return frame->visiblePositionForPoint(WebCore::IntPoint(boundingBox.x(), basePoint.y()));
+        // Extend x to start and clamp y to the edge of bounding box.
+        return frame->visiblePositionForPoint(WebCore::IntPoint(boundingBox.x(), clamp(boundingBox.y(), basePoint.y(), boundingBox.maxY())));
     case KEYCODE_RIGHT:
-        // Extend x to end without modifying y.
-        return frame->visiblePositionForPoint(WebCore::IntPoint(boundingBox.maxX(), basePoint.y()));
+        // Extend x to end and clamp y to the edge of bounding box.
+        return frame->visiblePositionForPoint(WebCore::IntPoint(boundingBox.maxX(), clamp(boundingBox.y(), basePoint.y(), boundingBox.maxY())));
     case KEYCODE_UP:
-        // Extend y to top without modifying x.
-        return frame->visiblePositionForPoint(WebCore::IntPoint(basePoint.x(), boundingBox.y()));
+        // Extend y to top and clamp x to the edge of bounding box.
+        return frame->visiblePositionForPoint(WebCore::IntPoint(clamp(boundingBox.x(), basePoint.x(), boundingBox.maxX()), boundingBox.y()));
     case KEYCODE_DOWN:
-        // Extend y to bottom without modifying x.
-        return frame->visiblePositionForPoint(WebCore::IntPoint(basePoint.x(), boundingBox.maxY()));
+        // Extend y to bottom and clamp x to the edge of bounding box.
+        return frame->visiblePositionForPoint(WebCore::IntPoint(clamp(boundingBox.x(), basePoint.x(), boundingBox.maxX()), boundingBox.maxY()));
     default:
         break;
@@ -326 +331 @@
     // Start handle is outside of the field. Treat it as the changed handle and move
     // relative to the start caret rect.
-    unsigned short character = directionOfPointRelativeToRect(selectionPoint, caretRect, isStartHandle /*useTopPadding*/, !isStartHandle /*useBottomPadding*/);
+    unsigned short character = directionOfPointRelativeToRect(selectionPoint, caretRect, isStartHandle /* useTopPadding */, !isStartHandle /* useBottomPadding */);
 
     // Prevent incorrect movement, handles can only extend the selection this way
@@ -341 +346 @@
 
     if (isStartHandle)
-        newSelection = VisibleSelection(newVisiblePosition, newSelection.extent(), true /*isDirectional*/);
+        newSelection = VisibleSelection(newVisiblePosition, newSelection.extent(), true /* isDirectional */);
     else
-        newSelection = VisibleSelection(newSelection.base(), newVisiblePosition, true /*isDirectional*/);
+        newSelection = VisibleSelection(newSelection.base(), newVisiblePosition, true /* isDirectional */);
 
     // If no selection will be changed, return the character to extend using navigation.
@@ -413 +418 @@
 }
 
-WebCore::IntPoint SelectionHandler::clipPointToFocusNode(const WebCore::IntPoint& point)
-{
-    // Clipping should only happen if we are in an input field.
-    if (!m_webPage->m_inputHandler->isInputMode())
-        return point;
-
-    Frame* focusedFrame = m_webPage->focusedOrMainFrame();
-    if (!focusedFrame->document()->focusedNode() || !focusedFrame->document()->focusedNode()->renderer())
-        return point;
-
-    WebCore::IntRect focusedNodeBoundingBox = focusedFrame->document()->focusedNode()->renderer()->absoluteBoundingBoxRect();
-    focusedNodeBoundingBox.inflate(-1);
-
-    WebCore::IntPoint clippedPoint = point;
-    if (!focusedNodeBoundingBox.contains(clippedPoint))
-        clippedPoint = WebCore::IntPoint(
-            point.x() < focusedNodeBoundingBox.x() ? focusedNodeBoundingBox.x() : std::min(focusedNodeBoundingBox.maxX(), point.x()),
-            point.y() < focusedNodeBoundingBox.y() ? focusedNodeBoundingBox.y() : std::min(focusedNodeBoundingBox.maxY(), point.y()));
-
-    return clippedPoint;
-}
-
 void SelectionHandler::setSelection(const WebCore::IntPoint& start, const WebCore::IntPoint& end)
 {
@@ -469 +452 @@
 
         // Set the selection with validation.
-        newSelection.setBase(visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToFocusNode(relativeStart)));
+        newSelection.setBase(visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToVisibleContainer(start)));
 
         // Reset the selection using the existing extent without validation.
@@ -479 +462 @@
 
         // Set the selection with validation.
-        newSelection.setExtent(visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToFocusNode(relativeEnd)));
+        newSelection.setExtent(visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToVisibleContainer(end)));
 
         // Reset the selection using the existing base without validation.
@@ -777 +760 @@
 }
 
+WebCore::IntPoint SelectionHandler::clipPointToVisibleContainer(const WebCore::IntPoint& point) const
+{
+    ASSERT(m_webPage->m_mainFrame && m_webPage->m_mainFrame->view());
+
+    Frame* frame = m_webPage->focusedOrMainFrame();
+    WebCore::IntPoint clippedPoint = DOMSupport::convertPointToFrame(m_webPage->mainFrame(), frame, point, true /* clampToTargetFrame */);
+
+    if (m_webPage->m_inputHandler->isInputMode()
+            && frame->document()->focusedNode()
+            && frame->document()->focusedNode()->renderer()) {
+        WebCore::IntRect boundingBox(frame->document()->focusedNode()->renderer()->absoluteBoundingBoxRect());
+        boundingBox.inflate(-1);
+        clippedPoint = WebCore::IntPoint(clamp(boundingBox.x(), clippedPoint.x(), boundingBox.maxX()), clamp(boundingBox.y(), clippedPoint.y(), boundingBox.maxY()));
+    }
+
+    return clippedPoint;
+}
+
 static WebCore::IntPoint referencePoint(const VisiblePosition& position, const WebCore::IntRect& boundingRect, const WebCore::IntPoint& framePosition, bool isStartCaret, bool isRTL)
 {

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h

@@ -77 +77 @@
     bool shouldUpdateSelectionOrCaretForPoint(const WebCore::IntPoint&, const WebCore::IntRect&, bool startCaret = true) const;
     unsigned short extendSelectionToFieldBoundary(bool isStartHandle, const WebCore::IntPoint& selectionPoint, WebCore::VisibleSelection& newSelection);
-    WebCore::IntPoint clipPointToFocusNode(const WebCore::IntPoint&);
+    WebCore::IntPoint clipPointToVisibleContainer(const WebCore::IntPoint&) const;
 
     WebPagePrivate* m_webPage;