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

Side by Side Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 925903005: Remove unnecessary operator overload on RenderLayer::hitTest. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 790
791 static inline LayoutRect frameVisibleRect(RenderObject* renderer) 791 static inline LayoutRect frameVisibleRect(RenderObject* renderer)
792 { 792 {
793 FrameView* frameView = renderer->document().view(); 793 FrameView* frameView = renderer->document().view();
794 if (!frameView) 794 if (!frameView)
795 return LayoutRect(); 795 return LayoutRect();
796 796
797 return frameView->visibleContentRect(); 797 return frameView->visibleContentRect();
798 } 798 }
799 799
800 bool RenderLayer::hitTest(const HitTestRequest& request, HitTestResult& result)
801 {
802 return hitTest(request, result.hitTestLocation(), result);
803 }
804
805 bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation& hitTestLocation, HitTestResult& result) 800 bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation& hitTestLocation, HitTestResult& result)
806 { 801 {
807 ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant()); 802 ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant());
808 803
809 // RenderView should make sure to update layout before entering hit testing 804 // RenderView should make sure to update layout before entering hit testing
810 ASSERT(!renderer()->frame()->view()->layoutPending()); 805 ASSERT(!renderer()->frame()->view()->layoutPending());
811 ASSERT(!renderer()->document().renderView()->needsLayout()); 806 ASSERT(!renderer()->document().renderView()->needsLayout());
812 807
813 LayoutRect hitTestArea = renderer()->view()->documentRect(); 808 LayoutRect hitTestArea = renderer()->view()->documentRect();
814 if (!request.ignoreClipping()) 809 if (!request.ignoreClipping())
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 } 1431 }
1437 } 1432 }
1438 1433
1439 void showLayerTree(const blink::RenderObject* renderer) 1434 void showLayerTree(const blink::RenderObject* renderer)
1440 { 1435 {
1441 if (!renderer) 1436 if (!renderer)
1442 return; 1437 return;
1443 showLayerTree(renderer->enclosingLayer()); 1438 showLayerTree(renderer->enclosingLayer());
1444 } 1439 }
1445 #endif 1440 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698