Changeset 145415 in webkit

Timestamp:

Mar 11, 2013 3:25:51 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add a method to find the ScrollView for a text selection.
​https://bugs.webkit.org/show_bug.cgi?id=112061

Patch by Genevieve Mak <​gmak@rim.com> on 2013-03-11
Reviewed by Rob Buis.

Internally reviewed by Mike Fenton and Jakob Petsovits.
PR #278490

Refactor the code in InRegionScroller so that we can add a method to find
the InRegionScrollableArea for a text selection.

• Api/InRegionScroller.cpp:

(BlackBerry::WebKit::InRegionScrollerPrivate::clipToRect):

• Pull out recursive clipping code into its own function.

(WebKit):
(BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
(BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):

• This new method allows us to get just the first scrollable region instead of looking for more nested ones. We may want to refactor in the future because some of the code is very similar to calculateInRegionScrollableAreasForPoint.

(BlackBerry::WebKit::InRegionScrollerPrivate::clipAndCreateInRegionScrollableArea):

• Add a convenience method for the previous function

• Api/InRegionScroller.h:

(WebKit):

• Api/InRegionScroller_p.h:

(InRegionScrollerPrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/InRegionScroller.cpp (modified) (4 diffs)
• Api/InRegionScroller.h (modified) (2 diffs)
• Api/InRegionScroller_p.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2011, 2012 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2011, 2012, 2013 Research In Motion Limited. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -204 +204 @@
 }
 
+WebCore::IntRect InRegionScrollerPrivate::clipToRect(const WebCore::IntRect& clippingRect, InRegionScrollableArea* scrollable)
+{
+    RenderLayer* layer = scrollable->layer();
+    if (!layer)
+        return clippingRect;
+
+    if (layer->renderer()->isRenderView()) { // #document case
+        FrameView* view = toRenderView(layer->renderer())->frameView();
+        ASSERT(view);
+        ASSERT(canScrollInnerFrame(view->frame()));
+
+        WebCore::IntRect frameWindowRect = m_webPage->mapToTransformed(m_webPage->getRecursiveVisibleWindowRect(view));
+        frameWindowRect.intersect(clippingRect);
+        return frameWindowRect;
+    }
+
+    RenderBox* box = layer->renderBox();
+    ASSERT(box);
+    ASSERT(canScrollRenderBox(box));
+
+    // We want the window rect in pixel viewport coordinates clipped to the clipping rect.
+    WebCore::IntRect visibleWindowRect = enclosingIntRect(box->absoluteClippedOverflowRect());
+    visibleWindowRect = box->frame()->view()->contentsToWindow(visibleWindowRect);
+    visibleWindowRect = m_webPage->mapToTransformed(visibleWindowRect);
+    visibleWindowRect.intersect(clippingRect);
+    return visibleWindowRect;
+}
+
 void InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint(const WebCore::IntPoint& documentPoint)
 {
@@ -217 +245 @@
     if (!layer)
         return;
+
     do {
+
         RenderObject* renderer = layer->renderer();
 
-        if (renderer->isRenderView()) {
+        if (renderer && renderer->isRenderView()) {
             if (RenderView* renderView = toRenderView(renderer)) {
                 FrameView* view = renderView->frameView();
@@ -259 +289 @@
     WebCore::IntRect recursiveClippingRect(WebCore::IntPoint::zero(), m_webPage->transformedViewportSize());
 
-    std::vector<Platform::ScrollViewBase*>::reverse_iterator rend = m_activeInRegionScrollableAreas.rend();
-    for (std::vector<Platform::ScrollViewBase*>::reverse_iterator rit = m_activeInRegionScrollableAreas.rbegin(); rit != rend; ++rit) {
-
-        InRegionScrollableArea* curr = static_cast<InRegionScrollableArea*>(*rit);
-        RenderLayer* layer = curr->layer();
-        if (!layer)
-            continue;
-
-        if (layer->renderer()->isRenderView()) { // #document case
-            FrameView* view = toRenderView(layer->renderer())->frameView();
-            ASSERT(view);
-            ASSERT(canScrollInnerFrame(view->frame()));
-
-            WebCore::IntRect frameWindowRect = m_webPage->mapToTransformed(m_webPage->getRecursiveVisibleWindowRect(view));
-            frameWindowRect.intersect(recursiveClippingRect);
-            curr->setVisibleWindowRect(frameWindowRect);
-            recursiveClippingRect = frameWindowRect;
-
-        } else { // RenderBox-based elements case (scrollable boxes (div's, p's, textarea's, etc)).
-
-            RenderBox* box = layer->renderBox();
-            ASSERT(box);
-            ASSERT(canScrollRenderBox(box));
-
-            WebCore::IntRect visibleWindowRect = enclosingIntRect(box->absoluteClippedOverflowRect());
-            visibleWindowRect = box->frame()->view()->contentsToWindow(visibleWindowRect);
-            visibleWindowRect = m_webPage->mapToTransformed(visibleWindowRect);
-            visibleWindowRect.intersect(recursiveClippingRect);
-
-            curr->setVisibleWindowRect(visibleWindowRect);
-            recursiveClippingRect = visibleWindowRect;
+    for (int i = m_activeInRegionScrollableAreas.size() - 1; i >= 0; --i) {
+        InRegionScrollableArea* scrollable = static_cast<InRegionScrollableArea*>(m_activeInRegionScrollableAreas[i]);
+        scrollable->setVisibleWindowRect(clipToRect(recursiveClippingRect, scrollable));
+        recursiveClippingRect = scrollable->visibleWindowRect();
+    }
+}
+
+Platform::ScrollViewBase* InRegionScrollerPrivate::firstScrollableInRegionForNode(const Node* node)
+{
+    if (!node || !node->renderer())
+        return 0;
+
+    RenderLayer* layer = node->renderer()->enclosingLayer();
+    if (!layer)
+        return 0;
+    do {
+        RenderObject* renderer = layer->renderer();
+
+        if (renderer->isRenderView()) {
+            if (RenderView* renderView = toRenderView(renderer)) {
+                FrameView* view = renderView->frameView();
+                if (!view) {
+                    reset();
+                    return 0;
+                }
+
+                if (!renderView->compositor()->scrollLayer())
+                    continue;
+
+                if (canScrollInnerFrame(view->frame()))
+                    return clipAndCreateInRegionScrollableArea(layer);
+            }
+        } else if (canScrollRenderBox(layer->renderBox()))
+            return clipAndCreateInRegionScrollableArea(layer);
+
+        // If we run into a fix positioned layer, set the last scrollable in-region object
+        // as not able to propagate scroll to its parent scrollable.
+        if (isNonRenderViewFixedPositionedContainer(layer) && m_activeInRegionScrollableAreas.size()) {
+            Platform::ScrollViewBase* end = m_activeInRegionScrollableAreas.back();
+            end->setCanPropagateScrollingToEnclosingScrollable(false);
         }
-    }
+
+    } while (layer = parentLayer(layer));
+    return 0;
+}
+
+Platform::ScrollViewBase* InRegionScrollerPrivate::clipAndCreateInRegionScrollableArea(RenderLayer* layer)
+{
+    WebCore::IntRect recursiveClippingRect(WebCore::IntPoint::zero(), m_webPage->transformedViewportSize());
+    InRegionScrollableArea* scrollable = new InRegionScrollableArea(m_webPage, layer);
+    scrollable->setVisibleWindowRect(clipToRect(recursiveClippingRect, scrollable));
+    return scrollable;
 }
 

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

@@ -32 +32 @@
 class TouchEventHandler;
 class WebPagePrivate;
+class SelectionHandler;
 
 class BLACKBERRY_EXPORT InRegionScroller {
@@ -45 +46 @@
     friend class WebPagePrivate;
     friend class TouchEventHandler;
+    friend class SelectionHandler;
     InRegionScrollerPrivate *d;
     DISABLE_COPY(InRegionScroller)

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

@@ -54 +54 @@
     void calculateInRegionScrollableAreasForPoint(const WebCore::IntPoint&);
     const std::vector<Platform::ScrollViewBase*>& activeInRegionScrollableAreas() const;
+    Platform::ScrollViewBase* firstScrollableInRegionForNode(const WebCore::Node*);
 
     void clearDocumentData(const WebCore::Document*);
@@ -70 +71 @@
 
     void adjustScrollDelta(const WebCore::IntPoint& maxOffset, const WebCore::IntPoint& currentOffset, WebCore::IntSize& delta) const;
+    Platform::ScrollViewBase* clipAndCreateInRegionScrollableArea(WebCore::RenderLayer*);
 
     bool isValidScrollableLayerWebKitThread(WebCore::LayerWebKitThread*) const;
     bool isValidScrollableNode(WebCore::Node*) const;
+    WebCore::IntRect clipToRect(const WebCore::IntRect&, InRegionScrollableArea*);
     std::vector<Platform::ScrollViewBase*> m_activeInRegionScrollableAreas;
 };

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-03-11  Genevieve Mak  <gmak@rim.com>
+
+        [BlackBerry] Add a method to find the ScrollView for a text selection.
+        https://bugs.webkit.org/show_bug.cgi?id=112061
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by Mike Fenton and Jakob Petsovits.
+        PR #278490
+
+        Refactor the code in InRegionScroller so that we can add a method to find
+        the InRegionScrollableArea for a text selection.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::clipToRect):
+            - Pull out recursive clipping code into its own function.
+        (WebKit):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):
+            - This new method allows us to get just the first scrollable region instead of looking
+              for more nested ones. We may want to refactor in the future because some of the code is
+              very similar to calculateInRegionScrollableAreasForPoint.
+        (BlackBerry::WebKit::InRegionScrollerPrivate::clipAndCreateInRegionScrollableArea):
+            - Add a convenience method for the previous function
+        * Api/InRegionScroller.h:
+        (WebKit):
+        * Api/InRegionScroller_p.h:
+        (InRegionScrollerPrivate):
+
 2013-03-11  Genevieve Mak  <gmak@rim.com>