| Index: Source/core/html/HTMLFrameOwnerElement.cpp
|
| diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp
|
| index 64f220f08f22c2f562b3f91681841593f15d4ba8..16dd7774927464a0256a107f9a2c09cc89b10a80 100644
|
| --- a/Source/core/html/HTMLFrameOwnerElement.cpp
|
| +++ b/Source/core/html/HTMLFrameOwnerElement.cpp
|
| @@ -29,11 +29,11 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/layout/Layer.h"
|
| +#include "core/layout/LayoutPart.h"
|
| #include "core/layout/compositing/LayerCompositor.h"
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/loader/FrameLoaderClient.h"
|
| #include "core/plugins/PluginView.h"
|
| -#include "core/rendering/RenderPart.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
|
|
| namespace blink {
|
| @@ -111,13 +111,13 @@ HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Docum
|
| {
|
| }
|
|
|
| -RenderPart* HTMLFrameOwnerElement::renderPart() const
|
| +LayoutPart* HTMLFrameOwnerElement::layoutPart() const
|
| {
|
| // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers
|
| // when using fallback content.
|
| - if (!renderer() || !renderer()->isRenderPart())
|
| + if (!renderer() || !renderer()->isLayoutPart())
|
| return nullptr;
|
| - return toRenderPart(renderer());
|
| + return toLayoutPart(renderer());
|
| }
|
|
|
| void HTMLFrameOwnerElement::setContentFrame(Frame& frame)
|
| @@ -217,20 +217,20 @@ void HTMLFrameOwnerElement::setWidget(PassRefPtrWillBeRawPtr<Widget> widget)
|
|
|
| m_widget = widget;
|
|
|
| - RenderPart* renderPart = toRenderPart(renderer());
|
| - if (!renderPart)
|
| + LayoutPart* layoutPart = toLayoutPart(renderer());
|
| + if (!layoutPart)
|
| return;
|
|
|
| if (m_widget) {
|
| - renderPart->updateOnWidgetChange();
|
| + layoutPart->updateOnWidgetChange();
|
|
|
| - ASSERT(document().view() == renderPart->frameView());
|
| - ASSERT(renderPart->frameView());
|
| - moveWidgetToParentSoon(m_widget.get(), renderPart->frameView());
|
| + ASSERT(document().view() == layoutPart->frameView());
|
| + ASSERT(layoutPart->frameView());
|
| + moveWidgetToParentSoon(m_widget.get(), layoutPart->frameView());
|
| }
|
|
|
| if (AXObjectCache* cache = document().existingAXObjectCache())
|
| - cache->childrenChanged(renderPart);
|
| + cache->childrenChanged(layoutPart);
|
| }
|
|
|
| Widget* HTMLFrameOwnerElement::ownedWidget() const
|
|
|