Merge RenderWidget into single subclass, RenderPart

Source/core/rendering/RenderPart.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  * Copyright (C) 2006, 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #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();
 
     bool requiresAcceleratedCompositing() const;
 
     virtual bool needsPreferredWidthsRecalculation() const OVERRIDE FINAL;
 
     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 isWidget() const OVERRIDE FINAL { return true; }

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

Is this going to be removed? Can we file a followup bug to remove these?
(Assuming this does mean is Render Widget?)

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

Done. Since we're renaming and updating a lot more callers now, just easier to
do this here.

+
 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&);
+
+    // TODO(zeeshanq): This was previously RenderWidget::nodeAtPoint(), find a better name.

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

From the usage, it looks like nodeAtPointInternal to me, yea?

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

Done.

+    bool widgetAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);

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

Not a fan of this name as I would expect that API to return a Widget, not a
boolean. It matches nodeAtPoint so I would keep a closer name like
nodeAtPointOverWidget.

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

nodeAtPointOverWidget sounds good.

+
+#if !ENABLE(OILPAN)
+    int m_refCount;
+#endif
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderPart, isRenderPart());
 
-}
+} // namespace blink
 
-#endif
+#endif // RenderPart_h