Changeset 149471 in webkit

Timestamp:

May 1, 2013 6:09:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Upstream smart selection
​https://bugs.webkit.org/show_bug.cgi?id=111226

Patch by Iris Wu <​shuwu@blackberry.com> on 2013-05-01
Reviewed by Rob Buis.

Calling userInterfaceViewportAccessor()->documentViewportRect() on WK thread
caused crash.
But viewport from webkitThreadViewportAccessor uses unadjusted size which is
wrong for email.
The solution here is to get actual viewport size on UI thread and then pass it
to WebKit::SelectionHandler.

PR 333763
Reviewed Internally By Jakob Petsovits.

• Api/InRegionScroller.cpp:

(BlackBerry::WebKit::InRegionScrollerPrivate::updateSelectionScrollView):

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::setSelectionDocumentViewportSize):
(WebKit):

• Api/WebPage.h:
• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::selectAtPoint):
(BlackBerry::WebKit::SelectionHandler::ensureSelectedTextVisible):
(BlackBerry::WebKit::SelectionHandler::selectionViewportRect):

• WebKitSupport/SelectionHandler.h:

(BlackBerry::WebKit::SelectionHandler::setSelectionViewportSize):
(BlackBerry::WebKit::SelectionHandler::setSelectionSubframeViewportRect):
(SelectionHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/InRegionScroller.cpp (modified) (1 diff)
• Api/WebPage.cpp (modified) (1 diff)
• Api/WebPage.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (3 diffs)
• WebKitSupport/SelectionHandler.h (modified) (2 diffs)

trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp

@@ -307 +307 @@
     Platform::ScrollViewBase* selectionScrollView = firstScrollableInRegionForNode(node);
     m_webPage->m_client->notifySelectionScrollView(selectionScrollView);
-    // if there's no subframe set an empty rect so that we default to the main frame.
-    m_webPage->m_selectionHandler->setSelectionViewportRect(selectionScrollView ? WebCore::IntRect(selectionScrollView->documentViewportRect()) : WebCore::IntRect());
+    // If there's no subframe set an empty rect so that we default to the main frame.
+    m_webPage->m_selectionHandler->setSelectionSubframeViewportRect(selectionScrollView ? WebCore::IntRect(selectionScrollView->documentViewportRect()) : WebCore::IntRect());
 }
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -4433 +4433 @@
 }
 
+void WebPage::setSelectionDocumentViewportSize(const Platform::IntSize& selectionDocumentViewportSize)
+{
+    d->m_selectionHandler->setSelectionViewportSize(selectionDocumentViewportSize);
+}
+
 BackingStore* WebPage::backingStore() const
 {

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

@@ -265 +265 @@
     void setOverlayExpansionPixelHeight(int);
     void setParagraphExpansionPixelScrollMargin(const Platform::IntSize&);
+    void setSelectionDocumentViewportSize(const Platform::IntSize&);
     void selectionCancelled();
     bool selectionContainsDocumentPoint(const Platform::IntPoint&);

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-01  Iris Wu  <shuwu@blackberry.com>
+
+         [BlackBerry] Upstream smart selection
+         https://bugs.webkit.org/show_bug.cgi?id=111226
+
+        Reviewed by Rob Buis.
+
+        Calling userInterfaceViewportAccessor()->documentViewportRect() on WK thread
+        caused crash.
+        But viewport from webkitThreadViewportAccessor uses unadjusted size which is
+        wrong for email.
+        The solution here is to get actual viewport size on UI thread and then pass it
+        to WebKit::SelectionHandler.
+
+        PR 333763
+        Reviewed Internally By Jakob Petsovits.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::updateSelectionScrollView):
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::setSelectionDocumentViewportSize):
+        (WebKit):
+        * Api/WebPage.h:
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::selectAtPoint):
+        (BlackBerry::WebKit::SelectionHandler::ensureSelectedTextVisible):
+        (BlackBerry::WebKit::SelectionHandler::selectionViewportRect):
+        * WebKitSupport/SelectionHandler.h:
+        (BlackBerry::WebKit::SelectionHandler::setSelectionViewportSize):
+        (BlackBerry::WebKit::SelectionHandler::setSelectionSubframeViewportRect):
+        (SelectionHandler):
+
 2013-04-30  Genevieve Mak  <gmak@rim.com>
 

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

@@ -657 +657 @@
         m_currentAnimationOverlayRegion = IntRectRegion();
         m_nextAnimationOverlayRegion = IntRectRegion();
-        m_selectionViewportRect = WebCore::IntRect();
+        m_selectionSubframeViewportRect = WebCore::IntRect();
     }
 
@@ -797 +797 @@
 
     // Scroll position adjustment here is based on main frame. If selecting in a subframe, don't do animation.
-    if (!m_selectionViewportRect.isEmpty())
+    if (!m_selectionSubframeViewportRect.isEmpty())
         return false;
 
@@ -830 +830 @@
 WebCore::IntRect SelectionHandler::selectionViewportRect() const
 {
-    if (m_selectionViewportRect.isEmpty()) {
-        WebCore::IntPoint scrollPosition = m_webPage->scrollPosition();
-        WebCore::IntSize actualVisibleSize = m_webPage->client()->userInterfaceViewportAccessor()->documentViewportRect().size(); // viewport size for both Cascades and browser
-        return WebCore::IntRect(scrollPosition, actualVisibleSize);
-    }
-    return m_selectionViewportRect;
+    if (m_selectionSubframeViewportRect.isEmpty())
+        return WebCore::IntRect(m_webPage->scrollPosition(), m_selectionViewportSize);
+    return m_selectionSubframeViewportRect;
 }
 

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

@@ -81 +81 @@
     void setOverlayExpansionHeight(int dy) { m_overlayExpansionHeight = dy; }
     void setParagraphExpansionScrollMargin(const WebCore::IntSize&);
-    void setSelectionViewportRect(const WebCore::IntRect& selectionViewportRect) { m_selectionViewportRect = selectionViewportRect; }
+    void setSelectionViewportSize(const WebCore::IntSize& selectionViewportSize) { m_selectionViewportSize = selectionViewportSize; }
+    void setSelectionSubframeViewportRect(const WebCore::IntRect& selectionSubframeViewportRect) { m_selectionSubframeViewportRect = selectionSubframeViewportRect; }
     WebCore::IntRect selectionViewportRect() const;
 
@@ -127 +128 @@
 
     WebCore::IntSize m_scrollMargin;
-    WebCore::IntRect m_selectionViewportRect;
+    WebCore::IntSize m_selectionViewportSize;
+    WebCore::IntRect m_selectionSubframeViewportRect;
     WebCore::VisibleSelection m_lastSelection;
 };