OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
99 #include "platform/TracedValue.h" | 99 #include "platform/TracedValue.h" |
100 #include "platform/fonts/FontCache.h" | 100 #include "platform/fonts/FontCache.h" |
101 #include "platform/geometry/DoubleRect.h" | 101 #include "platform/geometry/DoubleRect.h" |
102 #include "platform/geometry/FloatRect.h" | 102 #include "platform/geometry/FloatRect.h" |
103 #include "platform/geometry/LayoutRect.h" | 103 #include "platform/geometry/LayoutRect.h" |
104 #include "platform/graphics/GraphicsContext.h" | 104 #include "platform/graphics/GraphicsContext.h" |
105 #include "platform/graphics/GraphicsLayer.h" | 105 #include "platform/graphics/GraphicsLayer.h" |
106 #include "platform/graphics/GraphicsLayerDebugInfo.h" | 106 #include "platform/graphics/GraphicsLayerDebugInfo.h" |
107 #include "platform/graphics/paint/CullRect.h" | 107 #include "platform/graphics/paint/CullRect.h" |
108 #include "platform/graphics/paint/PaintController.h" | 108 #include "platform/graphics/paint/PaintController.h" |
109 #include "platform/graphics/paint/ScopedPaintChunkProperties.h" | |
109 #include "platform/scheduler/CancellableTaskFactory.h" | 110 #include "platform/scheduler/CancellableTaskFactory.h" |
110 #include "platform/scroll/ScrollAnimatorBase.h" | 111 #include "platform/scroll/ScrollAnimatorBase.h" |
111 #include "platform/scroll/ScrollbarTheme.h" | 112 #include "platform/scroll/ScrollbarTheme.h" |
112 #include "platform/text/TextStream.h" | 113 #include "platform/text/TextStream.h" |
113 #include "public/platform/WebDisplayItemList.h" | 114 #include "public/platform/WebDisplayItemList.h" |
114 #include "public/platform/WebFrameScheduler.h" | 115 #include "public/platform/WebFrameScheduler.h" |
115 #include "wtf/CurrentTime.h" | 116 #include "wtf/CurrentTime.h" |
116 #include "wtf/PtrUtil.h" | 117 #include "wtf/PtrUtil.h" |
117 #include "wtf/StdLibExtras.h" | 118 #include "wtf/StdLibExtras.h" |
118 #include "wtf/TemporaryChange.h" | 119 #include "wtf/TemporaryChange.h" |
(...skipping 2517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2636 layoutViewItem.layer()->clearNeedsRepaintRecursively(); | 2637 layoutViewItem.layer()->clearNeedsRepaintRecursively(); |
2637 }); | 2638 }); |
2638 } | 2639 } |
2639 | 2640 |
2640 void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer) | 2641 void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer) |
2641 { | 2642 { |
2642 if (graphicsLayer->drawsContent()) { | 2643 if (graphicsLayer->drawsContent()) { |
2643 // Usually this is not needed because the PaintLayer will setup the chun k properties | 2644 // Usually this is not needed because the PaintLayer will setup the chun k properties |
2644 // altogether. However in debug builds the GraphicsLayer could paint deb ug background before | 2645 // altogether. However in debug builds the GraphicsLayer could paint deb ug background before |
2645 // we ever reach the PaintLayer. | 2646 // we ever reach the PaintLayer. |
2647 Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties; | |
2646 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | 2648 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
2647 PaintChunkProperties properties; | 2649 PaintChunkProperties properties; |
2648 properties.transform = m_rootTransform; | 2650 properties.transform = m_rootTransform; |
2649 properties.clip = m_rootClip; | 2651 properties.clip = m_rootClip; |
2650 properties.effect = m_rootEffect; | 2652 properties.effect = m_rootEffect; |
2651 graphicsLayer->getPaintController().updateCurrentPaintChunkPropertie s(properties); | 2653 scopedPaintChunkProperties.emplace(graphicsLayer->getPaintController (), *layoutView(), DisplayItem::DebugRedFill, properties); |
chrishtr
2016/07/19 17:27:52
It's weird that there is a reference to the debug
Xianzhu
2016/07/19 21:57:48
This had been weird before this CL. To push this d
chrishtr
2016/07/19 23:42:27
In debug builds cc does indeed show a color undern
| |
2652 } | 2654 } |
2653 graphicsLayer->paint(nullptr); | 2655 graphicsLayer->paint(nullptr); |
2654 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) | |
2655 graphicsLayer->getPaintController().updateCurrentPaintChunkPropertie s(PaintChunkProperties()); | |
2656 } | 2656 } |
2657 | 2657 |
2658 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | 2658 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
2659 if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer()) | 2659 if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer()) |
2660 synchronizedPaintRecursively(maskLayer); | 2660 synchronizedPaintRecursively(maskLayer); |
2661 if (GraphicsLayer* contentsClippingMaskLayer = graphicsLayer->contentsCl ippingMaskLayer()) | 2661 if (GraphicsLayer* contentsClippingMaskLayer = graphicsLayer->contentsCl ippingMaskLayer()) |
2662 synchronizedPaintRecursively(contentsClippingMaskLayer); | 2662 synchronizedPaintRecursively(contentsClippingMaskLayer); |
2663 if (GraphicsLayer* replicaLayer = graphicsLayer->replicaLayer()) | 2663 if (GraphicsLayer* replicaLayer = graphicsLayer->replicaLayer()) |
2664 synchronizedPaintRecursively(replicaLayer); | 2664 synchronizedPaintRecursively(replicaLayer); |
2665 } | 2665 } |
(...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4281 } | 4281 } |
4282 | 4282 |
4283 bool FrameView::canThrottleRendering() const | 4283 bool FrameView::canThrottleRendering() const |
4284 { | 4284 { |
4285 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) | 4285 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) |
4286 return false; | 4286 return false; |
4287 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); | 4287 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); |
4288 } | 4288 } |
4289 | 4289 |
4290 } // namespace blink | 4290 } // namespace blink |
OLD | NEW |