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

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

Issue 815933006: Change all uses of the RoundedRect class to use FloatRoundedRect instead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/HitTestLocation.cpp ('k') | Source/core/rendering/RenderBox.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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2234 } else if (hitTestColumns(request, result, locationInContainer, toLayout Point(scrolledOffset), hitTestAction)) { 2234 } else if (hitTestColumns(request, result, locationInContainer, toLayout Point(scrolledOffset), hitTestAction)) {
2235 updateHitTestResult(result, flipForWritingMode(locationInContainer.p oint() - localOffset)); 2235 updateHitTestResult(result, flipForWritingMode(locationInContainer.p oint() - localOffset));
2236 return true; 2236 return true;
2237 } 2237 }
2238 } 2238 }
2239 2239
2240 // Check if the point is outside radii. 2240 // Check if the point is outside radii.
2241 if (style()->hasBorderRadius()) { 2241 if (style()->hasBorderRadius()) {
2242 LayoutRect borderRect = borderBoxRect(); 2242 LayoutRect borderRect = borderBoxRect();
2243 borderRect.moveBy(adjustedLocation); 2243 borderRect.moveBy(adjustedLocation);
2244 RoundedRect border = style()->getRoundedBorderFor(borderRect); 2244 FloatRoundedRect border = style()->getRoundedBorderFor(borderRect);
2245 if (!locationInContainer.intersects(border)) 2245 if (!locationInContainer.intersects(border))
2246 return false; 2246 return false;
2247 } 2247 }
2248 2248
2249 // Now hit test our background 2249 // Now hit test our background
2250 if (hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChild BlockBackground) { 2250 if (hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChild BlockBackground) {
2251 LayoutRect boundsRect(adjustedLocation, size()); 2251 LayoutRect boundsRect(adjustedLocation, size());
2252 if (visibleToHitTestRequest(request) && locationInContainer.intersects(b oundsRect)) { 2252 if (visibleToHitTestRequest(request) && locationInContainer.intersects(b oundsRect)) {
2253 updateHitTestResult(result, flipForWritingMode(locationInContainer.p oint() - localOffset)); 2253 updateHitTestResult(result, flipForWritingMode(locationInContainer.p oint() - localOffset));
2254 if (!result.addNodeToRectBasedTestResult(nodeForHitTest(), request, locationInContainer, boundsRect)) 2254 if (!result.addNodeToRectBasedTestResult(nodeForHitTest(), request, locationInContainer, boundsRect))
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
3913 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3913 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3914 { 3914 {
3915 showRenderObject(); 3915 showRenderObject();
3916 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3916 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3917 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3917 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3918 } 3918 }
3919 3919
3920 #endif 3920 #endif
3921 3921
3922 } // namespace blink 3922 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestLocation.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698