Index: Source/core/html/HTMLFrameOwnerElement.cpp |
diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp |
index aaa73ff224c80348e007abd59ae74f8b905a0a51..7f8ddc96b37fe26dae88d0c44e74a449693216da 100644 |
--- a/Source/core/html/HTMLFrameOwnerElement.cpp |
+++ b/Source/core/html/HTMLFrameOwnerElement.cpp |
@@ -23,6 +23,7 @@ |
#include "bindings/v8/ExceptionMessages.h" |
#include "bindings/v8/ExceptionState.h" |
+#include "core/accessibility/AXObjectCache.h" |
#include "core/dom/ExceptionCode.h" |
#include "core/loader/FrameLoader.h" |
#include "core/loader/FrameLoaderClient.h" |
@@ -35,6 +36,54 @@ |
namespace WebCore { |
+typedef HashMap<RefPtr<Widget>, FrameView*> WidgetToParentMap; |
+static WidgetToParentMap& widgetNewParentMap() |
+{ |
+ DEFINE_STATIC_LOCAL(WidgetToParentMap, map, ()); |
+ return map; |
+} |
+ |
+static unsigned s_updateSuspendCount = 0; |
+ |
+HTMLFrameOwnerElement::UpdateSuspendScope::UpdateSuspendScope() |
+{ |
+ ++s_updateSuspendCount; |
+} |
+ |
+HTMLFrameOwnerElement::UpdateSuspendScope::~UpdateSuspendScope() |
+{ |
+ ASSERT(s_updateSuspendCount > 0); |
+ if (s_updateSuspendCount == 1) { |
+ WidgetToParentMap map; |
eseidel
2013/12/18 18:38:18
nit: I might have pushed this block into a helper
wjmaclean
2013/12/23 23:49:53
Done.
|
+ widgetNewParentMap().swap(map); |
+ WidgetToParentMap::iterator end = map.end(); |
+ for (WidgetToParentMap::iterator it = map.begin(); it != end; ++it) { |
+ Widget* child = it->key.get(); |
+ ScrollView* currentParent = toScrollView(child->parent()); |
+ FrameView* newParent = it->value; |
+ if (newParent != currentParent) { |
+ if (currentParent) |
+ currentParent->removeChild(child); |
+ if (newParent) |
+ newParent->addChild(child); |
+ } |
+ } |
+ } |
+ --s_updateSuspendCount; |
+} |
+ |
+static void moveWidgetToParentSoon(Widget* child, FrameView* parent) |
+{ |
+ if (!s_updateSuspendCount) { |
+ if (parent) |
+ parent->addChild(child); |
+ else if (toScrollView(child->parent())) |
+ toScrollView(child->parent())->removeChild(child); |
+ return; |
+ } |
+ widgetNewParentMap().set(child, parent); |
+} |
+ |
HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Document& document) |
: HTMLElement(tagName, document) |
, m_contentFrame(0) |
@@ -121,6 +170,43 @@ SVGDocument* HTMLFrameOwnerElement::getSVGDocument(ExceptionState& exceptionStat |
return 0; |
} |
+void HTMLFrameOwnerElement::setWidget(PassRefPtr<Widget> widget) |
+{ |
+ if (widget == m_widget) |
+ return; |
+ |
+ if (m_widget) { |
+ if (m_widget->parent()) |
+ moveWidgetToParentSoon(m_widget.get(), 0); |
+ m_widget = 0; |
+ } |
+ |
+ m_widget = widget; |
+ |
+ RenderWidget* renderWidget = toRenderWidget(renderer()); |
+ if (!renderWidget) |
+ return; |
+ |
+ if (m_widget) { |
+ renderWidget->updateOnWidgetChange(); |
+ |
+ ASSERT(document().view() == renderWidget->frameView()); |
+ ASSERT(renderWidget->frameView()); |
+ moveWidgetToParentSoon(m_widget.get(), renderWidget->frameView()); |
+ } |
+ |
+ if (AXObjectCache* cache = document().existingAXObjectCache()) |
+ cache->childrenChanged(renderWidget); |
+ |
+ if (RenderPart* renderPart = toRenderPart(renderWidget)) |
+ renderPart->viewCleared(); |
+} |
+ |
+Widget* HTMLFrameOwnerElement::widget() const |
+{ |
+ return m_widget.get(); |
+} |
+ |
bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const AtomicString& frameName, bool lockBackForwardList) |
{ |
RefPtr<Frame> parentFrame = document().frame(); |
@@ -138,6 +224,7 @@ bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic |
return false; |
String referrer = SecurityPolicy::generateReferrerHeader(document().referrerPolicy(), url, document().outgoingReferrer()); |
+ |
RefPtr<Frame> childFrame = parentFrame->loader().client()->createFrame(url, frameName, referrer, this); |
if (!childFrame) { |
@@ -153,10 +240,12 @@ bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic |
// FIXME: Can we remove this entirely? m_isComplete normally gets set to false when a load is committed. |
childFrame->loader().started(); |
- RenderObject* renderObject = renderer(); |
FrameView* view = childFrame->view(); |
+ RenderObject* renderObject = renderer(); |
+ // We need to test the existence of renderObject and its widget-ness, as |
+ // failing to do so causes problems. |
if (renderObject && renderObject->isWidget() && view) |
- toRenderWidget(renderObject)->setWidget(view); |
+ setWidget(view); |
// Some loads are performed synchronously (e.g., about:blank and loads |
// cancelled by returning a null ResourceRequest from requestFromDelegate). |