| OLD | NEW | 
|   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/MultiColumnSetPainter.h" |   6 #include "core/paint/MultiColumnSetPainter.h" | 
|   7  |   7  | 
|   8 #include "core/layout/LayoutMultiColumnSet.h" |   8 #include "core/layout/LayoutMultiColumnSet.h" | 
|   9 #include "core/paint/BlockPainter.h" |   9 #include "core/paint/BlockPainter.h" | 
|  10 #include "core/paint/BoxPainter.h" |  10 #include "core/paint/BoxPainter.h" | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  44     LayoutUnit ruleThickness = blockStyle.columnRuleWidth(); |  44     LayoutUnit ruleThickness = blockStyle.columnRuleWidth(); | 
|  45     LayoutUnit colGap = m_layoutMultiColumnSet.columnGap(); |  45     LayoutUnit colGap = m_layoutMultiColumnSet.columnGap(); | 
|  46     bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; |  46     bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; | 
|  47     if (!renderRule) |  47     if (!renderRule) | 
|  48         return; |  48         return; | 
|  49  |  49  | 
|  50     unsigned colCount = m_layoutMultiColumnSet.actualColumnCount(); |  50     unsigned colCount = m_layoutMultiColumnSet.actualColumnCount(); | 
|  51     if (colCount <= 1) |  51     if (colCount <= 1) | 
|  52         return; |  52         return; | 
|  53  |  53  | 
|  54     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.conte
    xt, m_layoutMultiColumnSet, DisplayItem::ColumnRules, paintOffset)) |  54     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.contex
    t, m_layoutMultiColumnSet, DisplayItem::ColumnRules, paintOffset)) | 
|  55         return; |  55         return; | 
|  56  |  56  | 
|  57     LayoutRect paintRect = m_layoutMultiColumnSet.visualOverflowRect(); |  57     LayoutRect paintRect = m_layoutMultiColumnSet.visualOverflowRect(); | 
|  58     paintRect.moveBy(paintOffset); |  58     paintRect.moveBy(paintOffset); | 
|  59     LayoutObjectDrawingRecorder drawingRecorder(*paintInfo.context, m_layoutMult
    iColumnSet, DisplayItem::ColumnRules, paintRect, paintOffset); |  59     LayoutObjectDrawingRecorder drawingRecorder(paintInfo.context, m_layoutMulti
    ColumnSet, DisplayItem::ColumnRules, paintRect, paintOffset); | 
|  60  |  60  | 
|  61     bool leftToRight = m_layoutMultiColumnSet.style()->isLeftToRightDirection(); |  61     bool leftToRight = m_layoutMultiColumnSet.style()->isLeftToRightDirection(); | 
|  62     LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : m_layoutMult
    iColumnSet.contentLogicalWidth(); |  62     LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : m_layoutMult
    iColumnSet.contentLogicalWidth(); | 
|  63     LayoutUnit ruleAdd = m_layoutMultiColumnSet.borderAndPaddingLogicalLeft(); |  63     LayoutUnit ruleAdd = m_layoutMultiColumnSet.borderAndPaddingLogicalLeft(); | 
|  64     LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : m_layoutMultiColum
    nSet.contentLogicalWidth(); |  64     LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : m_layoutMultiColum
    nSet.contentLogicalWidth(); | 
|  65     LayoutUnit inlineDirectionSize = m_layoutMultiColumnSet.pageLogicalWidth(); |  65     LayoutUnit inlineDirectionSize = m_layoutMultiColumnSet.pageLogicalWidth(); | 
|  66     BoxSide boxSide = m_layoutMultiColumnSet.isHorizontalWritingMode() |  66     BoxSide boxSide = m_layoutMultiColumnSet.isHorizontalWritingMode() | 
|  67         ? leftToRight ? BSLeft : BSRight |  67         ? leftToRight ? BSLeft : BSRight | 
|  68         : leftToRight ? BSTop : BSBottom; |  68         : leftToRight ? BSTop : BSBottom; | 
|  69  |  69  | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
|  85             LayoutUnit ruleBottom = m_layoutMultiColumnSet.isHorizontalWritingMo
    de() ? ruleTop + m_layoutMultiColumnSet.contentHeight() : ruleTop + ruleThicknes
    s; |  85             LayoutUnit ruleBottom = m_layoutMultiColumnSet.isHorizontalWritingMo
    de() ? ruleTop + m_layoutMultiColumnSet.contentHeight() : ruleTop + ruleThicknes
    s; | 
|  86             IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
    , ruleTop, ruleRight, ruleBottom); |  86             IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
    , ruleTop, ruleRight, ruleBottom); | 
|  87             ObjectPainter::drawLineForBoxSide(paintInfo.context, pixelSnappedRul
    eRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRu
    leRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, true); |  87             ObjectPainter::drawLineForBoxSide(paintInfo.context, pixelSnappedRul
    eRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRu
    leRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, true); | 
|  88         } |  88         } | 
|  89  |  89  | 
|  90         ruleLogicalLeft = currLogicalLeftOffset; |  90         ruleLogicalLeft = currLogicalLeftOffset; | 
|  91     } |  91     } | 
|  92 } |  92 } | 
|  93  |  93  | 
|  94 } // namespace blink |  94 } // namespace blink | 
| OLD | NEW |