Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: Source/core/frame/FrameView.cpp

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix unit test failures Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 45e333d40163e98382cb41ec151153ddfe6c8ff5..349a798bc723391e4fbb7ba380e8a0961b88921d 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -66,7 +66,6 @@
#include "core/rendering/RenderScrollbarPart.h"
#include "core/rendering/RenderTheme.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
#include "core/rendering/TextAutosizer.h"
#include "core/rendering/compositing/CompositedLayerMapping.h"
#include "core/rendering/compositing/CompositedSelectionBound.h"
@@ -1040,19 +1039,19 @@ RenderBox* FrameView::embeddedContentBox() const
}
-void FrameView::addWidget(RenderWidget* object)
+void FrameView::addWidget(RenderPart* object)
{
m_widgets.add(object);
}
-void FrameView::removeWidget(RenderWidget* object)
+void FrameView::removeWidget(RenderPart* object)
{
m_widgets.remove(object);
}
void FrameView::updateWidgetPositions()
{
- WillBeHeapVector<RefPtrWillBeMember<RenderWidget> > widgets;
+ WillBeHeapVector<RefPtrWillBeMember<RenderPart> > widgets;
copyToVector(m_widgets, widgets);
// Script or plugins could detach the frame so abort processing if that happens.

Powered by Google App Engine
This is Rietveld 408576698