Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: Source/core/dom/DocumentInit.cpp

Issue 317493002: Change FrameTree to return Frames instead of LocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: dcheng's comment addressed Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 return 0; 47 return 0;
48 return &ownerElement->document(); 48 return &ownerElement->document();
49 } 49 }
50 50
51 51
52 static Document* ownerDocument(LocalFrame* frame) 52 static Document* ownerDocument(LocalFrame* frame)
53 { 53 {
54 if (!frame) 54 if (!frame)
55 return 0; 55 return 0;
56 56
57 LocalFrame* ownerFrame = frame->tree().parent(); 57 Frame* ownerFrame = frame->tree().parent();
58 if (!ownerFrame) 58 if (!ownerFrame)
59 ownerFrame = frame->loader().opener(); 59 ownerFrame = frame->loader().opener();
60 if (!ownerFrame) 60 if (!ownerFrame || !ownerFrame->isLocalFrame())
61 return 0; 61 return 0;
62 return ownerFrame->document(); 62 return toLocalFrame(ownerFrame)->document();
63 } 63 }
64 64
65 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawP tr<Document> contextDocument, HTMLImportsController* importsController) 65 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawP tr<Document> contextDocument, HTMLImportsController* importsController)
66 : m_url(url) 66 : m_url(url)
67 , m_frame(frame) 67 , m_frame(frame)
68 , m_parent(parentDocument(frame)) 68 , m_parent(parentDocument(frame))
69 , m_owner(ownerDocument(frame)) 69 , m_owner(ownerDocument(frame))
70 , m_contextDocument(contextDocument) 70 , m_contextDocument(contextDocument)
71 , m_importsController(importsController) 71 , m_importsController(importsController)
72 , m_createNewRegistrationContext(false) 72 , m_createNewRegistrationContext(false)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return m_contextDocument; 156 return m_contextDocument;
157 } 157 }
158 158
159 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url) 159 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)
160 { 160 {
161 return DocumentInit(url, 0, contextDocument, 0); 161 return DocumentInit(url, 0, contextDocument, 0);
162 } 162 }
163 163
164 } // namespace WebCore 164 } // namespace WebCore
165 165
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/FullscreenElementStack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698