Changeset 92993 in webkit

Timestamp:

Aug 12, 2011 2:02:19 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=66133

Make hit testing work on RenderRegions. Pass off the hit testing to the RenderFlowThread
layer tree (just as we did with painting).

Reviewed by Sam Weinig.

Added hit-test-float.html to demonstrate basic hit testing of content flowed into regions.

Source/WebCore:

• rendering/HitTestRequest.h:

(WebCore::HitTestRequest::type):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::hitTestRegion):

• rendering/RenderFlowThread.h:
• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::paintReplaced):
(WebCore::RenderRegion::nodeAtPoint):

• rendering/RenderRegion.h:

LayoutTests:

• fast/regions/hit-test-float-expected.txt: Added.
• fast/regions/hit-test-float.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/hit-test-float-expected.txt (added)
• LayoutTests/fast/regions/hit-test-float.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/HitTestRequest.h (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderRegion.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-12  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66133
+        
+        Make hit testing work on RenderRegions. Pass off the hit testing to the RenderFlowThread
+        layer tree (just as we did with painting).
+
+        Reviewed by Sam Weinig.
+
+        Added hit-test-float.html to demonstrate basic hit testing of content flowed into regions.
+
+        * fast/regions/hit-test-float-expected.txt: Added.
+        * fast/regions/hit-test-float.html: Added.
+
 2011-08-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-12  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66133
+        
+        Make hit testing work on RenderRegions. Pass off the hit testing to the RenderFlowThread
+        layer tree (just as we did with painting).
+
+        Reviewed by Sam Weinig.
+
+        Added hit-test-float.html to demonstrate basic hit testing of content flowed into regions.
+
+        * rendering/HitTestRequest.h:
+        (WebCore::HitTestRequest::type):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::hitTestRegion):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::paintReplaced):
+        (WebCore::RenderRegion::nodeAtPoint):
+        * rendering/RenderRegion.h:
+
 2011-08-12  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/HitTestRequest.h

@@ -50 +50 @@
     bool svgClipContent() const { return m_requestType & SVGClipContent; }
 
+    HitTestRequestType type() const { return m_requestType; }
+
 private:
     HitTestRequestType m_requestType;

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -31 +31 @@
 
 #include "RenderFlowThread.h"
+#include "HitTestRequest.h"
+#include "HitTestResult.h"
 #include "Node.h"
 #include "PaintInfo.h"
@@ -264 +266 @@
 }
 
+bool RenderFlowThread::hitTestRegion(const LayoutRect& regionRect, const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
+{
+    LayoutRect regionClippingRect(accumulatedOffset, regionRect.size());
+    if (!regionClippingRect.contains(pointInContainer))
+        return false;
+    
+    LayoutPoint renderFlowThreadOffset;
+    if (style()->isFlippedBlocksWritingMode()) {
+        LayoutRect flippedRegionRect(regionRect);
+        flipForWritingMode(flippedRegionRect);
+        renderFlowThreadOffset = LayoutPoint(regionClippingRect.location() - flippedRegionRect.location());
+    } else
+        renderFlowThreadOffset = LayoutPoint(regionClippingRect.location() - regionRect.location());
+
+    LayoutPoint transformedPoint(pointInContainer.x() - renderFlowThreadOffset.x(), pointInContainer.y() - renderFlowThreadOffset.y());
+    
+    // Always ignore clipping, since the RenderFlowThread has nothing to do with the bounds of the FrameView.
+    HitTestRequest newRequest(request.type() & HitTestRequest::IgnoreClipping);
+
+    LayoutPoint oldPoint = result.point();
+    result.setPoint(transformedPoint);
+    bool isPointInsideFlowThread = layer()->hitTest(newRequest, result);
+    result.setPoint(oldPoint);
+    
+    // FIXME: Should we set result.m_localPoint back to the RenderRegion's coordinate space or leave it in the RenderFlowThread's coordinate
+    // space? Right now it's staying in the RenderFlowThread's coordinate space, which may end up being ok. We will know more when we get around to
+    // patching positionForPoint.
+    return isPointInsideFlowThread;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -78 +78 @@
     void computeLogicalHeight();
 
-    void paintIntoRegion(PaintInfo&, const LayoutRect&, const LayoutPoint&);
+    void paintIntoRegion(PaintInfo&, const LayoutRect& regionRect, const LayoutPoint& paintOffset);
+    bool hitTestRegion(const LayoutRect& regionRect, const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
 
     bool hasRegions() const { return m_regionList.size(); }

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -32 +32 @@
 
 #include "GraphicsContext.h"
+#include "HitTestResult.h"
 #include "IntRect.h"
 #include "PaintInfo.h"
@@ -55 +56 @@
 {
     // Delegate painting of content in region to RenderFlowThread.
+    if (!m_flowThread)
+        return;
     m_flowThread->paintIntoRegion(paintInfo, regionRect(), LayoutPoint(paintOffset.x() + borderLeft() + paddingLeft(), paintOffset.y() + borderTop() + paddingTop()));
+}
+
+// Hit Testing
+bool RenderRegion::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
+{
+    LayoutPoint adjustedLocation = accumulatedOffset + location();
+
+    // Check our bounds next. For this purpose always assume that we can only be hit in the
+    // foreground phase (which is true for replaced elements like images).
+    LayoutRect boundsRect(adjustedLocation, size());
+    if (visibleToHitTesting() && action == HitTestForeground && boundsRect.intersects(result.rectForPoint(pointInContainer))) {
+        // Check the contents of the RenderFlowThread.
+        if (m_flowThread && m_flowThread->hitTestRegion(regionRect(), request, result, pointInContainer, LayoutPoint(adjustedLocation.x() + borderLeft() + paddingLeft(), adjustedLocation.y() + borderTop() + paddingTop())))
+            return true;
+        updateHitTestResult(result, pointInContainer - toLayoutSize(adjustedLocation));
+        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, boundsRect))
+            return true;
+    }
+
+    return false;
 }
 

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -45 +45 @@
 
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
+    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
 
     void setRegionRect(const IntRect& rect) { m_regionRect = rect; }