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

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, 4 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
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 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1678 // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet . 1678 // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet .
1679 if (!result.addNodeToListBasedTestResult(nodeForHitTest(), locationInCon tainer)) 1679 if (!result.addNodeToListBasedTestResult(nodeForHitTest(), locationInCon tainer))
1680 return true; 1680 return true;
1681 } 1681 }
1682 1682
1683 if (style()->clipPath()) { 1683 if (style()->clipPath()) {
1684 switch (style()->clipPath()->type()) { 1684 switch (style()->clipPath()->type()) {
1685 case ClipPathOperation::SHAPE: { 1685 case ClipPathOperation::SHAPE: {
1686 ShapeClipPathOperation* clipPath = toShapeClipPathOperation(style()- >clipPath()); 1686 ShapeClipPathOperation* clipPath = toShapeClipPathOperation(style()- >clipPath());
1687 // FIXME: handle marginBox etc. 1687 // FIXME: handle marginBox etc.
1688 if (!clipPath->path(borderBoxRect()).contains(FloatPoint(locationInC ontainer.point() - localOffset), clipPath->windRule())) 1688 if (!clipPath->path(FloatRect(borderBoxRect())).contains(FloatPoint( locationInContainer.point() - localOffset), clipPath->windRule()))
1689 return false; 1689 return false;
1690 break; 1690 break;
1691 } 1691 }
1692 case ClipPathOperation::REFERENCE: 1692 case ClipPathOperation::REFERENCE:
1693 // FIXME: handle REFERENCE 1693 // FIXME: handle REFERENCE
1694 break; 1694 break;
1695 } 1695 }
1696 } 1696 }
1697 1697
1698 // If we have clipping, then we can't have any spillout. 1698 // If we have clipping, then we can't have any spillout.
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2918 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2918 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2919 { 2919 {
2920 showLayoutObject(); 2920 showLayoutObject();
2921 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2921 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2922 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2922 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2923 } 2923 }
2924 2924
2925 #endif 2925 #endif
2926 2926
2927 } // namespace blink 2927 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698