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

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

Issue 1303413004: Convert some call sites to use explicit LayoutRect->FloatRect conversion. (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/layout/HitTestLocation.cpp ('k') | Source/core/layout/LayoutBoxModelObject.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 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet . 1679 // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet .
1680 if (!result.addNodeToListBasedTestResult(nodeForHitTest(), locationInCon tainer)) 1680 if (!result.addNodeToListBasedTestResult(nodeForHitTest(), locationInCon tainer))
1681 return true; 1681 return true;
1682 } 1682 }
1683 1683
1684 if (style()->clipPath()) { 1684 if (style()->clipPath()) {
1685 switch (style()->clipPath()->type()) { 1685 switch (style()->clipPath()->type()) {
1686 case ClipPathOperation::SHAPE: { 1686 case ClipPathOperation::SHAPE: {
1687 ShapeClipPathOperation* clipPath = toShapeClipPathOperation(style()- >clipPath()); 1687 ShapeClipPathOperation* clipPath = toShapeClipPathOperation(style()- >clipPath());
1688 // FIXME: handle marginBox etc. 1688 // FIXME: handle marginBox etc.
1689 if (!clipPath->path(borderBoxRect()).contains(FloatPoint(locationInC ontainer.point() - localOffset), clipPath->windRule())) 1689 if (!clipPath->path(FloatRect(borderBoxRect())).contains(FloatPoint( locationInContainer.point() - localOffset), clipPath->windRule()))
1690 return false; 1690 return false;
1691 break; 1691 break;
1692 } 1692 }
1693 case ClipPathOperation::REFERENCE: 1693 case ClipPathOperation::REFERENCE:
1694 ReferenceClipPathOperation* referenceClipPathOperation = toReference ClipPathOperation(style()->clipPath()); 1694 ReferenceClipPathOperation* referenceClipPathOperation = toReference ClipPathOperation(style()->clipPath());
1695 Element* element = document().getElementById(referenceClipPathOperat ion->fragment()); 1695 Element* element = document().getElementById(referenceClipPathOperat ion->fragment());
1696 if (isSVGClipPathElement(element) && element->layoutObject()) { 1696 if (isSVGClipPathElement(element) && element->layoutObject()) {
1697 LayoutSVGResourceClipper* clipper = toLayoutSVGResourceClipper(t oLayoutSVGResourceContainer(element->layoutObject())); 1697 LayoutSVGResourceClipper* clipper = toLayoutSVGResourceClipper(t oLayoutSVGResourceContainer(element->layoutObject()));
1698 if (!clipper->hitTestClipContent(borderBoxRect(), FloatPoint(loc ationInContainer.point() - localOffset))) 1698 if (!clipper->hitTestClipContent(borderBoxRect(), FloatPoint(loc ationInContainer.point() - localOffset)))
1699 return false; 1699 return false;
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2925 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2925 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2926 { 2926 {
2927 showLayoutObject(); 2927 showLayoutObject();
2928 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2928 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2929 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2929 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2930 } 2930 }
2931 2931
2932 #endif 2932 #endif
2933 2933
2934 } // namespace blink 2934 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/HitTestLocation.cpp ('k') | Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698