Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderPart.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderPart.cpp b/src/third_party/WebKit/Source/core/rendering/RenderPart.cpp
index 27c8516..5609bbe 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderPart.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderPart.cpp
@@ -46,15 +46,6 @@ RenderPart::RenderPart(Element* node)
 
 RenderPart::~RenderPart()
 {
-    clearWidget();
-}
-
-void RenderPart::setWidget(PassRefPtr<Widget> widget)
-{
-    if (widget == this->widget())
-        return;
-
-    RenderWidget::setWidget(widget);
 }
 
 LayerType RenderPart::layerTypeRequired() const
@@ -97,18 +88,15 @@ bool RenderPart::needsPreferredWidthsRecalculation() const
     return embeddedContentBox();
 }
 
-RenderBox* RenderPart::embeddedContentBox() const
-{
-    if (!node() || !widget() || !widget()->isFrameView())
-        return 0;
-    return toFrameView(widget())->embeddedContentBox();
-}
-
 bool RenderPart::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
 {
     if (!widget() || !widget()->isFrameView() || !request.allowsChildFrameContent())
         return RenderWidget::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, action);
 
+    // FIXME: Until RemoteFrames use RemoteFrameViews, we need an explicit check here.
+    if (toFrameView(widget())->frame().isRemoteFrameTemporary())
+        return RenderWidget::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, action);
+
     FrameView* childFrameView = toFrameView(widget());
     RenderView* childRoot = childFrameView->renderView();