Turn FrameView's paintBehavior into a real global

Source/core/paint/FramePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/FramePainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
@@ skipping 55 matching lines @@
     Document* document = m_frameView.frame().document();
 
 #ifndef NDEBUG
     bool fillWithRed;
     if (document->printing())
         fillWithRed = false; // Printing, don't fill with red (can't remember why).
     else if (m_frameView.frame().owner())
         fillWithRed = false; // Subframe, don't fill with red.
     else if (m_frameView.isTransparent())
         fillWithRed = false; // Transparent, don't fill with red.
-    else if (m_frameView.paintBehavior() & PaintBehaviorSelectionOnly)
+    else if (gGlobalPaintFlags & GlobalPaintSelectionOnly)
         fillWithRed = false; // Selections are transparent, don't fill with red.
     else if (m_frameView.nodeToDraw())
         fillWithRed = false; // Element images are transparent, don't fill with red.
     else
         fillWithRed = true;
 
     if (fillWithRed && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*context, *m_frameView.layoutView(), DisplayItem::DebugRedFill)) {
         IntRect contentRect(IntPoint(), m_frameView.contentsSize());
         LayoutObjectDrawingRecorder drawingRecorder(*context, *m_frameView.layoutView(), DisplayItem::DebugRedFill, contentRect);
     }
 #endif
 
     LayoutView* layoutView = m_frameView.layoutView();
     if (!layoutView) {
         WTF_LOG_ERROR("called FramePainter::paint with nil layoutObject");
         return;
     }
 
     RELEASE_ASSERT(!m_frameView.needsLayout());
     ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
     TRACE_EVENT1("devtools.timeline", "Paint", "data", InspectorPaintEvent::data(layoutView, LayoutRect(rect), 0));
 
     bool isTopLevelPainter = !s_inPaintContents;
     s_inPaintContents = true;
 
     FontCachePurgePreventer fontCachePurgePreventer;
 
-    PaintBehavior oldPaintBehavior = m_frameView.paintBehavior();
-
-    if (FrameView* parentView = m_frameView.parentFrameView()) {
-        if (parentView->paintBehavior() & PaintBehaviorFlattenCompositingLayers)
-            m_frameView.setPaintBehavior(m_frameView.paintBehavior() | PaintBehaviorFlattenCompositingLayers);
-    }
-
+    // TODO: Why is this here and done globally once per paint phase?

[leviw_travelin_and_unemployed, 2015/07/07 20:33:16]

TODO(jchaffraix) ;)

[Julien - ping for review, 2015/07/08 01:16:30]

Deal!

     if (document->printing())
-        m_frameView.setPaintBehavior(m_frameView.paintBehavior() | PaintBehaviorFlattenCompositingLayers);
+        gGlobalPaintFlags |= GlobalPaintFlattenCompositingLayers;
 
     ASSERT(!m_frameView.isPainting());
     m_frameView.setIsPainting(true);
 
     // m_frameView.nodeToDraw() is used to draw only one element (and its descendants)
     LayoutObject* layoutObject = m_frameView.nodeToDraw() ? m_frameView.nodeToDraw()->layoutObject() : 0;
     DeprecatedPaintLayer* rootLayer = layoutView->layer();
 
 #if ENABLE(ASSERT)
     layoutView->assertSubtreeIsLaidOut();
     LayoutObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->layoutObject());
 #endif
 
     DeprecatedPaintLayerPainter layerPainter(*rootLayer);
 
     float deviceScaleFactor = blink::deviceScaleFactor(rootLayer->layoutObject()->frame());
     context->setDeviceScaleFactor(deviceScaleFactor);
 
-    layerPainter.paint(context, LayoutRect(rect), m_frameView.paintBehavior(), layoutObject);
+    PaintBehavior paintBehavior = PaintBehaviorNormal;

[leviw_travelin_and_unemployed, 2015/07/07 20:33:16]

Why not just put PaintBehaviorNormal in both locations?

[Julien - ping for review, 2015/07/08 01:16:30]

Because variables are so 90's! Removed.

+    layerPainter.paint(context, LayoutRect(rect), paintBehavior, layoutObject);
 
     if (rootLayer->containsDirtyOverlayScrollbars())
-        layerPainter.paintOverlayScrollbars(context, LayoutRect(rect), m_frameView.paintBehavior(), layoutObject);
+        layerPainter.paintOverlayScrollbars(context, LayoutRect(rect), paintBehavior, layoutObject);
 
     m_frameView.setIsPainting(false);
 
-    m_frameView.setPaintBehavior(oldPaintBehavior);
     m_frameView.setLastPaintTime(currentTime());
 
     // Regions may have changed as a result of the visibility/z-index of element changing.
     if (document->annotatedRegionsDirty())
         m_frameView.updateAnnotatedRegions();
 
     if (isTopLevelPainter) {
         // Everything that happens after paintContents completions is considered
         // to be part of the next frame.
         memoryCache()->updateFramePaintTimestamp();
@@ skipping 38 matching lines @@
     if (needsBackground) {
         IntRect toFill = bar->frameRect();
         toFill.intersect(rect);
         context->fillRect(toFill, m_frameView.baseBackgroundColor());
     }
 
     bar->paint(context, rect);
 }
 
 } // namespace blink