Turn FrameView's paintBehavior into a real global

Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 67 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 namespace {
 
 struct ScopedFramePaintingState {
     ScopedFramePaintingState(LocalFrame* frame, Node* node)
         : frame(frame)
         , node(node)
-        , paintBehavior(frame->view()->paintBehavior())
     {
         ASSERT(!node || node->layoutObject());
         if (node)
             node->layoutObject()->updateDragState(true);
     }
 
     ~ScopedFramePaintingState()
     {
         if (node && node->layoutObject())
             node->layoutObject()->updateDragState(false);
-        frame->view()->setPaintBehavior(paintBehavior);
         frame->view()->setNodeToDraw(0);
+        // We reset the global paint flags as this is the end
+        // of the paint phase. TODO(jchaffraix): We shouldn't
+        // need this code. See the comment above GlobalPaintFlags.
+        gGlobalPaintFlags = GlobalPaintNormalPhase;
     }
 
     LocalFrame* frame;
     Node* node;
-    PaintBehavior paintBehavior;
 };
 
 inline float parentPageZoomFactor(LocalFrame* frame)
 {
     Frame* parent = frame->tree().parent();
     if (!parent || !parent->isLocalFrame())
         return 1;
     return toLocalFrame(parent)->pageZoomFactor();
 }
 
@@ skipping 505 matching lines @@
 
 PassOwnPtr<DragImage> LocalFrame::nodeImage(Node& node)
 {
     if (!node.layoutObject())
         return nullptr;
 
     const ScopedFramePaintingState state(this, &node);
 
     m_view->updateAllLifecyclePhases();
 
-    m_view->setPaintBehavior(state.paintBehavior | PaintBehaviorFlattenCompositingLayers);
+    gGlobalPaintFlags = GlobalPaintFlattenCompositingLayers;
 
     m_view->setNodeToDraw(&node); // Enable special sub-tree drawing mode.
 
     // Document::updateLayout may have blown away the original LayoutObject.
     LayoutObject* layoutObject = node.layoutObject();
     if (!layoutObject)
         return nullptr;
 
     IntRect rect;
 
     return paintIntoDragImage(*layoutObject, DisplayItem::ClipNodeImage, layoutObject->shouldRespectImageOrientation(),
         layoutObject->paintingRootRect(rect));
 }
 
 PassOwnPtr<DragImage> LocalFrame::dragImageForSelection()
 {
     if (!selection().isRange())
         return nullptr;
 
     const ScopedFramePaintingState state(this, 0);
-    m_view->setPaintBehavior(PaintBehaviorSelectionOnly | PaintBehaviorFlattenCompositingLayers);
+    gGlobalPaintFlags = GlobalPaintSelectionOnly | GlobalPaintFlattenCompositingLayers;
     m_view->updateAllLifecyclePhases();
 
     return paintIntoDragImage(*this, DisplayItem::ClipSelectionImage, DoNotRespectImageOrientation, enclosingIntRect(selection().bounds()));
 }
 
 String LocalFrame::selectedText() const
 {
     return selection().selectedText();
 }
 
@@ skipping 181 matching lines @@
 {
     if (isLocalRoot())
         m_instrumentingAgents = InstrumentingAgents::create();
     else
         m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
 
 } // namespace blink