Changeset 143461 in webkit

Timestamp:

Feb 20, 2013 7:24:26 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Read "data-blackberry-text-selection-handle-position" attribute from element
​https://bugs.webkit.org/show_bug.cgi?id=110235

Patch by Yongxin Dai <​yodai@rim.com> on 2013-02-20
Reviewed by Yong Li.

PR #257207.

Read "data-blackberry-text-selection-handle-position" attribute from element and pass it along
with notifySelectionDetailsChanged(). If "data-blackberry-text-selection-handle-position" attribute
is specified in the element, the selection handle is always flipped to the required position.
along with selected text within element.

Reviewed Internally by Mike Fenton.

• Api/WebPageClient.h:
• WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::selectionContainerElement):
(DOMSupport):
(BlackBerry::WebKit::DOMSupport::elementHandlePositionAttribute):

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

(BlackBerry::WebKit::SelectionHandler::requestedSelectionHandlePosition):
(WebKit):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):

• WebKitSupport/SelectionHandler.h:

(SelectionHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/DOMSupport.cpp (modified) (1 diff)
• WebKitSupport/DOMSupport.h (modified) (2 diffs)
• WebKitSupport/SelectionHandler.cpp (modified) (2 diffs)
• WebKitSupport/SelectionHandler.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -154 +154 @@
     virtual int32_t checkSpellingOfStringAsync(wchar_t* text, const unsigned length) = 0;
 
-    virtual void notifySelectionDetailsChanged(const Platform::IntRect& documentStartRect, const Platform::IntRect& documentEndRect, const Platform::IntRectRegion& documentRegion, bool overrideTouchHandling = false) = 0;
+    virtual void notifySelectionDetailsChanged(const Platform::IntRect& documentStartRect, const Platform::IntRect& documentEndRect, const Platform::IntRectRegion& documentRegion, bool overrideTouchHandling = false, BlackBerry::Platform::RequestedHandlePosition = BlackBerry::Platform::SmartPlacement) = 0;
     virtual void cancelSelectionVisuals() = 0;
     virtual void notifySelectionHandlesReversed() = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-02-20  Yongxin Dai  <yodai@rim.com>
+
+        [BlackBerry] Read "data-blackberry-text-selection-handle-position" attribute from element
+        https://bugs.webkit.org/show_bug.cgi?id=110235
+
+        Reviewed by Yong Li.
+
+        PR #257207.
+
+        Read "data-blackberry-text-selection-handle-position" attribute from element and pass it along
+        with notifySelectionDetailsChanged(). If "data-blackberry-text-selection-handle-position" attribute
+        is specified in the element, the selection handle is always flipped to the required position.
+        along with selected text within element.
+
+        Reviewed Internally by Mike Fenton.
+
+        * Api/WebPageClient.h:
+        * WebKitSupport/DOMSupport.cpp:
+        (BlackBerry::WebKit::DOMSupport::selectionContainerElement):
+        (DOMSupport):
+        (BlackBerry::WebKit::DOMSupport::elementHandlePositionAttribute):
+        * WebKitSupport/DOMSupport.h:
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::requestedSelectionHandlePosition):
+        (WebKit):
+        (BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+        * WebKitSupport/SelectionHandler.h:
+        (SelectionHandler):
+
 2013-02-20  Alberto Garcia  <albgarcia@rim.com>
 

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

@@ -602 +602 @@
 }
 
+Element* selectionContainerElement(const VisibleSelection& selection)
+{
+    if (!selection.isRange())
+        return 0;
+
+    Node* startContainer = 0;
+    if (selection.firstRange())
+        startContainer = selection.firstRange()->startContainer();
+
+    if (!startContainer)
+        return 0;
+
+    Element* element = 0;
+    if (startContainer->isInShadowTree())
+        element = startContainer->shadowHost();
+    else if (startContainer->isElementNode())
+        element = static_cast<Element*>(startContainer);
+    else
+        element = startContainer->parentElement();
+
+    return element;
+}
+
+BlackBerry::Platform::RequestedHandlePosition elementHandlePositionAttribute(const WebCore::Element* element)
+{
+    BlackBerry::Platform::RequestedHandlePosition position = BlackBerry::Platform::SmartPlacement;
+    if (!element)
+        return position;
+
+    DEFINE_STATIC_LOCAL(QualifiedName, qualifiedAttrNameForHandlePosition, (nullAtom, "data-blackberry-text-selection-handle-position", nullAtom));
+    AtomicString attributeString;
+    if (element->fastHasAttribute(qualifiedAttrNameForHandlePosition))
+        attributeString = element->fastGetAttribute(qualifiedAttrNameForHandlePosition);
+
+    if (attributeString.isNull() || attributeString.isEmpty())
+        return position;
+
+    if (equalIgnoringCase(attributeString, "above"))
+        position = BlackBerry::Platform::Above;
+    else if (equalIgnoringCase(attributeString, "below"))
+        position = BlackBerry::Platform::Below;
+    return position;
+}
+
 } // DOMSupport
 } // WebKit

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

@@ -23 +23 @@
 #include "IntRect.h"
 
+#include <BlackBerryPlatformInputEvents.h>
 #include <wtf/Vector.h>
 
@@ -102 +103 @@
 bool isFixedPositionOrHasFixedPositionAncestor(WebCore::RenderObject*);
 
+WebCore::Element* selectionContainerElement(const WebCore::VisibleSelection&);
+BlackBerry::Platform::RequestedHandlePosition elementHandlePositionAttribute(const WebCore::Element*);
+
 } // DOMSupport
 } // WebKit

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

@@ -893 +893 @@
 }
 
+RequestedHandlePosition SelectionHandler::requestedSelectionHandlePosition(const VisibleSelection& selection) const
+{
+    Element* element = DOMSupport::selectionContainerElement(selection);
+    return DOMSupport::elementHandlePositionAttribute(element);
+}
+
 // Note: This is the only function in SelectionHandler in which the coordinate
 // system is not entirely WebKit.
@@ -1014 +1020 @@
         m_webPage->m_selectionOverlay->draw(visibleSelectionRegion);
 
-    m_webPage->m_client->notifySelectionDetailsChanged(startCaret, endCaret, visibleSelectionRegion, inputNodeOverridesTouch());
+    m_webPage->m_client->notifySelectionDetailsChanged(startCaret, endCaret, visibleSelectionRegion, inputNodeOverridesTouch(), requestedSelectionHandlePosition(frame->selection()->selection()));
     SelectionTimingLog(Platform::LogLevelInfo,
         "SelectionHandler::selectionPositionChanged completed at %f",

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

@@ -90 +90 @@
 
     bool inputNodeOverridesTouch() const;
+    BlackBerry::Platform::RequestedHandlePosition requestedSelectionHandlePosition(const WebCore::VisibleSelection&) const;
 
     bool selectNodeIfFatFingersResultIsLink(FatFingersResult);