Merge RenderWidget into single subclass, RenderPart

Source/core/rendering/RenderPart.h

Index: Source/core/rendering/RenderPart.h
diff --git a/Source/core/rendering/RenderPart.h b/Source/core/rendering/RenderPart.h
index ef2d56fe11dbe0ae2f6136d227789c9d3339570c..bb600bbb2520028ad6552f5665c266f9cd4e4266 100644
--- a/Source/core/rendering/RenderPart.h
+++ b/Source/core/rendering/RenderPart.h
@@ -23,12 +23,13 @@
 #ifndef RenderPart_h
 #define RenderPart_h
 
-#include "core/rendering/RenderWidget.h"
+#include "core/rendering/RenderReplaced.h"
+#include "platform/Widget.h"
 
 namespace blink {
 
 // Renderer for frames via RenderFrame and RenderIFrame, and plug-ins via RenderEmbeddedObject.
-class RenderPart : public RenderWidget {
+class RenderPart : public RenderReplaced {
 public:
     explicit RenderPart(Element*);
     virtual ~RenderPart();
@@ -39,18 +40,48 @@ public:
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 
+#if !ENABLE(OILPAN)
+    void ref() { ++m_refCount; }
+    void deref();
+#endif
+
+    Widget* widget() const;
+
+    void updateOnWidgetChange();
+    void updateWidgetPosition();
+    void widgetPositionsUpdated();
+    bool updateWidgetGeometry();
+
+    virtual bool isRenderPart() const override final { return true; }
+
 protected:
     virtual LayerType layerTypeRequired() const override;
 
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
+    virtual void layout() override;
+    virtual void paint(PaintInfo&, const LayoutPoint&) override;
+    virtual void paintContents(PaintInfo&, const LayoutPoint&);
+    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override final;
+
 private:
-    virtual bool isRenderPart() const override final { return true; }
     virtual const char* renderName() const override { return "RenderPart"; }
 
     virtual CompositingReasons additionalCompositingReasons() const override;
+
+    virtual void willBeDestroyed() override final;
+    virtual void destroy() override final;
+
+    bool setWidgetGeometry(const LayoutRect&);
+
+    bool nodeAtPointOverWidget(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
+
+#if !ENABLE(OILPAN)
+    int m_refCount;
+#endif
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderPart, isRenderPart());
 
-}
+} // namespace blink
 
-#endif
+#endif // RenderPart_h