OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/PaintInvalidationCapableScrollableArea.h" | 6 #include "core/paint/PaintInvalidationCapableScrollableArea.h" |
7 | 7 |
8 #include "core/frame/Settings.h" | 8 #include "core/frame/Settings.h" |
9 #include "core/html/HTMLFrameOwnerElement.h" | 9 #include "core/html/HTMLFrameOwnerElement.h" |
10 #include "core/layout/LayoutBox.h" | 10 #include "core/layout/LayoutBox.h" |
11 #include "core/layout/LayoutScrollbar.h" | 11 #include "core/layout/LayoutScrollbar.h" |
12 #include "core/layout/LayoutScrollbarPart.h" | 12 #include "core/layout/LayoutScrollbarPart.h" |
13 #include "core/layout/PaintInvalidationState.h" | 13 #include "core/layout/PaintInvalidationState.h" |
14 #include "core/paint/PaintLayer.h" | 14 #include "core/paint/PaintLayer.h" |
15 #include "platform/graphics/GraphicsLayer.h" | |
15 | 16 |
16 namespace blink { | 17 namespace blink { |
17 | 18 |
18 void PaintInvalidationCapableScrollableArea::willRemoveScrollbar(Scrollbar* scro llbar, ScrollbarOrientation orientation) | 19 void PaintInvalidationCapableScrollableArea::willRemoveScrollbar(Scrollbar* scro llbar, ScrollbarOrientation orientation) |
19 { | 20 { |
20 if (!scrollbar->isCustomScrollbar() | 21 if (!scrollbar->isCustomScrollbar() |
21 && !(orientation == HorizontalScrollbar ? layerForHorizontalScrollbar() : layerForVerticalScrollbar())) | 22 && !(orientation == HorizontalScrollbar ? layerForHorizontalScrollbar() : layerForVerticalScrollbar())) |
22 boxForScrollControlPaintInvalidation().invalidateDisplayItemClient(*scro llbar); | 23 boxForScrollControlPaintInvalidation().invalidateDisplayItemClient(*scro llbar); |
23 | 24 |
24 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 25 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
25 } | 26 } |
26 | 27 |
27 // Returns true if the scroll control is invalidated. | 28 static LayoutRect scrollControlPaintInvalidationRect(const IntRect& scrollContro lRect, const LayoutBox& box, const PaintInvalidationState& paintInvalidationStat e, const LayoutBoxModelObject& paintInvalidationContainer) |
28 static bool invalidatePaintOfScrollControlIfNeeded(const IntRect& scrollControlR ect, LayoutRect& previousPaintInvalidationRect, bool needsPaintInvalidation, Lay outBox& box, const PaintInvalidationState& paintInvalidationState, const LayoutB oxModelObject& paintInvalidationContainer) | |
29 { | 29 { |
30 LayoutRect paintInvalidationRect(scrollControlRect); | 30 LayoutRect paintInvalidationRect(scrollControlRect); |
31 if (!paintInvalidationRect.isEmpty()) | 31 if (!paintInvalidationRect.isEmpty()) |
32 PaintLayer::mapRectToPaintInvalidationBacking(&box, &paintInvalidationCo ntainer, paintInvalidationRect, &paintInvalidationState); | 32 PaintLayer::mapRectToPaintInvalidationBacking(&box, &paintInvalidationCo ntainer, paintInvalidationRect, &paintInvalidationState); |
33 return paintInvalidationRect; | |
34 } | |
33 | 35 |
34 if (paintInvalidationRect != previousPaintInvalidationRect) { | 36 // Returns true if the scroll control is invalidated. |
37 static bool invalidatePaintOfScrollControlIfNeeded(const LayoutRect& newPaintInv alidationRect, const LayoutRect& previousPaintInvalidationRect, bool needsPaintI nvalidation, LayoutBox& box, const LayoutBoxModelObject& paintInvalidationContai ner) | |
38 { | |
39 bool shouldInvalidateNewRect = needsPaintInvalidation; | |
40 if (newPaintInvalidationRect != previousPaintInvalidationRect) { | |
35 box.invalidatePaintUsingContainer(paintInvalidationContainer, previousPa intInvalidationRect, PaintInvalidationScroll); | 41 box.invalidatePaintUsingContainer(paintInvalidationContainer, previousPa intInvalidationRect, PaintInvalidationScroll); |
36 previousPaintInvalidationRect = paintInvalidationRect; | 42 shouldInvalidateNewRect = true; |
37 needsPaintInvalidation = true; | |
38 } | 43 } |
39 | 44 if (shouldInvalidateNewRect) { |
40 if (needsPaintInvalidation) { | 45 box.invalidatePaintUsingContainer(paintInvalidationContainer, newPaintIn validationRect, PaintInvalidationScroll); |
41 box.invalidatePaintUsingContainer(paintInvalidationContainer, paintInval idationRect, PaintInvalidationScroll); | 46 box.enclosingLayer()->setNeedsRepaint(); |
42 return true; | 47 return true; |
43 } | 48 } |
44 | |
45 return false; | 49 return false; |
46 } | 50 } |
47 | 51 |
48 static void invalidatePaintOfScrollbarIfNeeded(Scrollbar* scrollbar, GraphicsLay er* scrollbarGraphicsLayer, LayoutRect& previousPaintInvalidationRect, bool need sPaintInvalidation, LayoutBox& box, const PaintInvalidationState& paintInvalidat ionState, const LayoutBoxModelObject& paintInvalidationContainer) | 52 struct ScrollbarPaintInvalidationData { |
53 Scrollbar* scrollbar; | |
54 GraphicsLayer* graphicsLayer; | |
55 LayoutRect& previousPaintInvalidatioRect; | |
56 | |
57 }; | |
58 | |
59 static void invalidatePaintOfScrollbarIfNeeded(Scrollbar* scrollbar, GraphicsLay er* graphicsLayer, bool& previouslyWasOverlay, LayoutRect& previousPaintInvalida tionRect, bool needsPaintInvalidationArg, LayoutBox& box, const PaintInvalidatio nState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationCon tainer) | |
49 { | 60 { |
50 IntRect scrollbarRect = scrollbar && !scrollbarGraphicsLayer ? scrollbar->fr ameRect() : IntRect(); | 61 bool isOverlay = scrollbar && scrollbar->isOverlayScrollbar(); |
51 if (!invalidatePaintOfScrollControlIfNeeded(scrollbarRect, previousPaintInva lidationRect, needsPaintInvalidation, box, paintInvalidationState, paintInvalida tionContainer)) | 62 |
52 return; | 63 // Calculate paint invalidation rect of the scrollbar, except overlay compos ited scrollbars because we invalidate the graphics layer only. |
53 if (!scrollbar) | 64 LayoutRect newPaintInvalidationRect; |
65 if (scrollbar && !(graphicsLayer && isOverlay)) | |
66 newPaintInvalidationRect = scrollControlPaintInvalidationRect(scrollbar- >frameRect(), box, paintInvalidationState, paintInvalidationContainer); | |
67 | |
68 bool needsPaintInvalidation = needsPaintInvalidationArg; | |
69 if (graphicsLayer && needsPaintInvalidation) { | |
70 graphicsLayer->setNeedsDisplay(); | |
71 graphicsLayer->setContentsNeedsDisplay(); | |
72 // If the scrollbar needs paint invalidation but didn't change location/ size or the scrollbar is an | |
73 // overlay scrollbar (paint invalidation rect is empty), invalidating th e graphics layer is enough. | |
74 // Otherwise invalidatePaintOfScrollControlIfNeeded() below will invalid ate the old and new location | |
75 // of the scrollbar on the box's paint invalidation container to ensure newly expanded/shrunk areas | |
76 // of the box to be invalidated. | |
77 needsPaintInvalidation = false; | |
78 } | |
79 | |
80 // Invalidate the box's display item client if the box's padding box size is affected by change of the | |
81 // non-overlay scrollbar width. We detect change of paint invalidation rect size instead of change of | |
82 // scrollbar width change, which may have some false-positives (e.g. the scr ollbar changed length but | |
83 // not width) but won't invalidate more than expected because in the false-p ositive case the box must | |
84 // have changed size and have been invalidated. | |
85 LayoutSize newNonOverlaySize; | |
86 if (!isOverlay) | |
chrishtr
2015/12/04 01:28:18
It still reads confusingly to me. Isn't the logic
Xianzhu
2015/12/04 02:35:14
No.
I'm comparing the new space and previous spac
chrishtr
2015/12/08 21:17:10
Yes, I think so.
Xianzhu
2015/12/08 22:21:59
Done.
| |
87 newNonOverlaySize = newPaintInvalidationRect.size(); | |
88 LayoutSize previousNonOverlaySize; | |
89 if (!previouslyWasOverlay) | |
90 previousNonOverlaySize = previousPaintInvalidationRect.size(); | |
91 if (newNonOverlaySize != previousNonOverlaySize) | |
92 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(box, Pai ntInvalidationScroll, nullptr); | |
93 | |
94 bool invalidated = invalidatePaintOfScrollControlIfNeeded(newPaintInvalidati onRect, previousPaintInvalidationRect, needsPaintInvalidation, box, paintInvalid ationContainer); | |
95 | |
96 previousPaintInvalidationRect = newPaintInvalidationRect; | |
97 previouslyWasOverlay = isOverlay; | |
98 | |
99 if (!invalidated || !scrollbar || graphicsLayer) | |
54 return; | 100 return; |
55 | 101 |
56 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*scrollbar, PaintInvalidationScroll, &previousPaintInvalidationRect); | 102 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*scrollbar, PaintInvalidationScroll, &previousPaintInvalidationRect); |
57 box.enclosingLayer()->setNeedsRepaint(); | |
58 if (scrollbar->isCustomScrollbar()) | 103 if (scrollbar->isCustomScrollbar()) |
59 toLayoutScrollbar(scrollbar)->invalidateDisplayItemClientsOfScrollbarPar ts(paintInvalidationContainer, previousPaintInvalidationRect); | 104 toLayoutScrollbar(scrollbar)->invalidateDisplayItemClientsOfScrollbarPar ts(paintInvalidationContainer, previousPaintInvalidationRect); |
60 } | 105 } |
61 | 106 |
62 void PaintInvalidationCapableScrollableArea::invalidatePaintOfScrollControlsIfNe eded(const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelO bject& paintInvalidationContainer) | 107 void PaintInvalidationCapableScrollableArea::invalidatePaintOfScrollControlsIfNe eded(const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelO bject& paintInvalidationContainer) |
63 { | 108 { |
64 LayoutBox& box = boxForScrollControlPaintInvalidation(); | 109 LayoutBox& box = boxForScrollControlPaintInvalidation(); |
65 LayoutRect oldRect = m_horizontalScrollbarPreviousPaintInvalidationRect; | 110 invalidatePaintOfScrollbarIfNeeded(horizontalScrollbar(), layerForHorizontal Scrollbar(), m_horizontalScrollbarPreviouslyWasOverlay, m_horizontalScrollbarPre viousPaintInvalidationRect, horizontalScrollbarNeedsPaintInvalidation(), box, pa intInvalidationState, paintInvalidationContainer); |
66 invalidatePaintOfScrollbarIfNeeded(horizontalScrollbar(), layerForHorizontal Scrollbar(), m_horizontalScrollbarPreviousPaintInvalidationRect, horizontalScrol lbarNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationCont ainer); | 111 invalidatePaintOfScrollbarIfNeeded(verticalScrollbar(), layerForVerticalScro llbar(), m_verticalScrollbarPreviouslyWasOverlay, m_verticalScrollbarPreviousPai ntInvalidationRect, verticalScrollbarNeedsPaintInvalidation(), box, paintInvalid ationState, paintInvalidationContainer); |
67 bool scrollbarGeometryChanged = oldRect != m_horizontalScrollbarPreviousPain tInvalidationRect; | |
68 | 112 |
69 oldRect = m_verticalScrollbarPreviousPaintInvalidationRect; | 113 LayoutRect scrollCornerPaintInvalidationRect = scrollControlPaintInvalidatio nRect(scrollCornerRect(), box, paintInvalidationState, paintInvalidationContaine r); |
70 invalidatePaintOfScrollbarIfNeeded(verticalScrollbar(), layerForVerticalScro llbar(), m_verticalScrollbarPreviousPaintInvalidationRect, verticalScrollbarNeed sPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer); | 114 if (invalidatePaintOfScrollControlIfNeeded(scrollCornerPaintInvalidationRect , m_scrollCornerPreviousPaintInvalidationRect, scrollCornerNeedsPaintInvalidatio n(), box, paintInvalidationContainer)) { |
71 scrollbarGeometryChanged |= oldRect != m_verticalScrollbarPreviousPaintInval idationRect; | 115 m_scrollCornerPreviousPaintInvalidationRect = scrollCornerPaintInvalidat ionRect; |
72 | |
73 if (scrollbarGeometryChanged) | |
74 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(box, Pai ntInvalidationScroll, nullptr); | |
75 | |
76 if (invalidatePaintOfScrollControlIfNeeded(scrollCornerRect(), m_scrollCorne rPreviousPaintInvalidationRect, scrollCornerNeedsPaintInvalidation(), box, paint InvalidationState, paintInvalidationContainer)) { | |
77 if (LayoutScrollbarPart* scrollCorner = this->scrollCorner()) | 116 if (LayoutScrollbarPart* scrollCorner = this->scrollCorner()) |
78 scrollCorner->invalidateDisplayItemClientsIncludingNonCompositingDes cendants(&paintInvalidationContainer, PaintInvalidationScroll, &m_scrollCornerPr eviousPaintInvalidationRect); | 117 scrollCorner->invalidateDisplayItemClientsIncludingNonCompositingDes cendants(&paintInvalidationContainer, PaintInvalidationScroll, &m_scrollCornerPr eviousPaintInvalidationRect); |
79 if (LayoutScrollbarPart* resizer = this->resizer()) | 118 if (LayoutScrollbarPart* resizer = this->resizer()) |
80 resizer->invalidateDisplayItemClientsIncludingNonCompositingDescenda nts(&paintInvalidationContainer, PaintInvalidationScroll, &m_scrollCornerPreviou sPaintInvalidationRect); | 119 resizer->invalidateDisplayItemClientsIncludingNonCompositingDescenda nts(&paintInvalidationContainer, PaintInvalidationScroll, &m_scrollCornerPreviou sPaintInvalidationRect); |
81 } | 120 } |
82 | 121 |
83 clearNeedsPaintInvalidationForScrollControls(); | 122 clearNeedsPaintInvalidationForScrollControls(); |
84 } | 123 } |
85 | 124 |
125 void PaintInvalidationCapableScrollableArea::clearPreviousPaintInvalidationRects () | |
126 { | |
127 m_horizontalScrollbarPreviousPaintInvalidationRect = LayoutRect(); | |
128 m_verticalScrollbarPreviousPaintInvalidationRect = LayoutRect(); | |
129 m_scrollCornerPreviousPaintInvalidationRect = LayoutRect(); | |
130 } | |
131 | |
86 } // namespace blink | 132 } // namespace blink |
OLD | NEW |