sky/engine/core/rendering/RenderBlock.cpp - Issue 689733003: Remove most of FloatingObject.

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 689733003: Remove most of FloatingObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

OLD	NEW
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 1652 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1663 // Clip out floating and positioned objects when painting selection gaps.	1663 // Clip out floating and positioned objects when painting selection gaps.

1664 if (paintInfo) {	1664 if (paintInfo) {

1665 // Note that we don't clip out overflow for positioned objects. We just stick to the border box.	1665 // Note that we don't clip out overflow for positioned objects. We just stick to the border box.

1666 LayoutRect flippedBlockRect(offsetFromRootBlock.width(), offsetFromRootB lock.height(), width(), height());	1666 LayoutRect flippedBlockRect(offsetFromRootBlock.width(), offsetFromRootB lock.height(), width(), height());

1667 rootBlock->flipForWritingMode(flippedBlockRect);	1667 rootBlock->flipForWritingMode(flippedBlockRect);

1668 flippedBlockRect.moveBy(rootBlockPhysicalPosition);	1668 flippedBlockRect.moveBy(rootBlockPhysicalPosition);

1669 clipOutPositionedObjects(paintInfo, flippedBlockRect.location(), positio nedObjects());	1669 clipOutPositionedObjects(paintInfo, flippedBlockRect.location(), positio nedObjects());

1670 if (isDocumentElement()) // The <body> must make sure to examine its con tainingBlock's positioned objects.	1670 if (isDocumentElement()) // The <body> must make sure to examine its con tainingBlock's positioned objects.

1671 for (RenderBlock* cb = containingBlock(); cb && !cb->isRenderView(); cb = cb->containingBlock())	1671 for (RenderBlock* cb = containingBlock(); cb && !cb->isRenderView(); cb = cb->containingBlock())

1672 clipOutPositionedObjects(paintInfo, LayoutPoint(cb->x(), cb->y() ), cb->positionedObjects()); // FIXME: Not right for flipped writing modes.	1672 clipOutPositionedObjects(paintInfo, LayoutPoint(cb->x(), cb->y() ), cb->positionedObjects()); // FIXME: Not right for flipped writing modes.

1673 clipOutFloatingObjects(rootBlock, paintInfo, rootBlockPhysicalPosition, offsetFromRootBlock);

1674 }	1673 }

1675	1674

1676 // FIXME: overflow: auto/scroll regions need more math here, since painting in the border box is different from painting in the padding box (one is scrolled , the other is	1675 // FIXME: overflow: auto/scroll regions need more math here, since painting in the border box is different from painting in the padding box (one is scrolled , the other is

1677 // fixed).	1676 // fixed).

1678 GapRects result;	1677 GapRects result;

1679 if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.	1678 if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.

1680 return result;	1679 return result;

1681	1680

1682 if (hasTransform()) {	1681 if (hasTransform()) {

1683 // FIXME: We should learn how to gap fill multiple columns and transform s eventually.	1682 // FIXME: We should learn how to gap fill multiple columns and transform s eventually.

(...skipping 1519 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3203 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const	3202 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const

3204 {	3203 {

3205 showRenderObject();	3204 showRenderObject();

3206 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())	3205 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())

3207 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);	3206 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);

3208 }	3207 }

3209	3208

3210 #endif	3209 #endif

3211	3210

3212 } // namespace blink	3211 } // namespace blink

OLD	NEW