Merge RenderWidget into single subclass, RenderPart

Source/core/frame/FrameView.h

Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index f3488f75d79d43e26f9854532e42ac37ef0739d1..98fdd9966e55b8136de8c768dca34964b49fa532 100644
--- a/Source/core/frame/FrameView.h
+++ b/Source/core/frame/FrameView.h
@@ -50,9 +50,9 @@ class Page;
 class RenderBox;
 class RenderEmbeddedObject;
 class RenderObject;
+class RenderPart;
 class RenderScrollbarPart;
 class RenderView;
-class RenderWidget;
 struct CompositedSelectionBound;
 
 typedef unsigned long long DOMTimeStamp;
@@ -195,11 +195,12 @@ public:
     bool safeToPropagateScrollToParent() const { return m_safeToPropagateScrollToParent; }
     void setSafeToPropagateScrollToParent(bool isSafe) { m_safeToPropagateScrollToParent = isSafe; }
 
-    void addWidget(RenderWidget*);
-    void removeWidget(RenderWidget*);
+    void addPart(RenderPart*);
+    void removePart(RenderPart*);
+
     void updateWidgetPositions();
 
-    void addWidgetToUpdate(RenderEmbeddedObject&);
+    void addPartToUpdate(RenderEmbeddedObject&);
 
     virtual void paintContents(GraphicsContext*, const IntRect& damageRect) override;
     void setPaintBehavior(PaintBehavior);
@@ -352,7 +353,7 @@ private:
     virtual void frameRectsChanged() override;
     virtual bool isFrameView() const override { return true; }
 
-    friend class RenderWidget;
+    friend class RenderPart;
 
     bool contentsInCompositedLayer() const;
 
@@ -428,10 +429,10 @@ private:
     LayoutSize m_size;
 
     typedef WillBeHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > EmbeddedObjectSet;
-    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > m_widgetUpdateSet;
+    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderEmbeddedObject> > m_partUpdateSet;
 
     // FIXME: These are just "children" of the FrameView and should be RefPtr<Widget> instead.
-    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderWidget> > m_widgets;
+    WillBePersistentHeapHashSet<RefPtrWillBeMember<RenderPart> > m_parts;
 
     // Oilpan: the use of a persistent back reference 'emulates' the
     // RefPtr-cycle that is kept between the two objects non-Oilpan.