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

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

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove duplication in const overload Created 4 years, 7 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
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 25 matching lines...) Expand all
36 #include "platform/RuntimeEnabledFeatures.h" 36 #include "platform/RuntimeEnabledFeatures.h"
37 #include "platform/network/NetworkUtils.h" 37 #include "platform/network/NetworkUtils.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 // FIXME: Broken with OOPI. 41 // FIXME: Broken with OOPI.
42 static Document* parentDocument(LocalFrame* frame) 42 static Document* parentDocument(LocalFrame* frame)
43 { 43 {
44 if (!frame) 44 if (!frame)
45 return 0; 45 return 0;
46 Element* ownerElement = frame->deprecatedLocalOwner(); 46 Element* localOwnerElement = frame->deprecatedLocalOwner();
47 if (!ownerElement) 47 if (!localOwnerElement)
48 return 0; 48 return 0;
49 return &ownerElement->document(); 49 return &localOwnerElement->document();
50 } 50 }
51 51
52 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, Document* context Document, HTMLImportsController* importsController) 52 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, Document* context Document, HTMLImportsController* importsController)
53 : DocumentInit(nullptr, url, frame, contextDocument, importsController) 53 : DocumentInit(nullptr, url, frame, contextDocument, importsController)
54 { 54 {
55 } 55 }
56 56
57 DocumentInit::DocumentInit(Document* ownerDocument, const KURL& url, LocalFrame* frame, Document* contextDocument, HTMLImportsController* importsController) 57 DocumentInit::DocumentInit(Document* ownerDocument, const KURL& url, LocalFrame* frame, Document* contextDocument, HTMLImportsController* importsController)
58 : m_url(url) 58 : m_url(url)
59 , m_frame(frame) 59 , m_frame(frame)
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 { 179 {
180 return m_contextDocument; 180 return m_contextDocument;
181 } 181 }
182 182
183 DocumentInit DocumentInit::fromContext(Document* contextDocument, const KURL& ur l) 183 DocumentInit DocumentInit::fromContext(Document* contextDocument, const KURL& ur l)
184 { 184 {
185 return DocumentInit(url, 0, contextDocument, 0); 185 return DocumentInit(url, 0, contextDocument, 0);
186 } 186 }
187 187
188 } // namespace blink 188 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698