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

Side by Side Diff: Source/core/testing/InternalSettings.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/page/Page.cpp ('k') | Source/core/workers/WorkerGlobalScopeProxyProvider.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 10 matching lines...) Expand all
21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef InternalSettings_h 27 #ifndef InternalSettings_h
28 #define InternalSettings_h 28 #define InternalSettings_h
29 29
30 #include "core/editing/EditingBehaviorTypes.h" 30 #include "core/editing/EditingBehaviorTypes.h"
31 #include "core/page/Page.h"
31 #include "core/testing/InternalSettingsGenerated.h" 32 #include "core/testing/InternalSettingsGenerated.h"
32 #include "platform/geometry/IntSize.h" 33 #include "platform/geometry/IntSize.h"
33 #include "platform/graphics/ImageAnimationPolicy.h" 34 #include "platform/graphics/ImageAnimationPolicy.h"
34 #include "platform/heap/Handle.h" 35 #include "platform/heap/Handle.h"
35 #include "public/platform/WebDisplayMode.h" 36 #include "public/platform/WebDisplayMode.h"
36 #include "wtf/PassRefPtr.h" 37 #include "wtf/PassRefPtr.h"
37 #include "wtf/RefCounted.h" 38 #include "wtf/RefCounted.h"
38 #include "wtf/text/WTFString.h" 39 #include "wtf/text/WTFString.h"
39 40
40 namespace blink { 41 namespace blink {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 Page* page() const { return m_page; } 143 Page* page() const { return m_page; }
143 static const char* supplementName(); 144 static const char* supplementName();
144 145
145 RawPtrWillBeWeakMember<Page> m_page; 146 RawPtrWillBeWeakMember<Page> m_page;
146 Backup m_backup; 147 Backup m_backup;
147 }; 148 };
148 149
149 } // namespace blink 150 } // namespace blink
150 151
151 #endif // InternalSettings_h 152 #endif // InternalSettings_h
OLDNEW
« no previous file with comments | « Source/core/page/Page.cpp ('k') | Source/core/workers/WorkerGlobalScopeProxyProvider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698