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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.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, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 void notifyElementActivated(); 197 void notifyElementActivated();
198 198
199 PassRefPtr<UserGestureToken> takeLastMouseDownGestureToken() { return m_last MouseDownUserGestureToken.release(); } 199 PassRefPtr<UserGestureToken> takeLastMouseDownGestureToken() { return m_last MouseDownUserGestureToken.release(); }
200 200
201 int clickCount() { return m_clickCount; } 201 int clickCount() { return m_clickCount; }
202 202
203 SelectionController& selectionController() const { return *m_selectionContro ller; } 203 SelectionController& selectionController() const { return *m_selectionContro ller; }
204 204
205 class TouchInfo { 205 class TouchInfo {
206 ALLOW_ONLY_INLINE_ALLOCATION(); 206 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
207 public: 207 public:
208 DEFINE_INLINE_TRACE() 208 DEFINE_INLINE_TRACE()
209 { 209 {
210 visitor->trace(touchTarget); 210 visitor->trace(touchTarget);
211 visitor->trace(targetFrame); 211 visitor->trace(targetFrame);
212 } 212 }
213 213
214 PlatformTouchPoint point; 214 PlatformTouchPoint point;
215 RefPtrWillBeMember<EventTarget> touchTarget; 215 RefPtrWillBeMember<EventTarget> touchTarget;
216 RefPtrWillBeMember<LocalFrame> targetFrame; 216 RefPtrWillBeMember<LocalFrame> targetFrame;
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 // scroll which shouldn't propagate can't cause any element to 451 // scroll which shouldn't propagate can't cause any element to
452 // scroll other than the |m_previousGestureScrolledNode|. 452 // scroll other than the |m_previousGestureScrolledNode|.
453 bool m_deltaConsumedForScrollSequence; 453 bool m_deltaConsumedForScrollSequence;
454 }; 454 };
455 455
456 } // namespace blink 456 } // namespace blink
457 457
458 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::EventHandler::TouchInfo); 458 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::EventHandler::TouchInfo);
459 459
460 #endif // EventHandler_h 460 #endif // EventHandler_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698