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

Side by Side Diff: Source/core/layout/LayoutInline.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
« no previous file with comments | « Source/core/layout/LayoutBoxModelObject.cpp ('k') | Source/core/layout/LayoutObject.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 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 1019
1020 FloatRect floatResult; 1020 FloatRect floatResult;
1021 LinesBoundingBoxGeneratorContext context(floatResult); 1021 LinesBoundingBoxGeneratorContext context(floatResult);
1022 1022
1023 LayoutInline* endContinuation = inlineElementContinuation(); 1023 LayoutInline* endContinuation = inlineElementContinuation();
1024 while (LayoutInline* nextContinuation = endContinuation->inlineElementContin uation()) 1024 while (LayoutInline* nextContinuation = endContinuation->inlineElementContin uation())
1025 endContinuation = nextContinuation; 1025 endContinuation = nextContinuation;
1026 1026
1027 for (LayoutBlock* currBlock = containingBlock(); currBlock && currBlock->isA nonymousBlock(); currBlock = toLayoutBlock(currBlock->nextSibling())) { 1027 for (LayoutBlock* currBlock = containingBlock(); currBlock && currBlock->isA nonymousBlock(); currBlock = toLayoutBlock(currBlock->nextSibling())) {
1028 for (LayoutObject* curr = currBlock->firstChild(); curr; curr = curr->ne xtSibling()) { 1028 for (LayoutObject* curr = currBlock->firstChild(); curr; curr = curr->ne xtSibling()) {
1029 LayoutRect rect = curr->clippedOverflowRectForPaintInvalidation(view ()); 1029 LayoutRect rect(curr->clippedOverflowRectForPaintInvalidation(view() ));
1030 context(rect); 1030 context(FloatRect(rect));
1031 if (curr == endContinuation) 1031 if (curr == endContinuation)
1032 return LayoutRect(enclosingIntRect(floatResult)); 1032 return LayoutRect(enclosingIntRect(floatResult));
1033 } 1033 }
1034 } 1034 }
1035 return LayoutRect(); 1035 return LayoutRect();
1036 } 1036 }
1037 1037
1038 LayoutRect LayoutInline::clippedOverflowRectForPaintInvalidation(const LayoutBox ModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInva lidationState) const 1038 LayoutRect LayoutInline::clippedOverflowRectForPaintInvalidation(const LayoutBox ModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInva lidationState) const
1039 { 1039 {
1040 // If we don't create line boxes, we don't have any invalidations to do. 1040 // If we don't create line boxes, we don't have any invalidations to do.
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 } 1429 }
1430 1430
1431 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer) const 1431 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer) const
1432 { 1432 {
1433 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r); 1433 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r);
1434 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1434 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1435 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box); 1435 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
1436 } 1436 }
1437 1437
1438 } // namespace blink 1438 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBoxModelObject.cpp ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698