Chromium Code Reviews| Index: Source/core/frame/FrameView.h |
| diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h |
| index 5be2f8da53597fa90e5891d2e2daf9826639ab5d..90c8e5d5bb9f141089552fa5942f63c9ffe7fd80 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,8 +195,8 @@ public: |
| 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
Julien - ping for review
2014/10/07 17:53:22
Some of the other functions were updated with s/Wi
Zeeshan Qureshi
2014/10/10 19:32:38
After going through the methods, I've updated the
|
| void addWidgetToUpdate(RenderEmbeddedObject&); |
| @@ -352,7 +352,7 @@ private: |
| virtual void frameRectsChanged() OVERRIDE; |
| virtual bool isFrameView() const OVERRIDE { return true; } |
| - friend class RenderWidget; |
| + friend class RenderPart; |
| bool contentsInCompositedLayer() const; |
| @@ -431,7 +431,7 @@ private: |
| 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 els
Zeeshan Qureshi
2014/10/10 19:32:38
Done. Also for RenderEmbeddeObject as it's a subcl
|
| // Oilpan: the use of a persistent back reference 'emulates' the |
| // RefPtr-cycle that is kept between the two objects non-Oilpan. |