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

Side by Side Diff: third_party/WebKit/Source/core/loader/DocumentLoader.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) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 bool isRedirect() const { return m_redirectChain.size() > 1; } 123 bool isRedirect() const { return m_redirectChain.size() > 1; }
124 void clearRedirectChain(); 124 void clearRedirectChain();
125 void appendRedirect(const KURL&); 125 void appendRedirect(const KURL&);
126 126
127 PassRefPtrWillBeRawPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_contentSecurityPolicy.release(); } 127 PassRefPtrWillBeRawPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_contentSecurityPolicy.release(); }
128 128
129 ClientHintsPreferences& clientHintsPreferences() { return m_clientHintsPrefe rences; } 129 ClientHintsPreferences& clientHintsPreferences() { return m_clientHintsPrefe rences; }
130 130
131 struct InitialScrollState { 131 struct InitialScrollState {
132 DISALLOW_ALLOCATION(); 132 DISALLOW_NEW();
133 InitialScrollState() 133 InitialScrollState()
134 : wasScrolledByUser(false) 134 : wasScrolledByUser(false)
135 , didRestoreFromHistory(false) 135 , didRestoreFromHistory(false)
136 { 136 {
137 } 137 }
138 138
139 bool wasScrolledByUser; 139 bool wasScrolledByUser;
140 bool didRestoreFromHistory; 140 bool didRestoreFromHistory;
141 }; 141 };
142 InitialScrollState& initialScrollState() { return m_initialScrollState; } 142 InitialScrollState& initialScrollState() { return m_initialScrollState; }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Used to protect against reentrancy into dataReceived(). 239 // Used to protect against reentrancy into dataReceived().
240 bool m_inDataReceived; 240 bool m_inDataReceived;
241 RefPtr<SharedBuffer> m_dataBuffer; 241 RefPtr<SharedBuffer> m_dataBuffer;
242 }; 242 };
243 243
244 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 244 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
245 245
246 } // namespace blink 246 } // namespace blink
247 247
248 #endif // DocumentLoader_h 248 #endif // DocumentLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoadTiming.h ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698