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

Side by Side Diff: third_party/WebKit/Source/core/dom/DocumentLifecycle.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 #define DocumentLifecycle_h 32 #define DocumentLifecycle_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "wtf/Allocator.h" 35 #include "wtf/Allocator.h"
36 #include "wtf/Assertions.h" 36 #include "wtf/Assertions.h"
37 #include "wtf/Noncopyable.h" 37 #include "wtf/Noncopyable.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class CORE_EXPORT DocumentLifecycle { 41 class CORE_EXPORT DocumentLifecycle {
42 DISALLOW_ALLOCATION(); 42 DISALLOW_NEW();
43 WTF_MAKE_NONCOPYABLE(DocumentLifecycle); 43 WTF_MAKE_NONCOPYABLE(DocumentLifecycle);
44 public: 44 public:
45 enum State { 45 enum State {
46 Uninitialized, 46 Uninitialized,
47 Inactive, 47 Inactive,
48 48
49 // When the document is active, it traverses these states. 49 // When the document is active, it traverses these states.
50 50
51 VisualUpdatePending, 51 VisualUpdatePending,
52 52
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 public: 93 public:
94 Scope(DocumentLifecycle&, State finalState); 94 Scope(DocumentLifecycle&, State finalState);
95 ~Scope(); 95 ~Scope();
96 96
97 private: 97 private:
98 DocumentLifecycle& m_lifecycle; 98 DocumentLifecycle& m_lifecycle;
99 State m_finalState; 99 State m_finalState;
100 }; 100 };
101 101
102 class DeprecatedTransition { 102 class DeprecatedTransition {
103 DISALLOW_ALLOCATION(); 103 DISALLOW_NEW();
104 WTF_MAKE_NONCOPYABLE(DeprecatedTransition); 104 WTF_MAKE_NONCOPYABLE(DeprecatedTransition);
105 public: 105 public:
106 DeprecatedTransition(State from, State to); 106 DeprecatedTransition(State from, State to);
107 ~DeprecatedTransition(); 107 ~DeprecatedTransition();
108 108
109 State from() const { return m_from; } 109 State from() const { return m_from; }
110 State to() const { return m_to; } 110 State to() const { return m_to; }
111 111
112 private: 112 private:
113 DeprecatedTransition* m_previous; 113 DeprecatedTransition* m_previous;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 && m_state != InCompositingUpdate 225 && m_state != InCompositingUpdate
226 && m_state != InPaintInvalidation 226 && m_state != InPaintInvalidation
227 && m_state != InUpdatePaintProperties 227 && m_state != InUpdatePaintProperties
228 && m_state != InPaint 228 && m_state != InPaint
229 && m_state != InCompositingForSlimmingPaintV2; 229 && m_state != InCompositingForSlimmingPaintV2;
230 } 230 }
231 231
232 } // namespace blink 232 } // namespace blink
233 233
234 #endif 234 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/DocumentEncodingData.h ('k') | third_party/WebKit/Source/core/dom/DocumentOrderedList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698