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

Side by Side Diff: Source/core/rendering/RenderInline.cpp

Issue 16700002: Remove enclosingIntRect(const IntRect&) and adjust all call sites. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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 | « Source/core/platform/graphics/IntRect.h ('k') | Source/core/rendering/RenderObject.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 793
794 Region regionResult; 794 Region regionResult;
795 HitTestCulledInlinesGeneratorContext context(regionResult, tmpLocation); 795 HitTestCulledInlinesGeneratorContext context(regionResult, tmpLocation);
796 generateCulledLineBoxRects(context, this); 796 generateCulledLineBoxRects(context, this);
797 797
798 if (context.intersected()) { 798 if (context.intersected()) {
799 updateHitTestResult(result, tmpLocation.point()); 799 updateHitTestResult(result, tmpLocation.point());
800 // We can not use addNodeToRectBasedTestResult to determine if we fully enclose the hit-test area 800 // We can not use addNodeToRectBasedTestResult to determine if we fully enclose the hit-test area
801 // because it can only handle rectangular targets. 801 // because it can only handle rectangular targets.
802 result.addNodeToRectBasedTestResult(node(), request, locationInContainer ); 802 result.addNodeToRectBasedTestResult(node(), request, locationInContainer );
803 return regionResult.contains(enclosingIntRect(tmpLocation.boundingBox()) ); 803 return regionResult.contains(tmpLocation.boundingBox());
804 } 804 }
805 return false; 805 return false;
806 } 806 }
807 807
808 VisiblePosition RenderInline::positionForPoint(const LayoutPoint& point) 808 VisiblePosition RenderInline::positionForPoint(const LayoutPoint& point)
809 { 809 {
810 // FIXME: Does not deal with relative or sticky positioned inlines (should i t?) 810 // FIXME: Does not deal with relative or sticky positioned inlines (should i t?)
811 RenderBlock* cb = containingBlock(); 811 RenderBlock* cb = containingBlock();
812 if (firstLineBox()) { 812 if (firstLineBox()) {
813 // This inline actually has a line box. We must have clicked in the bor der/padding of one of these boxes. We 813 // This inline actually has a line box. We must have clicked in the bor der/padding of one of these boxes. We
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 1591
1592 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1592 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1593 { 1593 {
1594 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1594 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1595 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo); 1595 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo);
1596 info.addMember(m_children, "children"); 1596 info.addMember(m_children, "children");
1597 info.addMember(m_lineBoxes, "lineBoxes"); 1597 info.addMember(m_lineBoxes, "lineBoxes");
1598 } 1598 }
1599 1599
1600 } // namespace WebCore 1600 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/IntRect.h ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698