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

Side by Side Diff: Source/core/dom/Document.h

Issue 1060813005: Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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/ContextFeatures.h ('k') | Source/core/dom/Document.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) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 21 matching lines...) Expand all
32 #include "bindings/core/v8/ScriptValue.h" 32 #include "bindings/core/v8/ScriptValue.h"
33 #include "core/CoreExport.h" 33 #include "core/CoreExport.h"
34 #include "core/animation/AnimationClock.h" 34 #include "core/animation/AnimationClock.h"
35 #include "core/animation/CompositorPendingAnimations.h" 35 #include "core/animation/CompositorPendingAnimations.h"
36 #include "core/dom/ContainerNode.h" 36 #include "core/dom/ContainerNode.h"
37 #include "core/dom/DocumentEncodingData.h" 37 #include "core/dom/DocumentEncodingData.h"
38 #include "core/dom/DocumentInit.h" 38 #include "core/dom/DocumentInit.h"
39 #include "core/dom/DocumentLifecycle.h" 39 #include "core/dom/DocumentLifecycle.h"
40 #include "core/dom/DocumentLifecycleNotifier.h" 40 #include "core/dom/DocumentLifecycleNotifier.h"
41 #include "core/dom/DocumentLifecycleObserver.h" 41 #include "core/dom/DocumentLifecycleObserver.h"
42 #include "core/dom/DocumentSupplementable.h"
43 #include "core/dom/DocumentTiming.h" 42 #include "core/dom/DocumentTiming.h"
44 #include "core/dom/ExecutionContext.h" 43 #include "core/dom/ExecutionContext.h"
45 #include "core/dom/MutationObserver.h" 44 #include "core/dom/MutationObserver.h"
46 #include "core/dom/TextLinkColors.h" 45 #include "core/dom/TextLinkColors.h"
47 #include "core/dom/TreeScope.h" 46 #include "core/dom/TreeScope.h"
48 #include "core/dom/UserActionElementSet.h" 47 #include "core/dom/UserActionElementSet.h"
49 #include "core/dom/ViewportDescription.h" 48 #include "core/dom/ViewportDescription.h"
50 #include "core/dom/custom/CustomElement.h" 49 #include "core/dom/custom/CustomElement.h"
51 #include "core/frame/DOMTimerCoordinator.h" 50 #include "core/frame/DOMTimerCoordinator.h"
52 #include "core/frame/LocalDOMWindow.h" 51 #include "core/frame/LocalDOMWindow.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 DECLARE_VIRTUAL_TRACE(); 216 DECLARE_VIRTUAL_TRACE();
218 217
219 private: 218 private:
220 void registerObserver(Document&); 219 void registerObserver(Document&);
221 void unregisterObserver(); 220 void unregisterObserver();
222 221
223 RawPtrWillBeMember<Document> m_document; 222 RawPtrWillBeMember<Document> m_document;
224 }; 223 };
225 224
226 class CORE_EXPORT Document : public ContainerNode, public TreeScope, public Secu rityContext, public ExecutionContext 225 class CORE_EXPORT Document : public ContainerNode, public TreeScope, public Secu rityContext, public ExecutionContext
227 , public DocumentSupplementable, public DocumentLifecycleNotifier { 226 , public WillBeHeapSupplementable<Document>, public DocumentLifecycleNotifie r {
228 DEFINE_WRAPPERTYPEINFO(); 227 DEFINE_WRAPPERTYPEINFO();
229 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Document); 228 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Document);
230 public: 229 public:
231 static PassRefPtrWillBeRawPtr<Document> create(const DocumentInit& initializ er = DocumentInit()) 230 static PassRefPtrWillBeRawPtr<Document> create(const DocumentInit& initializ er = DocumentInit())
232 { 231 {
233 return adoptRefWillBeNoop(new Document(initializer)); 232 return adoptRefWillBeNoop(new Document(initializer));
234 } 233 }
235 virtual ~Document(); 234 virtual ~Document();
236 235
237 MediaQueryMatcher& mediaQueryMatcher(); 236 MediaQueryMatcher& mediaQueryMatcher();
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 1414
1416 int m_styleRecalcElementCounter; 1415 int m_styleRecalcElementCounter;
1417 1416
1418 ParserSynchronizationPolicy m_parserSyncPolicy; 1417 ParserSynchronizationPolicy m_parserSyncPolicy;
1419 1418
1420 OriginsUsingFeatures::Value m_originsUsingFeaturesValue; 1419 OriginsUsingFeatures::Value m_originsUsingFeaturesValue;
1421 1420
1422 ClientHintsPreferences m_clientHintsPreferences; 1421 ClientHintsPreferences m_clientHintsPreferences;
1423 }; 1422 };
1424 1423
1424 extern template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Document>;
1425
1425 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin) 1426 inline bool Document::shouldOverrideLegacyDescription(ViewportDescription::Type origin)
1426 { 1427 {
1427 // The different (legacy) meta tags have different priorities based on the t ype 1428 // The different (legacy) meta tags have different priorities based on the t ype
1428 // regardless of which order they appear in the DOM. The priority is given b y the 1429 // regardless of which order they appear in the DOM. The priority is given b y the
1429 // ViewportDescription::Type enum. 1430 // ViewportDescription::Type enum.
1430 return origin >= m_legacyViewportDescription.type; 1431 return origin >= m_legacyViewportDescription.type;
1431 } 1432 }
1432 1433
1433 inline void Document::scheduleRenderTreeUpdateIfNeeded() 1434 inline void Document::scheduleRenderTreeUpdateIfNeeded()
1434 { 1435 {
(...skipping 25 matching lines...) Expand all
1460 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1461 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1461 1462
1462 } // namespace blink 1463 } // namespace blink
1463 1464
1464 #ifndef NDEBUG 1465 #ifndef NDEBUG
1465 // Outside the WebCore namespace for ease of invocation from gdb. 1466 // Outside the WebCore namespace for ease of invocation from gdb.
1466 CORE_EXPORT void showLiveDocumentInstances(); 1467 CORE_EXPORT void showLiveDocumentInstances();
1467 #endif 1468 #endif
1468 1469
1469 #endif // Document_h 1470 #endif // Document_h
OLDNEW
« no previous file with comments | « Source/core/dom/ContextFeatures.h ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698