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

Side by Side Diff: Source/core/paint/BlockPainter.cpp

Issue 792803002: [New Multicolumn] Layout support for column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@347325-placeholder
Patch Set: Code review. If there are no sets, return early. Created 5 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/BlockPainter.h" 6 #include "core/paint/BlockPainter.h"
7 7
8 #include "core/editing/Caret.h" 8 #include "core/editing/Caret.h"
9 #include "core/editing/FrameSelection.h" 9 #include "core/editing/FrameSelection.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 void BlockPainter::paintChildren(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) 94 void BlockPainter::paintChildren(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
95 { 95 {
96 for (RenderBox* child = m_renderBlock.firstChildBox(); child; child = child- >nextSiblingBox()) 96 for (RenderBox* child = m_renderBlock.firstChildBox(); child; child = child- >nextSiblingBox())
97 paintChild(child, paintInfo, paintOffset); 97 paintChild(child, paintInfo, paintOffset);
98 } 98 }
99 99
100 void BlockPainter::paintChild(RenderBox* child, const PaintInfo& paintInfo, cons t LayoutPoint& paintOffset) 100 void BlockPainter::paintChild(RenderBox* child, const PaintInfo& paintInfo, cons t LayoutPoint& paintOffset)
101 { 101 {
102 LayoutPoint childPoint = m_renderBlock.flipForWritingModeForChild(child, pai ntOffset); 102 LayoutPoint childPoint = m_renderBlock.flipForWritingModeForChild(child, pai ntOffset);
103 if (!child->hasSelfPaintingLayer() && !child->isFloating()) 103 if (!child->hasSelfPaintingLayer() && !child->isFloating() && !child->isColu mnSpanAll())
104 child->paint(paintInfo, childPoint); 104 child->paint(paintInfo, childPoint);
105 } 105 }
106 106
107 void BlockPainter::paintChildrenOfFlexibleBox(RenderFlexibleBox& renderFlexibleB ox, const PaintInfo& paintInfo, const LayoutPoint& paintOffset) 107 void BlockPainter::paintChildrenOfFlexibleBox(RenderFlexibleBox& renderFlexibleB ox, const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
108 { 108 {
109 for (RenderBox* child = renderFlexibleBox.orderIterator().first(); child; ch ild = renderFlexibleBox.orderIterator().next()) 109 for (RenderBox* child = renderFlexibleBox.orderIterator().first(); child; ch ild = renderFlexibleBox.orderIterator().next())
110 BlockPainter(renderFlexibleBox).paintChildAsInlineBlock(child, paintInfo , paintOffset); 110 BlockPainter(renderFlexibleBox).paintChildAsInlineBlock(child, paintInfo , paintOffset);
111 } 111 }
112 112
113 void BlockPainter::paintChildAsInlineBlock(RenderBox* child, const PaintInfo& pa intInfo, const LayoutPoint& paintOffset) 113 void BlockPainter::paintChildAsInlineBlock(RenderBox* child, const PaintInfo& pa intInfo, const LayoutPoint& paintOffset)
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 RenderBlock* block = flow->containingBlock(); 487 RenderBlock* block = flow->containingBlock();
488 for ( ; block && block != &m_renderBlock; block = block->containingBlock ()) 488 for ( ; block && block != &m_renderBlock; block = block->containingBlock ())
489 accumulatedPaintOffset.moveBy(block->location()); 489 accumulatedPaintOffset.moveBy(block->location());
490 ASSERT(block); 490 ASSERT(block);
491 InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset); 491 InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset);
492 } 492 }
493 } 493 }
494 494
495 495
496 } // namespace blink 496 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/span/with-border-expected.html ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698