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

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

Issue 112023010: Make EventHandler::ActiveIntervalTimer mockable. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename methods and handle pending fires Created 6 years, 11 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
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 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2740 2740
2741 IntRect touchRect(touchCenter - touchRadius, touchRadius + touchRadius); 2741 IntRect touchRect(touchCenter - touchRadius, touchRadius + touchRadius);
2742 Vector<RefPtr<Node>, 11> nodes; 2742 Vector<RefPtr<Node>, 11> nodes;
2743 copyToVector(result.rectBasedTestResult(), nodes); 2743 copyToVector(result.rectBasedTestResult(), nodes);
2744 2744
2745 // FIXME: the explicit Vector conversion copies into a temporary and is 2745 // FIXME: the explicit Vector conversion copies into a temporary and is
2746 // wasteful. 2746 // wasteful.
2747 return findBestZoomableArea(targetNode, targetArea, touchCenter, touchRect, Vector<RefPtr<Node> >(nodes)); 2747 return findBestZoomableArea(targetNode, targetArea, touchCenter, touchRect, Vector<RefPtr<Node> >(nodes));
2748 } 2748 }
2749 2749
2750 MockableTimer<EventHandler>* EventHandler::getActiveIntervalTimerForTesting()
2751 {
2752 return &m_activeIntervalTimer;
2753 }
2754
2750 bool EventHandler::adjustGesturePosition(const PlatformGestureEvent& gestureEven t, IntPoint& adjustedPoint) 2755 bool EventHandler::adjustGesturePosition(const PlatformGestureEvent& gestureEven t, IntPoint& adjustedPoint)
2751 { 2756 {
2752 if (!shouldApplyTouchAdjustment(gestureEvent)) 2757 if (!shouldApplyTouchAdjustment(gestureEvent))
2753 return false; 2758 return false;
2754 2759
2755 Node* targetNode = 0; 2760 Node* targetNode = 0;
2756 switch (gestureEvent.type()) { 2761 switch (gestureEvent.type()) {
2757 case PlatformEvent::GestureTap: 2762 case PlatformEvent::GestureTap:
2758 case PlatformEvent::GestureTapUnconfirmed: 2763 case PlatformEvent::GestureTapUnconfirmed:
2759 case PlatformEvent::GestureTapDown: 2764 case PlatformEvent::GestureTapDown:
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
4033 unsigned EventHandler::accessKeyModifiers() 4038 unsigned EventHandler::accessKeyModifiers()
4034 { 4039 {
4035 #if OS(MACOSX) 4040 #if OS(MACOSX)
4036 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4041 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4037 #else 4042 #else
4038 return PlatformEvent::AltKey; 4043 return PlatformEvent::AltKey;
4039 #endif 4044 #endif
4040 } 4045 }
4041 4046
4042 } // namespace WebCore 4047 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698