Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/PaintInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 31 matching lines @@
 class RenderLayerModelObject;
 class RenderObject;
 class RenderRegion;
 
 typedef HashMap<OverlapTestRequestClient*, IntRect> OverlapTestRequestMap;
 
 /*
  * Paint the object and its children, clipped by (x|y|w|h).
  * (tx|ty) is the calculated position of the parent
  */
-struct PaintInfo {
+class PaintInfo {
+public:
     PaintInfo(GraphicsContext* newContext, const IntRect& newRect, PaintPhase newPhase, PaintBehavior newPaintBehavior,
         RenderObject* newPaintingRoot = 0, RenderRegion* region = 0, ListHashSet<RenderInline*>* newOutlineObjects = 0,
         OverlapTestRequestMap* overlapTestRequests = 0, const RenderLayerModelObject* newPaintContainer = 0)
-        : context(newContext)
-        , rect(newRect)
-        , phase(newPhase)
-        , paintBehavior(newPaintBehavior)
-        , paintingRoot(newPaintingRoot)
-        , renderRegion(region)
-        , outlineObjects(newOutlineObjects)
-        , overlapTestRequests(overlapTestRequests)
-        , paintContainer(newPaintContainer)
+        : m_context(newContext)
+        , m_rect(newRect)
+        , m_phase(newPhase)
+        , m_paintBehavior(newPaintBehavior)
+        , m_paintingRoot(newPaintingRoot)
+        , m_renderRegion(region)
+        , m_outlineObjects(newOutlineObjects)
+        , m_overlapTestRequests(overlapTestRequests)
+        , m_paintContainer(newPaintContainer)
     {
     }
 
     void updatePaintingRootForChildren(const RenderObject* renderer)
     {
-        if (!paintingRoot)
+        if (!m_paintingRoot)
             return;
 
         // If we're the painting root, kids draw normally, and see root of 0.
-        if (paintingRoot == renderer) {
-            paintingRoot = 0;
+        if (m_paintingRoot == renderer) {
+            m_paintingRoot = 0;
             return;
         }
     }
 
     bool shouldPaintWithinRoot(const RenderObject* renderer) const
     {
-        return !paintingRoot || paintingRoot == renderer;
+        return !m_paintingRoot || m_paintingRoot == renderer;
     }
 
-    bool forceBlackText() const { return paintBehavior & PaintBehaviorForceBlackText; }
+    bool forceBlackText() const { return m_paintBehavior & PaintBehaviorForceBlackText; }
 
-    bool skipRootBackground() const { return paintBehavior & PaintBehaviorSkipRootBackground; }
-    bool paintRootBackgroundOnly() const { return paintBehavior & PaintBehaviorRootBackgroundOnly; }
+    bool skipRootBackground() const { return m_paintBehavior & PaintBehaviorSkipRootBackground; }
+    bool paintRootBackgroundOnly() const { return m_paintBehavior & PaintBehaviorRootBackgroundOnly; }
 
     void applyTransform(const AffineTransform& localToAncestorTransform)
     {
         if (localToAncestorTransform.isIdentity())
             return;
 
-        context->concatCTM(localToAncestorTransform);
+        m_context->concatCTM(localToAncestorTransform);
 
-        if (rect == infiniteRect())
+        if (m_rect == infiniteRect())
             return;
 
-        rect = localToAncestorTransform.inverse().mapRect(rect);
+        m_rect = localToAncestorTransform.inverse().mapRect(m_rect);
     }
 
     static IntRect infiniteRect() { return IntRect(LayoutRect::infiniteRect()); }
 
-    // FIXME: Introduce setters/getters at some point. Requires a lot of changes throughout rendering/.
-    GraphicsContext* context;
-    IntRect rect;
-    PaintPhase phase;
-    PaintBehavior paintBehavior;
-    RenderObject* paintingRoot; // used to draw just one element and its visual kids
-    RenderRegion* renderRegion;
-    ListHashSet<RenderInline*>* outlineObjects; // used to list outlines that should be painted by a block with inline children
-    OverlapTestRequestMap* overlapTestRequests;
-    const RenderLayerModelObject* paintContainer; // the layer object that originates the current painting
+    GraphicsContext* getContext() { return m_context; }

[do-not-use, 2013/08/05 11:16:30]

As explained in my previous review, we don't use "get" prefix for getters. This
should be named "context()". Same comment for getters below.

+    void setContext(GraphicsContext* context) { m_context = context; }
+
+    IntRect& getRect() { return m_rect; }
+    void setRect(const IntRect& rect) { m_rect = rect; }
+
+    const PaintPhase& getPhase() const { return m_phase; }
+    void setPhase(const PaintPhase& phase) { m_phase = phase; }
+
+    RenderRegion* getRenderRegion() { return m_renderRegion; }
+    OverlapTestRequestMap* getOverlapTestRequests() { return m_overlapTestRequests; }
+    void setOverlapTestRequests(OverlapTestRequestMap* map) { m_overlapTestRequests = map; }
+
+    ListHashSet<RenderInline*>* getOutlineObjects() { return m_outlineObjects; }
+    void setOutlineObjects(ListHashSet<RenderInline*>* objects) { m_outlineObjects = objects; }
+
+    const RenderLayerModelObject* getPaintContainer() const { return m_paintContainer; }
+
+private:
+    GraphicsContext* m_context;
+    IntRect m_rect;
+    PaintPhase m_phase;
+    PaintBehavior m_paintBehavior;
+    RenderObject* m_paintingRoot; // used to draw just one element and its visual kids
+    RenderRegion* m_renderRegion;
+    ListHashSet<RenderInline*>* m_outlineObjects; // used to list outlines that should be painted by a block with inline children
+    OverlapTestRequestMap* m_overlapTestRequests;
+    const RenderLayerModelObject* m_paintContainer; // the layer object that originates the current painting
 };
 
 } // namespace WebCore
 
 #endif // PaintInfo_h