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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.cpp

Issue 2615203002: Remove multicol special-cases from invalidation and the pre-paint tree walk (Closed)
Patch Set: Cleanup comment Created 3 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 "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 5 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
6 6
7 #include "core/layout/LayoutMultiColumnFlowThread.h" 7 #include "core/layout/LayoutMultiColumnFlowThread.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void LayoutMultiColumnSpannerPlaceholder::computeLogicalHeight( 134 void LayoutMultiColumnSpannerPlaceholder::computeLogicalHeight(
135 LayoutUnit, 135 LayoutUnit,
136 LayoutUnit logicalTop, 136 LayoutUnit logicalTop,
137 LogicalExtentComputedValues& computedValues) const { 137 LogicalExtentComputedValues& computedValues) const {
138 computedValues.m_extent = m_layoutObjectInFlowThread->logicalHeight(); 138 computedValues.m_extent = m_layoutObjectInFlowThread->logicalHeight();
139 computedValues.m_position = logicalTop; 139 computedValues.m_position = logicalTop;
140 computedValues.m_margins.m_before = marginBefore(); 140 computedValues.m_margins.m_before = marginBefore();
141 computedValues.m_margins.m_after = marginAfter(); 141 computedValues.m_margins.m_after = marginAfter();
142 } 142 }
143 143
144 void LayoutMultiColumnSpannerPlaceholder::invalidatePaintOfSubtreesIfNeeded(
145 const PaintInvalidationState& childPaintInvalidationState) {
146 m_layoutObjectInFlowThread->invalidateTreeIfNeeded(
147 childPaintInvalidationState);
148 LayoutBox::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState);
149 }
150
151 void LayoutMultiColumnSpannerPlaceholder::paint( 144 void LayoutMultiColumnSpannerPlaceholder::paint(
152 const PaintInfo& paintInfo, 145 const PaintInfo& paintInfo,
153 const LayoutPoint& paintOffset) const { 146 const LayoutPoint& paintOffset) const {
154 if (!m_layoutObjectInFlowThread->hasSelfPaintingLayer()) 147 if (!m_layoutObjectInFlowThread->hasSelfPaintingLayer())
155 m_layoutObjectInFlowThread->paint(paintInfo, paintOffset); 148 m_layoutObjectInFlowThread->paint(paintInfo, paintOffset);
156 } 149 }
157 150
158 bool LayoutMultiColumnSpannerPlaceholder::nodeAtPoint( 151 bool LayoutMultiColumnSpannerPlaceholder::nodeAtPoint(
159 HitTestResult& result, 152 HitTestResult& result,
160 const HitTestLocation& locationInContainer, 153 const HitTestLocation& locationInContainer,
161 const LayoutPoint& accumulatedOffset, 154 const LayoutPoint& accumulatedOffset,
162 HitTestAction action) { 155 HitTestAction action) {
163 return !m_layoutObjectInFlowThread->hasSelfPaintingLayer() && 156 return !m_layoutObjectInFlowThread->hasSelfPaintingLayer() &&
164 m_layoutObjectInFlowThread->nodeAtPoint(result, locationInContainer, 157 m_layoutObjectInFlowThread->nodeAtPoint(result, locationInContainer,
165 accumulatedOffset, action); 158 accumulatedOffset, action);
166 } 159 }
167 160
168 } // namespace blink 161 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698