OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/paint/PaintInvalidator.h" | 5 #include "core/paint/PaintInvalidator.h" |
6 | 6 |
7 #include "core/editing/FrameSelection.h" | 7 #include "core/editing/FrameSelection.h" |
8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
10 #include "core/frame/Settings.h" | 10 #include "core/frame/Settings.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 if (object.styleRef().hasOutline()) | 207 if (object.styleRef().hasOutline()) |
208 context.paintingLayer->setNeedsPaintPhaseDescendantOutlines(); | 208 context.paintingLayer->setNeedsPaintPhaseDescendantOutlines(); |
209 | 209 |
210 if (object.hasBoxDecorationBackground() | 210 if (object.hasBoxDecorationBackground() |
211 // We also paint overflow controls in background phase. | 211 // We also paint overflow controls in background phase. |
212 || (object.hasOverflowClip() && | 212 || (object.hasOverflowClip() && |
213 toLayoutBox(object).getScrollableArea()->hasOverflowControls())) { | 213 toLayoutBox(object).getScrollableArea()->hasOverflowControls())) { |
214 context.paintingLayer->setNeedsPaintPhaseDescendantBlockBackgrounds(); | 214 context.paintingLayer->setNeedsPaintPhaseDescendantBlockBackgrounds(); |
215 } | 215 } |
216 | 216 |
217 if (object.isTable() && toLayoutTable(object).hasCollapsedBorders()) | 217 if (object.isTable()) { |
218 context.paintingLayer->setNeedsPaintPhaseDescendantBlockBackgrounds(); | 218 const LayoutTable& table = toLayoutTable(object); |
| 219 if (table.collapseBorders() && !table.collapsedBorders().isEmpty()) |
| 220 context.paintingLayer->setNeedsPaintPhaseDescendantBlockBackgrounds(); |
| 221 } |
219 } | 222 } |
220 | 223 |
221 namespace { | 224 namespace { |
222 | 225 |
223 // This is temporary to workaround paint invalidation issues in | 226 // This is temporary to workaround paint invalidation issues in |
224 // non-rootLayerScrolls mode. | 227 // non-rootLayerScrolls mode. |
225 // It undoes FrameView's content clip and scroll for paint invalidation of frame | 228 // It undoes FrameView's content clip and scroll for paint invalidation of frame |
226 // scroll controls and the LayoutView to which the content clip and scroll don't | 229 // scroll controls and the LayoutView to which the content clip and scroll don't |
227 // apply. | 230 // apply. |
228 class ScopedUndoFrameViewContentClipAndScroll { | 231 class ScopedUndoFrameViewContentClipAndScroll { |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
430 PaintInvalidatorContext::ForcedSubtreeInvalidationRectUpdate; | 433 PaintInvalidatorContext::ForcedSubtreeInvalidationRectUpdate; |
431 } | 434 } |
432 | 435 |
433 void PaintInvalidator::processPendingDelayedPaintInvalidations() { | 436 void PaintInvalidator::processPendingDelayedPaintInvalidations() { |
434 for (auto target : m_pendingDelayedPaintInvalidations) | 437 for (auto target : m_pendingDelayedPaintInvalidations) |
435 target->getMutableForPainting().setShouldDoFullPaintInvalidation( | 438 target->getMutableForPainting().setShouldDoFullPaintInvalidation( |
436 PaintInvalidationDelayedFull); | 439 PaintInvalidationDelayedFull); |
437 } | 440 } |
438 | 441 |
439 } // namespace blink | 442 } // namespace blink |
OLD | NEW |