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

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

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/Fullscreen.h ('k') | Source/core/html/imports/HTMLImportsController.h » ('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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 const char* Fullscreen::supplementName() 124 const char* Fullscreen::supplementName()
125 { 125 {
126 return "Fullscreen"; 126 return "Fullscreen";
127 } 127 }
128 128
129 Fullscreen& Fullscreen::from(Document& document) 129 Fullscreen& Fullscreen::from(Document& document)
130 { 130 {
131 Fullscreen* fullscreen = fromIfExists(document); 131 Fullscreen* fullscreen = fromIfExists(document);
132 if (!fullscreen) { 132 if (!fullscreen) {
133 fullscreen = new Fullscreen(document); 133 fullscreen = new Fullscreen(document);
134 DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBe Noop(fullscreen)); 134 WillBeHeapSupplement<Document>::provideTo(document, supplementName(), ad optPtrWillBeNoop(fullscreen));
135 } 135 }
136 136
137 return *fullscreen; 137 return *fullscreen;
138 } 138 }
139 139
140 Fullscreen* Fullscreen::fromIfExistsSlow(Document& document) 140 Fullscreen* Fullscreen::fromIfExistsSlow(Document& document)
141 { 141 {
142 return static_cast<Fullscreen*>(DocumentSupplement::from(document, supplemen tName())); 142 return static_cast<Fullscreen*>(WillBeHeapSupplement<Document>::from(documen t, supplementName()));
143 } 143 }
144 144
145 Element* Fullscreen::fullscreenElementFrom(Document& document) 145 Element* Fullscreen::fullscreenElementFrom(Document& document)
146 { 146 {
147 if (Fullscreen* found = fromIfExists(document)) 147 if (Fullscreen* found = fromIfExists(document))
148 return found->fullscreenElement(); 148 return found->fullscreenElement();
149 return 0; 149 return 0;
150 } 150 }
151 151
152 Element* Fullscreen::currentFullScreenElementFrom(Document& document) 152 Element* Fullscreen::currentFullScreenElementFrom(Document& document)
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 void Fullscreen::pushFullscreenElementStack(Element& element, RequestType reques tType) 601 void Fullscreen::pushFullscreenElementStack(Element& element, RequestType reques tType)
602 { 602 {
603 m_fullScreenElementStack.append(std::make_pair(&element, requestType)); 603 m_fullScreenElementStack.append(std::make_pair(&element, requestType));
604 } 604 }
605 605
606 DEFINE_TRACE(Fullscreen) 606 DEFINE_TRACE(Fullscreen)
607 { 607 {
608 visitor->trace(m_fullScreenElement); 608 visitor->trace(m_fullScreenElement);
609 visitor->trace(m_fullScreenElementStack); 609 visitor->trace(m_fullScreenElementStack);
610 visitor->trace(m_eventQueue); 610 visitor->trace(m_eventQueue);
611 DocumentSupplement::trace(visitor); 611 WillBeHeapSupplement<Document>::trace(visitor);
612 DocumentLifecycleObserver::trace(visitor); 612 DocumentLifecycleObserver::trace(visitor);
613 } 613 }
614 614
615 } // namespace blink 615 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Fullscreen.h ('k') | Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698