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

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

Issue 952273006: Make the constructor of a LayoutRect from an IntRect explicit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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/LayoutBox.cpp ('k') | Source/core/layout/LayoutTreeAsText.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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 1038
1039 LayoutInline* endContinuation = inlineElementContinuation(); 1039 LayoutInline* endContinuation = inlineElementContinuation();
1040 while (endContinuation->inlineElementContinuation()) 1040 while (endContinuation->inlineElementContinuation())
1041 endContinuation = endContinuation->inlineElementContinuation(); 1041 endContinuation = endContinuation->inlineElementContinuation();
1042 1042
1043 for (LayoutBlock* currBlock = containingBlock(); currBlock && currBlock->isA nonymousBlock(); currBlock = toLayoutBlock(currBlock->nextSibling())) { 1043 for (LayoutBlock* currBlock = containingBlock(); currBlock && currBlock->isA nonymousBlock(); currBlock = toLayoutBlock(currBlock->nextSibling())) {
1044 for (LayoutObject* curr = currBlock->firstChild(); curr; curr = curr->ne xtSibling()) { 1044 for (LayoutObject* curr = currBlock->firstChild(); curr; curr = curr->ne xtSibling()) {
1045 LayoutRect rect = curr->clippedOverflowRectForPaintInvalidation(view ()); 1045 LayoutRect rect = curr->clippedOverflowRectForPaintInvalidation(view ());
1046 context(rect); 1046 context(rect);
1047 if (curr == endContinuation) 1047 if (curr == endContinuation)
1048 return enclosingIntRect(floatResult); 1048 return LayoutRect(enclosingIntRect(floatResult));
1049 } 1049 }
1050 } 1050 }
1051 return LayoutRect(); 1051 return LayoutRect();
1052 } 1052 }
1053 1053
1054 LayoutRect LayoutInline::clippedOverflowRectForPaintInvalidation(const LayoutBox ModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInva lidationState) const 1054 LayoutRect LayoutInline::clippedOverflowRectForPaintInvalidation(const LayoutBox ModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInva lidationState) const
1055 { 1055 {
1056 // If we don't create line boxes, we don't have any invalidations to do. 1056 // If we don't create line boxes, we don't have any invalidations to do.
1057 if (!alwaysCreateLineBoxes()) 1057 if (!alwaysCreateLineBoxes())
1058 return LayoutRect(); 1058 return LayoutRect();
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 { 1435 {
1436 // Convert the style regions to absolute coordinates. 1436 // Convert the style regions to absolute coordinates.
1437 if (style()->visibility() != VISIBLE) 1437 if (style()->visibility() != VISIBLE)
1438 return; 1438 return;
1439 1439
1440 if (style()->getDraggableRegionMode() == DraggableRegionNone) 1440 if (style()->getDraggableRegionMode() == DraggableRegionNone)
1441 return; 1441 return;
1442 1442
1443 AnnotatedRegionValue region; 1443 AnnotatedRegionValue region;
1444 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; 1444 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag;
1445 region.bounds = linesBoundingBox(); 1445 region.bounds = LayoutRect(linesBoundingBox());
1446 1446
1447 LayoutObject* container = containingBlock(); 1447 LayoutObject* container = containingBlock();
1448 if (!container) 1448 if (!container)
1449 container = this; 1449 container = this;
1450 1450
1451 FloatPoint absPos = container->localToAbsolute(); 1451 FloatPoint absPos = container->localToAbsolute();
1452 region.bounds.setX(absPos.x() + region.bounds.x()); 1452 region.bounds.setX(absPos.x() + region.bounds.x());
1453 region.bounds.setY(absPos.y() + region.bounds.y()); 1453 region.bounds.setY(absPos.y() + region.bounds.y());
1454 1454
1455 regions.append(region); 1455 regions.append(region);
1456 } 1456 }
1457 1457
1458 void LayoutInline::invalidateDisplayItemClients(DisplayItemList* displayItemList ) const 1458 void LayoutInline::invalidateDisplayItemClients(DisplayItemList* displayItemList ) const
1459 { 1459 {
1460 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); 1460 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList);
1461 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1461 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1462 displayItemList->invalidate(box->displayItemClient()); 1462 displayItemList->invalidate(box->displayItemClient());
1463 } 1463 }
1464 1464
1465 } // namespace blink 1465 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698