Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 939483005: Merge RenderLayer::hitTest into RenderView::hitTest. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: add TODOs and remove redundant isRootLayer check Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderLayer.cpp
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
index f44246bd9771b9519219c96ad951a7edb907df35..c789bab4e2445764c6846adfde3ae3e11ae4fdc3 100644
--- a/sky/engine/core/rendering/RenderLayer.cpp
+++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -788,40 +788,6 @@ void RenderLayer::restoreClip(GraphicsContext* context, const LayoutRect& paintD
context->restore();
}
-static inline LayoutRect frameVisibleRect(RenderObject* renderer)
-{
- FrameView* frameView = renderer->document().view();
- if (!frameView)
- return LayoutRect();
-
- return frameView->visibleContentRect();
-}
-
-bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation& hitTestLocation, HitTestResult& result)
-{
- ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant());
-
- // RenderView should make sure to update layout before entering hit testing
- ASSERT(!renderer()->frame()->view()->layoutPending());
- ASSERT(!renderer()->document().renderView()->needsLayout());
-
- LayoutRect hitTestArea = renderer()->view()->documentRect();
- if (!request.ignoreClipping())
- hitTestArea.intersect(frameVisibleRect(renderer()));
-
- RenderLayer* insideLayer = hitTestLayer(this, 0, request, result, hitTestArea, hitTestLocation);
- if (!insideLayer) {
- // 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()) && isRootLayer()) {
- renderer()->updateHitTestResult(result, hitTestLocation.point());
- insideLayer = this;
- }
- }
- return insideLayer;
-}
-
Node* RenderLayer::enclosingElement() const
{
for (RenderObject* r = renderer(); r; r = r->parent()) {
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698