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

Unified Diff: Source/core/paint/DeprecatedPaintLayerPainter.cpp

Issue 1224893004: Turn FrameView's paintBehavior into a real global (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Improved change after the reviews. Still fails on Android. Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/core/paint/FramePainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/DeprecatedPaintLayerPainter.cpp
diff --git a/Source/core/paint/DeprecatedPaintLayerPainter.cpp b/Source/core/paint/DeprecatedPaintLayerPainter.cpp
index 7f4952ccb966adc95860644001972f0e3e07e7fc..dcf0db310a079c2b0053dff4f89cc7566c10c4ea 100644
--- a/Source/core/paint/DeprecatedPaintLayerPainter.cpp
+++ b/Source/core/paint/DeprecatedPaintLayerPainter.cpp
@@ -60,8 +60,8 @@ void DeprecatedPaintLayerPainter::paintLayer(GraphicsContext* context, const Dep
DisableCompositingQueryAsserts disabler;
if (m_paintLayer.compositingState() != NotComposited) {
- if (paintingInfo.paintBehavior & PaintBehaviorFlattenCompositingLayers) {
- // FIXME: ok, but what about PaintBehaviorFlattenCompositingLayers? That's for printing.
+ if (gGlobalPaintFlags & GlobalPaintFlattenCompositingLayers) {
+ // FIXME: ok, but what about GlobalPaintFlattenCompositingLayers? That's for printing and drag image.
// FIXME: why isn't the code here global, as opposed to being set on each paintLayer() call?
paintFlags |= PaintLayerUncachedClipRects;
}
@@ -242,7 +242,7 @@ void DeprecatedPaintLayerPainter::paintLayerContents(GraphicsContext* context, c
shouldPaintContent = atLeastOneFragmentIntersectsDamageRect(layerFragments, localPaintingInfo, paintFlags, offsetFromRoot);
}
- bool selectionOnly = localPaintingInfo.paintBehavior & PaintBehaviorSelectionOnly;
+ bool selectionOnly = gGlobalPaintFlags & GlobalPaintSelectionOnly;
// If this layer's layoutObject is a child of the paintingRoot, we paint unconditionally, which
// is done by passing a nil paintingRoot down to our layoutObject (as if no paintingRoot was ever set).
// Else, our layout tree may or may not contain the painting root, so we pass that root along
@@ -454,7 +454,7 @@ bool DeprecatedPaintLayerPainter::shouldPaintLayerInSoftwareMode(const Deprecate
DisableCompositingQueryAsserts disabler;
return m_paintLayer.compositingState() == NotComposited
- || (paintingInfo.paintBehavior & PaintBehaviorFlattenCompositingLayers)
+ || gGlobalPaintFlags & GlobalPaintFlattenCompositingLayers
|| ((paintFlags & PaintLayerPaintingReflection) && !m_paintLayer.has3DTransform())
|| paintForFixedRootBackground(&m_paintLayer, paintFlags);
}
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayer.cpp ('k') | Source/core/paint/FramePainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698