Merge RenderWidget into single subclass, RenderPart

Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple 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 32 matching lines @@
 class Element;
 class FloatSize;
 class HTMLFrameOwnerElement;
 class LocalFrame;
 class KURL;
 class Node;
 class Page;
 class RenderBox;
 class RenderEmbeddedObject;
 class RenderObject;
+class RenderPart;
 class RenderScrollbarPart;
 class RenderView;
-class RenderWidget;
 struct CompositedSelectionBound;
 
 typedef unsigned long long DOMTimeStamp;
 
 // FIXME: Oilpan: move Widget (and thereby FrameView) to the heap.
 class FrameView FINAL : public ScrollView {
 public:
     friend class RenderView;
     friend class Internals;
 
@@ skipping 122 matching lines @@
     void restoreScrollbar();
 
     void postLayoutTimerFired(Timer<FrameView>*);
 
     bool wasScrolledByUser() const;
     void setWasScrolledByUser(bool);
 
     bool safeToPropagateScrollToParent() const { return m_safeToPropagateScrollToParent; }
     void setSafeToPropagateScrollToParent(bool isSafe) { m_safeToPropagateScrollToParent = isSafe; }
 
-    void addWidget(RenderWidget*);
-    void removeWidget(RenderWidget*);
+    void addWidget(RenderPart*);
+    void removeWidget(RenderPart*);
     void updateWidgetPositions();

[dsinclair, 2014/10/07 14:15:12]

Should we update the names of these as they aren't really dealing with widgets
anymore.

Although, I'm not sure what a better name would be?

[Julien - ping for review, 2014/10/07 17:53:22]

Some of the other functions were updated with s/Widget/Part/ and I think that
would be a good direction here too.

[Zeeshan Qureshi, 2014/10/10 19:32:38]

After going through the methods, I've updated the ones that were referencing
RenderPart but kept the ones that were referring to the widget inside
RenderPart.

 
     void addWidgetToUpdate(RenderEmbeddedObject&);
 
     virtual void paintContents(GraphicsContext*, const IntRect& damageRect) OVERRIDE;
     void setPaintBehavior(PaintBehavior);
     PaintBehavior paintBehavior() const;
     bool isPainting() const;
     bool hasEverPainted() const { return m_lastPaintTime; }
     void setNodeToDraw(Node*);
 
@@ skipping 134 matching lines @@
 
 private:
     explicit FrameView(LocalFrame*);
 
     void reset();
     void init();
 
     virtual void frameRectsChanged() OVERRIDE;
     virtual bool isFrameView() const OVERRIDE { return true; }
 
-    friend class RenderWidget;
+    friend class RenderPart;
 
     bool contentsInCompositedLayer() const;
 
     void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
     void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
 
     void updateCounters();
     void forceLayoutParentViewIfNeeded();
     void performPreLayoutTasks();
     void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
@@ skipping 58 matching lines @@
 
     static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
     static bool s_inPaintContents;
 
     LayoutSize m_size;
 
     typedef WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > EmbeddedObjectSet;
     WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > m_widgetUpdateSet;
 
     // FIXME: These are just "children" of the FrameView and should be RefPtr<Widget> instead.
-    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderWidget> > m_widgets;
+    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderPart> > m_widgets;

[dsinclair, 2014/10/07 14:15:12]

Similarily, should we rename this to something else now?

[Zeeshan Qureshi, 2014/10/10 19:32:38]

Done. Also for RenderEmbeddeObject as it's a subclass of RenderPart.

 
     // Oilpan: the use of a persistent back reference 'emulates' the
     // RefPtr-cycle that is kept between the two objects non-Oilpan.
     //
     // That cycle is broken when a LocalFrame is detached by
     // FrameLoader::detachFromParent(), it then clears its
     // FrameView's m_frame reference by calling setView(nullptr).
     RefPtrWillBePersistent<LocalFrame> m_frame;
 
     bool m_doFullPaintInvalidation;
@@ skipping 116 matching lines @@
         m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
     }
 private:
     FrameView* m_view;
     bool m_originalValue;
 };
 
 } // namespace blink
 
 #endif // FrameView_h