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

Side by Side Diff: Source/core/rendering/RenderMultiColumnSet.cpp

Issue 564973002: Move a bunch more painting code out of RenderBoxModelObject and into BoxPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged, made more things static. Created 6 years, 3 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/rendering/RenderMultiColumnSet.h" 27 #include "core/rendering/RenderMultiColumnSet.h"
28 28
29 #include "core/paint/BoxPainter.h"
29 #include "core/rendering/PaintInfo.h" 30 #include "core/rendering/PaintInfo.h"
30 #include "core/rendering/RenderLayer.h" 31 #include "core/rendering/RenderLayer.h"
31 #include "core/rendering/RenderMultiColumnFlowThread.h" 32 #include "core/rendering/RenderMultiColumnFlowThread.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) 36 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread)
36 : RenderRegion(0, flowThread) 37 : RenderRegion(0, flowThread)
37 , m_columnHeight(0) 38 , m_columnHeight(0)
38 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight()) 39 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight())
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 LayoutUnit ruleThickness = blockStyle->columnRuleWidth(); 448 LayoutUnit ruleThickness = blockStyle->columnRuleWidth();
448 LayoutUnit colGap = columnGap(); 449 LayoutUnit colGap = columnGap();
449 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; 450 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;
450 if (!renderRule) 451 if (!renderRule)
451 return; 452 return;
452 453
453 unsigned colCount = actualColumnCount(); 454 unsigned colCount = actualColumnCount();
454 if (colCount <= 1) 455 if (colCount <= 1)
455 return; 456 return;
456 457
457 bool antialias = shouldAntialiasLines(paintInfo.context); 458 bool antialias = BoxPainter::shouldAntialiasLines(paintInfo.context);
458 459
459 bool leftToRight = style()->isLeftToRightDirection(); 460 bool leftToRight = style()->isLeftToRightDirection();
460 LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentLogic alWidth(); 461 LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentLogic alWidth();
461 LayoutUnit ruleAdd = borderAndPaddingLogicalLeft(); 462 LayoutUnit ruleAdd = borderAndPaddingLogicalLeft();
462 LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : contentLogicalWidt h(); 463 LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : contentLogicalWidt h();
463 LayoutUnit inlineDirectionSize = pageLogicalWidth(); 464 LayoutUnit inlineDirectionSize = pageLogicalWidth();
464 BoxSide boxSide = isHorizontalWritingMode() 465 BoxSide boxSide = isHorizontalWritingMode()
465 ? leftToRight ? BSLeft : BSRight 466 ? leftToRight ? BSLeft : BSRight
466 : leftToRight ? BSTop : BSBottom; 467 : leftToRight ? BSTop : BSBottom;
467 468
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 685
685 void RenderMultiColumnSet::detachRegion() 686 void RenderMultiColumnSet::detachRegion()
686 { 687 {
687 if (m_flowThread) { 688 if (m_flowThread) {
688 m_flowThread->removeRegionFromThread(this); 689 m_flowThread->removeRegionFromThread(this);
689 m_flowThread = 0; 690 m_flowThread = 0;
690 } 691 }
691 } 692 }
692 693
693 } 694 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698