Chromium Code Reviews| Index: Source/web/WebLocalFrameImpl.cpp |
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp |
| index 1aa35a2156319a3f7e0ebbef0c86e1bc28a1b05a..53674c1838260cb54269187d0ec2abe8967eb122 100644 |
| --- a/Source/web/WebLocalFrameImpl.cpp |
| +++ b/Source/web/WebLocalFrameImpl.cpp |
| @@ -1585,11 +1585,6 @@ WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const |
| // WebLocalFrameImpl public --------------------------------------------------------- |
| -WebLocalFrame* WebLocalFrame::create(WebFrameClient* client) |
| -{ |
| - return WebLocalFrame::create(WebTreeScopeType::Document, client); |
| -} |
| - |
| WebLocalFrame* WebLocalFrame::create(WebTreeScopeType scope, WebFrameClient* client) |
| { |
| return WebLocalFrameImpl::create(scope, client); |
| @@ -1691,7 +1686,10 @@ PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra |
| const AtomicString& name, HTMLFrameOwnerElement* ownerElement) |
| { |
| ASSERT(m_client); |
| - WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChildFrame(this, name, static_cast<WebSandboxFlags>(ownerElement->sandboxFlags()))); |
| + WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
|
dcheng
2015/05/21 22:50:10
This is probably the most significant change in th
|
| + ? WebTreeScopeType::Document |
| + : WebTreeScopeType::Shadow; |
| + WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChildFrame(this, scope, name, static_cast<WebSandboxFlags>(ownerElement->sandboxFlags()))); |
| if (!webframeChild) |
| return nullptr; |