Index: third_party/WebKit/Source/core/dom/DocumentInit.cpp |
diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp |
index c75e302fb53fa52ee48faf6f25fb67338b1af2fe..0b8649257cded3a786628475555d5fbcd7b20698 100644 |
--- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp |
+++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp |
@@ -49,25 +49,16 @@ static Document* parentDocument(LocalFrame* frame) |
return &ownerElement->document(); |
} |
- |
-static Document* ownerDocument(LocalFrame* frame) |
+DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController) |
+ : DocumentInit(nullptr, url, frame, contextDocument, importsController) |
{ |
- if (!frame) |
- return 0; |
- |
- Frame* ownerFrame = frame->tree().parent(); |
- if (!ownerFrame) |
- ownerFrame = frame->loader().opener(); |
- if (!ownerFrame || !ownerFrame->isLocalFrame()) |
- return 0; |
- return toLocalFrame(ownerFrame)->document(); |
} |
-DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController) |
+DocumentInit::DocumentInit(PassRefPtrWillBeRawPtr<Document> ownerDocument, const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController) |
: m_url(url) |
, m_frame(frame) |
, m_parent(parentDocument(frame)) |
- , m_owner(ownerDocument(frame)) |
+ , m_owner(ownerDocument) |
, m_contextDocument(contextDocument) |
, m_importsController(importsController) |
, m_createNewRegistrationContext(false) |