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

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 169293002: Oilpan: Remove GC_INFO_{DEFINE,DECLARE} macros (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixheaptest Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/DragState.h ('k') | Source/core/page/EventSource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 , m_activeIntervalTimer(this, &EventHandler::activeIntervalTimerFired) 299 , m_activeIntervalTimer(this, &EventHandler::activeIntervalTimerFired)
300 , m_lastShowPressTimestamp(0) 300 , m_lastShowPressTimestamp(0)
301 { 301 {
302 } 302 }
303 303
304 EventHandler::~EventHandler() 304 EventHandler::~EventHandler()
305 { 305 {
306 ASSERT(!m_fakeMouseMoveEventTimer.isActive()); 306 ASSERT(!m_fakeMouseMoveEventTimer.isActive());
307 } 307 }
308 308
309 DEFINE_GC_INFO(DragState);
310
311 DragState& EventHandler::dragState() 309 DragState& EventHandler::dragState()
312 { 310 {
313 #if ENABLE(OILPAN) 311 #if ENABLE(OILPAN)
314 DEFINE_STATIC_LOCAL(Persistent<DragState>, state, (new DragState())); 312 DEFINE_STATIC_LOCAL(Persistent<DragState>, state, (new DragState()));
315 return *state; 313 return *state;
316 #else 314 #else
317 DEFINE_STATIC_LOCAL(DragState, state, ()); 315 DEFINE_STATIC_LOCAL(DragState, state, ());
318 return state; 316 return state;
319 #endif 317 #endif
320 } 318 }
(...skipping 3695 matching lines...) Expand 10 before | Expand all | Expand 10 after
4016 unsigned EventHandler::accessKeyModifiers() 4014 unsigned EventHandler::accessKeyModifiers()
4017 { 4015 {
4018 #if OS(MACOSX) 4016 #if OS(MACOSX)
4019 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4017 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4020 #else 4018 #else
4021 return PlatformEvent::AltKey; 4019 return PlatformEvent::AltKey;
4022 #endif 4020 #endif
4023 } 4021 }
4024 4022
4025 } // namespace WebCore 4023 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/DragState.h ('k') | Source/core/page/EventSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698