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

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

Issue 11189063: Merge 130449 - Crash in EventHandler::mouseMoved(). (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | no next file » | 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 * 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 1664
1665 RenderLayer* layer = renderer->enclosingLayer(); 1665 RenderLayer* layer = renderer->enclosingLayer();
1666 if (!layer) 1666 if (!layer)
1667 return 0; 1667 return 0;
1668 1668
1669 return layer; 1669 return layer;
1670 } 1670 }
1671 1671
1672 bool EventHandler::mouseMoved(const PlatformMouseEvent& event) 1672 bool EventHandler::mouseMoved(const PlatformMouseEvent& event)
1673 { 1673 {
1674 RefPtr<FrameView> protector(m_frame->view());
1674 MaximumDurationTracker maxDurationTracker(&m_maxMouseMovedDuration); 1675 MaximumDurationTracker maxDurationTracker(&m_maxMouseMovedDuration);
1675 RefPtr<FrameView> protector(m_frame->view());
1676 1676
1677 1677
1678 #if ENABLE(TOUCH_EVENTS) 1678 #if ENABLE(TOUCH_EVENTS)
1679 // FIXME: this should be moved elsewhere to also be able to dispatch touchca ncel events. 1679 // FIXME: this should be moved elsewhere to also be able to dispatch touchca ncel events.
1680 bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(event); 1680 bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(event);
1681 if (defaultPrevented) 1681 if (defaultPrevented)
1682 return true; 1682 return true;
1683 #endif 1683 #endif
1684 1684
1685 HitTestResult hoveredNode = HitTestResult(LayoutPoint()); 1685 HitTestResult hoveredNode = HitTestResult(LayoutPoint());
(...skipping 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after
3738 if (eventType == PlatformEvent::MouseMoved && !m_touchPressed) 3738 if (eventType == PlatformEvent::MouseMoved && !m_touchPressed)
3739 return false; 3739 return false;
3740 3740
3741 SyntheticSingleTouchEvent touchEvent(event); 3741 SyntheticSingleTouchEvent touchEvent(event);
3742 return handleTouchEvent(touchEvent); 3742 return handleTouchEvent(touchEvent);
3743 } 3743 }
3744 3744
3745 #endif 3745 #endif
3746 3746
3747 } 3747 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698