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

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 1316163002: Make the LayoutRect->FloatRect constructor explicit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/html/HTMLCanvasElement.cpp ('k') | Source/core/layout/LayoutInline.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 1656 matching lines...) Expand 10 before | Expand all | Expand 10 after
1667 // FIXME: handle marginBox etc. 1667 // FIXME: handle marginBox etc.
1668 if (!clipPath->path(FloatRect(borderBoxRect())).contains(FloatPoint( locationInContainer.point() - localOffset), clipPath->windRule())) 1668 if (!clipPath->path(FloatRect(borderBoxRect())).contains(FloatPoint( locationInContainer.point() - localOffset), clipPath->windRule()))
1669 return false; 1669 return false;
1670 break; 1670 break;
1671 } 1671 }
1672 case ClipPathOperation::REFERENCE: 1672 case ClipPathOperation::REFERENCE:
1673 ReferenceClipPathOperation* referenceClipPathOperation = toReference ClipPathOperation(style()->clipPath()); 1673 ReferenceClipPathOperation* referenceClipPathOperation = toReference ClipPathOperation(style()->clipPath());
1674 Element* element = document().getElementById(referenceClipPathOperat ion->fragment()); 1674 Element* element = document().getElementById(referenceClipPathOperat ion->fragment());
1675 if (isSVGClipPathElement(element) && element->layoutObject()) { 1675 if (isSVGClipPathElement(element) && element->layoutObject()) {
1676 LayoutSVGResourceClipper* clipper = toLayoutSVGResourceClipper(t oLayoutSVGResourceContainer(element->layoutObject())); 1676 LayoutSVGResourceClipper* clipper = toLayoutSVGResourceClipper(t oLayoutSVGResourceContainer(element->layoutObject()));
1677 if (!clipper->hitTestClipContent(borderBoxRect(), FloatPoint(loc ationInContainer.point() - localOffset))) 1677 if (!clipper->hitTestClipContent(FloatRect(borderBoxRect()), Flo atPoint(locationInContainer.point() - localOffset)))
1678 return false; 1678 return false;
1679 } 1679 }
1680 break; 1680 break;
1681 } 1681 }
1682 } 1682 }
1683 1683
1684 // If we have clipping, then we can't have any spillout. 1684 // If we have clipping, then we can't have any spillout.
1685 bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer(); 1685 bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer();
1686 bool useClip = (hasControlClip() || useOverflowClip); 1686 bool useClip = (hasControlClip() || useOverflowClip);
1687 bool checkChildren = !useClip; 1687 bool checkChildren = !useClip;
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2904 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2904 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2905 { 2905 {
2906 showLayoutObject(); 2906 showLayoutObject();
2907 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2907 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2908 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2908 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2909 } 2909 }
2910 2910
2911 #endif 2911 #endif
2912 2912
2913 } // namespace blink 2913 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLCanvasElement.cpp ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698