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

Side by Side Diff: third_party/WebKit/Source/core/testing/InternalSettings.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 #if ENABLE(OILPAN) 50 #if ENABLE(OILPAN)
51 class InternalSettings final : public InternalSettingsGenerated, public HeapSupp lement<Page> { 51 class InternalSettings final : public InternalSettingsGenerated, public HeapSupp lement<Page> {
52 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InternalSettings); 52 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InternalSettings);
53 #else 53 #else
54 class InternalSettings final : public InternalSettingsGenerated { 54 class InternalSettings final : public InternalSettingsGenerated {
55 #endif 55 #endif
56 DEFINE_WRAPPERTYPEINFO(); 56 DEFINE_WRAPPERTYPEINFO();
57 public: 57 public:
58 class Backup { 58 class Backup {
59 DISALLOW_ALLOCATION(); 59 DISALLOW_NEW();
60 public: 60 public:
61 explicit Backup(Settings*); 61 explicit Backup(Settings*);
62 void restoreTo(Settings*); 62 void restoreTo(Settings*);
63 63
64 bool m_originalAuthorShadowDOMForAnyElementEnabled; 64 bool m_originalAuthorShadowDOMForAnyElementEnabled;
65 bool m_originalCSP; 65 bool m_originalCSP;
66 bool m_originalCSSStickyPositionEnabled; 66 bool m_originalCSSStickyPositionEnabled;
67 bool m_originalOverlayScrollbarsEnabled; 67 bool m_originalOverlayScrollbarsEnabled;
68 EditingBehaviorType m_originalEditingBehavior; 68 EditingBehaviorType m_originalEditingBehavior;
69 bool m_originalTextAutosizingEnabled; 69 bool m_originalTextAutosizingEnabled;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 Page* page() const { return m_page; } 146 Page* page() const { return m_page; }
147 static const char* supplementName(); 147 static const char* supplementName();
148 148
149 RawPtrWillBeWeakMember<Page> m_page; 149 RawPtrWillBeWeakMember<Page> m_page;
150 Backup m_backup; 150 Backup m_backup;
151 }; 151 };
152 152
153 } // namespace blink 153 } // namespace blink
154 154
155 #endif // InternalSettings_h 155 #endif // InternalSettings_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/animation/SMILTime.h ('k') | third_party/WebKit/Source/core/timing/MemoryInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698