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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1850413002: Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address compilation failure Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 visitor->trace(m_scrollGestureHandlingNode); 294 visitor->trace(m_scrollGestureHandlingNode);
295 visitor->trace(m_previousGestureScrolledNode); 295 visitor->trace(m_previousGestureScrolledNode);
296 visitor->trace(m_lastDeferredTapElement); 296 visitor->trace(m_lastDeferredTapElement);
297 visitor->trace(m_selectionController); 297 visitor->trace(m_selectionController);
298 visitor->trace(m_pointerEventManager); 298 visitor->trace(m_pointerEventManager);
299 #endif 299 #endif
300 } 300 }
301 301
302 DragState& EventHandler::dragState() 302 DragState& EventHandler::dragState()
303 { 303 {
304 DEFINE_STATIC_LOCAL(Persistent<DragState>, state, (new DragState())); 304 DEFINE_STATIC_LOCAL(DragState, state, (new DragState));
305 return *state; 305 return state;
306 } 306 }
307 307
308 void EventHandler::clear() 308 void EventHandler::clear()
309 { 309 {
310 m_hoverTimer.stop(); 310 m_hoverTimer.stop();
311 m_cursorUpdateTimer.stop(); 311 m_cursorUpdateTimer.stop();
312 m_fakeMouseMoveEventTimer.stop(); 312 m_fakeMouseMoveEventTimer.stop();
313 m_activeIntervalTimer.stop(); 313 m_activeIntervalTimer.stop();
314 m_resizeScrollableArea = nullptr; 314 m_resizeScrollableArea = nullptr;
315 m_nodeUnderMouse = nullptr; 315 m_nodeUnderMouse = nullptr;
(...skipping 3676 matching lines...) Expand 10 before | Expand all | Expand 10 after
3992 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 3992 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
3993 { 3993 {
3994 #if OS(MACOSX) 3994 #if OS(MACOSX)
3995 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 3995 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
3996 #else 3996 #else
3997 return PlatformEvent::AltKey; 3997 return PlatformEvent::AltKey;
3998 #endif 3998 #endif
3999 } 3999 }
4000 4000
4001 } // namespace blink 4001 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698