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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

Issue 2196583002: Paint local background colors onto foreground layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename PaintLayer::shouldPaintBackgroundOntoForeground to PaintLayer::shouldPaintBackgroundOntoScro… Created 4 years, 4 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/paint/PaintLayerPainter.h" 5 #include "core/paint/PaintLayerPainter.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/Settings.h" 8 #include "core/frame/Settings.h"
9 #include "core/layout/LayoutBlock.h" 9 #include "core/layout/LayoutBlock.h"
10 #include "core/layout/LayoutView.h" 10 #include "core/layout/LayoutView.h"
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 ASSERT(objectPaintProperties && objectPaintProperties->localBorderBo xProperties()); 374 ASSERT(objectPaintProperties && objectPaintProperties->localBorderBo xProperties());
375 PaintChunkProperties properties(context.getPaintController().current PaintChunkProperties()); 375 PaintChunkProperties properties(context.getPaintController().current PaintChunkProperties());
376 auto& localBorderBoxProperties = *objectPaintProperties->localBorder BoxProperties(); 376 auto& localBorderBoxProperties = *objectPaintProperties->localBorder BoxProperties();
377 properties.transform = localBorderBoxProperties.propertyTreeState.tr ansform; 377 properties.transform = localBorderBoxProperties.propertyTreeState.tr ansform;
378 properties.clip = localBorderBoxProperties.propertyTreeState.clip; 378 properties.clip = localBorderBoxProperties.propertyTreeState.clip;
379 properties.effect = localBorderBoxProperties.propertyTreeState.effec t; 379 properties.effect = localBorderBoxProperties.propertyTreeState.effec t;
380 properties.backfaceHidden = m_paintLayer.layoutObject()->hasHiddenBa ckface(); 380 properties.backfaceHidden = m_paintLayer.layoutObject()->hasHiddenBa ckface();
381 scopedPaintChunkProperties.emplace(context.getPaintController(), m_p aintLayer, properties); 381 scopedPaintChunkProperties.emplace(context.getPaintController(), m_p aintLayer, properties);
382 } 382 }
383 383
384 bool shouldPaintBackground = isPaintingCompositedBackground && shouldPai ntContent && !selectionOnly; 384 bool isPaintingRootLayer = (&m_paintLayer) == paintingInfo.rootLayer;
385 bool shouldPaintBackground = shouldPaintContent && !selectionOnly
386 && (isPaintingCompositedBackground || (isPaintingRootLayer && !(pain tFlags & PaintLayerPaintingSkipRootBackground)));
chrishtr 2016/08/05 00:40:08 Do you need isPaintingCompositedBackground now?
flackr 2016/08/08 18:01:30 Yes, we still need to call paintBackgroundForFragm
385 bool shouldPaintNegZOrderList = (isPaintingScrollingContent && isPaintin gOverflowContents) || (!isPaintingScrollingContent && isPaintingCompositedBackgr ound); 387 bool shouldPaintNegZOrderList = (isPaintingScrollingContent && isPaintin gOverflowContents) || (!isPaintingScrollingContent && isPaintingCompositedBackgr ound);
386 bool shouldPaintOwnContents = isPaintingCompositedForeground && shouldPa intContent; 388 bool shouldPaintOwnContents = isPaintingCompositedForeground && shouldPa intContent;
387 bool shouldPaintNormalFlowAndPosZOrderLists = isPaintingCompositedForegr ound; 389 bool shouldPaintNormalFlowAndPosZOrderLists = isPaintingCompositedForegr ound;
388 bool shouldPaintOverlayScrollbars = isPaintingOverlayScrollbars; 390 bool shouldPaintOverlayScrollbars = isPaintingOverlayScrollbars;
389 391
390 if (shouldPaintBackground) { 392 if (shouldPaintBackground) {
391 paintBackgroundForFragments(layerFragments, context, paintingInfo.pa intDirtyRect, 393 paintBackgroundForFragments(layerFragments, context, paintingInfo.pa intDirtyRect,
392 localPaintingInfo, paintFlags); 394 localPaintingInfo, paintFlags);
393 } 395 }
394 396
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 if (!m_paintLayer.containsDirtyOverlayScrollbars()) 811 if (!m_paintLayer.containsDirtyOverlayScrollbars())
810 return; 812 return;
811 813
812 PaintLayerPaintingInfo paintingInfo(&m_paintLayer, LayoutRect(enclosingIntRe ct(damageRect)), paintFlags, LayoutSize()); 814 PaintLayerPaintingInfo paintingInfo(&m_paintLayer, LayoutRect(enclosingIntRe ct(damageRect)), paintFlags, LayoutSize());
813 paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars); 815 paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars);
814 816
815 m_paintLayer.setContainsDirtyOverlayScrollbars(false); 817 m_paintLayer.setContainsDirtyOverlayScrollbars(false);
816 } 818 }
817 819
818 } // namespace blink 820 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698