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

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

Issue 946083003: Rename Sky's custom2 to custom (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/dom/Element.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 12 matching lines...) Expand all
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 * 25 *
26 */ 26 */
27 27
28 #include "sky/engine/config.h" 28 #include "sky/engine/config.h"
29 #include "sky/engine/core/dom/DocumentInit.h" 29 #include "sky/engine/core/dom/DocumentInit.h"
30 30
31 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 31 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
32 #include "sky/engine/core/dom/Document.h" 32 #include "sky/engine/core/dom/Document.h"
33 #include "sky/engine/core/dom/custom2/new_custom_element_registry.h" 33 #include "sky/engine/core/dom/custom/custom_element_registry.h"
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)
(...skipping 26 matching lines...) Expand all
70 return m_importsController->master()->frame(); 70 return m_importsController->master()->frame();
71 return 0; 71 return 0;
72 } 72 }
73 73
74 Settings* DocumentInit::settings() const 74 Settings* DocumentInit::settings() const
75 { 75 {
76 ASSERT(frameForSecurityContext()); 76 ASSERT(frameForSecurityContext());
77 return frameForSecurityContext()->settings(); 77 return frameForSecurityContext()->settings();
78 } 78 }
79 79
80 DocumentInit& DocumentInit::withElementRegistry(NewCustomElementRegistry& elemen tregistry) 80 DocumentInit& DocumentInit::withElementRegistry(CustomElementRegistry& elementre gistry)
81 { 81 {
82 ASSERT(!m_elementRegistry); 82 ASSERT(!m_elementRegistry);
83 m_elementRegistry = &elementregistry; 83 m_elementRegistry = &elementregistry;
84 return *this; 84 return *this;
85 } 85 }
86 86
87 WeakPtr<Document> DocumentInit::contextDocument() const 87 WeakPtr<Document> DocumentInit::contextDocument() const
88 { 88 {
89 return m_contextDocument; 89 return m_contextDocument;
90 } 90 }
91 91
92 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url) 92 DocumentInit DocumentInit::fromContext(WeakPtr<Document> contextDocument, const KURL& url)
93 { 93 {
94 return DocumentInit(url, 0, contextDocument, 0); 94 return DocumentInit(url, 0, contextDocument, 0);
95 } 95 }
96 96
97 } // namespace blink 97 } // namespace blink
98 98
OLDNEW
« no previous file with comments | « sky/engine/core/dom/DocumentInit.h ('k') | sky/engine/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698