Changeset 147467 in webkit

Timestamp:

Apr 2, 2013 11:17:10 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Create a selection from two points irregardless of the caret position.
​https://bugs.webkit.org/show_bug.cgi?id=113795

Patch by Nima Ghanavatian <​nghanavatian@blackberry.com> on 2013-04-02
Reviewed by Rob Buis.

Internally reviewed by Mike Fenton.

PR276577
If we are to set both the base and extent of a selection, we should maintain the base upon setting the extent.
This prevents us from overwriting the previous calculation when setting extent.
Further, instead of setting and manipulating the selection, simply set up start and end VisiblePositions and
create a new directional selection so as to set the base and extent simultaneously.

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::setSelection):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (2 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-02  Nima Ghanavatian  <nghanavatian@blackberry.com>
+
+        [BlackBerry] Create a selection from two points irregardless of the caret position.
+        https://bugs.webkit.org/show_bug.cgi?id=113795
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by Mike Fenton.
+
+        PR276577
+        If we are to set both the base and extent of a selection, we should maintain the base upon setting the extent.
+        This prevents us from overwriting the previous calculation when setting extent.
+        Further, instead of setting and manipulating the selection, simply set up start and end VisiblePositions and
+        create a new directional selection so as to set the base and extent simultaneously.
+
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::setSelection):
+
 2013-04-01  Konrad Piascik  <kpiascik@blackberry.com>
 

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

@@ -508 +508 @@
     WebCore::IntPoint relativeEnd = end;
 
-    VisibleSelection newSelection(controller->selection());
-
-    // We need the selection to be ordered base then extent.
-    if (!controller->selection().isBaseFirst())
-        controller->setSelection(VisibleSelection(controller->selection().start(), controller->selection().end(), true /* isDirectional */));
+    // Initialize the new start and end of our selection at the current positions.
+    VisiblePosition newStart = controller->selection().visibleStart();
+    VisiblePosition newEnd = controller->selection().visibleEnd();
 
     // We don't return early in the following, so that we can do input field scrolling if the
@@ -519 +517 @@
     if (startIsValid) {
         relativeStart = DOMSupport::convertPointToFrame(m_webPage->mainFrame(), focusedFrame, start);
-
         VisiblePosition base = visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToVisibleContainer(start));
-        if (base.isNotNull()) {
-            // The function setBase validates the "base"
-            newSelection.setBase(base);
-            newSelection.setWithoutValidation(newSelection.base(), controller->selection().end());
-            // Don't return early.
-        }
+        if (base.isNotNull())
+            newStart = base;
     }
 
     if (m_lastUpdatedEndPointIsValid) {
         relativeEnd = DOMSupport::convertPointToFrame(m_webPage->mainFrame(), focusedFrame, end);
-
         VisiblePosition extent = visiblePositionForPointIgnoringClipping(*focusedFrame, clipPointToVisibleContainer(end));
-        if (extent.isNotNull()) {
-            // The function setExtent validates the "extent"
-            newSelection.setExtent(extent);
-            newSelection.setWithoutValidation(controller->selection().start(), newSelection.extent());
-            // Don't return early.
-        }
-    }
+        if (extent.isNotNull())
+            newEnd = extent;
+    }
+
+    VisibleSelection newSelection(newStart, newEnd, true /* isDirectional */);
 
     if (!controller->selection().isRange())
         m_webPage->updateSelectionScrollView(newSelection.visibleEnd().deepEquivalent().anchorNode());
-
-    newSelection.setIsDirectional(true);
 
     if (m_webPage->m_inputHandler->isInputMode()) {