Merge RenderLayer::hitTest into RenderView::hitTest.

sky/engine/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 63 matching lines @@
 
     if (!m_frameView->visibleContentRect().contains(location.roundedPoint()))
         return false;
 
     // We have to recursively update layout/style here because otherwise, when the hit test recurses
     // into a child document, it could trigger a layout on the parent document, which can destroy RenderLayers
     // that are higher up in the call stack, leading to crashes.
     // Note that Document::updateLayout calls its parent's updateLayout.
     // FIXME: It should be the caller's responsibility to ensure an up-to-date layout.
     frameView()->updateLayoutAndStyleIfNeededRecursive();
-    return layer()->hitTest(request, location, result);
+
+    // RenderView should make sure to update layout before entering hit testing
+    ASSERT(!frame()->view()->layoutPending());
+    ASSERT(!document().renderView()->needsLayout());
+
+    // TODO(ojan): Does any of this intersection stuff make sense for Sky?
+    LayoutRect hitTestArea = view()->documentRect();
+    if (!request.ignoreClipping())
+        hitTestArea.intersect(frame()->view()->visibleContentRect());
+
+    RenderLayer* insideLayer = layer()->hitTestLayer(layer(), 0, request, result, hitTestArea, location);
+    if (!insideLayer) {
+        // TODO(ojan): Is this code needed for Sky?
+
+        // We didn't hit any layer. If we are the root layer and the mouse is -- or just was -- down,
+        // return ourselves. We do this so mouse events continue getting delivered after a drag has
+        // exited the WebView, and so hit testing over a scrollbar hits the content document.
+        if (request.active() || request.release()) {
+            updateHitTestResult(result, location.point());
+            insideLayer = layer();
+        }
+    }
+    return insideLayer;
 }
 
 void RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, LogicalExtentComputedValues& computedValues) const
 {
     computedValues.m_extent = m_frameView ? LayoutUnit(viewLogicalHeight()) : logicalHeight;
 }
 
 void RenderView::updateLogicalWidth()
 {
     if (m_frameView)
@@ skipping 323 matching lines @@
     m_iframes.remove(iframe);
 }
 
 void RenderView::updateIFramesAfterLayout()
 {
     for (auto& iframe: m_iframes)
         iframe->updateWidgetBounds();
 }
 
 } // namespace blink