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

Side by Side Diff: sky/engine/core/dom/DocumentInit.cpp

Issue 841873006: All documents should have a RegistrationContext. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/dom/DocumentInit.h ('k') | sky/engine/core/loader/MojoLoader.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 23 matching lines...) Expand all
34 #include "sky/engine/core/frame/LocalFrame.h" 34 #include "sky/engine/core/frame/LocalFrame.h"
35 #include "sky/engine/core/html/imports/HTMLImportsController.h" 35 #include "sky/engine/core/html/imports/HTMLImportsController.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtr<Document> contextDocument, HTMLImportsController* importsController) 39 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtr<Document> contextDocument, HTMLImportsController* importsController)
40 : m_url(url) 40 : m_url(url)
41 , m_frame(frame) 41 , m_frame(frame)
42 , m_contextDocument(contextDocument) 42 , m_contextDocument(contextDocument)
43 , m_importsController(importsController) 43 , m_importsController(importsController)
44 , m_createNewRegistrationContext(false)
45 { 44 {
46 } 45 }
47 46
48 DocumentInit::DocumentInit(const DocumentInit& other) 47 DocumentInit::DocumentInit(const DocumentInit& other)
49 : m_url(other.m_url) 48 : m_url(other.m_url)
50 , m_frame(other.m_frame) 49 , m_frame(other.m_frame)
51 , m_contextDocument(other.m_contextDocument) 50 , m_contextDocument(other.m_contextDocument)
52 , m_importsController(other.m_importsController) 51 , m_importsController(other.m_importsController)
53 , m_registrationContext(other.m_registrationContext) 52 , m_registrationContext(other.m_registrationContext)
54 , m_createNewRegistrationContext(other.m_createNewRegistrationContext)
55 { 53 {
56 } 54 }
57 55
58 DocumentInit::~DocumentInit() 56 DocumentInit::~DocumentInit()
59 { 57 {
60 } 58 }
61 59
62 bool DocumentInit::shouldSetURL() const 60 bool DocumentInit::shouldSetURL() const
63 { 61 {
64 return !m_url.isEmpty(); 62 return !m_url.isEmpty();
65 } 63 }
66 64
67 LocalFrame* DocumentInit::frameForSecurityContext() const 65 LocalFrame* DocumentInit::frameForSecurityContext() const
68 { 66 {
69 if (m_frame) 67 if (m_frame)
70 return m_frame; 68 return m_frame;
71 if (m_importsController) 69 if (m_importsController)
72 return m_importsController->master()->frame(); 70 return m_importsController->master()->frame();
73 return 0; 71 return 0;
74 } 72 }
75 73
76 Settings* DocumentInit::settings() const 74 Settings* DocumentInit::settings() const
77 { 75 {
78 ASSERT(frameForSecurityContext()); 76 ASSERT(frameForSecurityContext());
79 return frameForSecurityContext()->settings(); 77 return frameForSecurityContext()->settings();
80 } 78 }
81 79
82 DocumentInit& DocumentInit::withRegistrationContext(CustomElementRegistrationCon text* registrationContext) 80 DocumentInit& DocumentInit::withRegistrationContext(CustomElementRegistrationCon text& registrationContext)
83 { 81 {
84 ASSERT(!m_createNewRegistrationContext && !m_registrationContext); 82 ASSERT(!m_registrationContext);
85 m_registrationContext = registrationContext; 83 m_registrationContext = &registrationContext;
86 return *this; 84 return *this;
87 } 85 }
88 86
89 DocumentInit& DocumentInit::withNewRegistrationContext() 87 PassRefPtr<CustomElementRegistrationContext> DocumentInit::registrationContext() const
90 { 88 {
91 ASSERT(!m_createNewRegistrationContext && !m_registrationContext);
92 m_createNewRegistrationContext = true;
93 return *this;
94 }
95
96 PassRefPtr<CustomElementRegistrationContext> DocumentInit::registrationContext(D ocument* document) const
97 {
98 if (m_createNewRegistrationContext)
99 return CustomElementRegistrationContext::create();
100
101 return m_registrationContext.get(); 89 return m_registrationContext.get();
102 } 90 }
103 91
104 WeakPtr<Document> DocumentInit::contextDocument() const 92 WeakPtr<Document> DocumentInit::contextDocument() const
105 { 93 {
106 return m_contextDocument; 94 return m_contextDocument;
107 } 95 }
108 96
109 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url) 97 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url)
110 { 98 {
111 return DocumentInit(url, 0, contextDocument, 0); 99 return DocumentInit(url, 0, contextDocument, 0);
112 } 100 }
113 101
114 } // namespace blink 102 } // namespace blink
115 103
OLDNEW
« no previous file with comments | « sky/engine/core/dom/DocumentInit.h ('k') | sky/engine/core/loader/MojoLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698