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

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

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 1714 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 // because rect-based hit testing and touch adjustment sometimes return a 1725 // because rect-based hit testing and touch adjustment sometimes return a
1726 // different node than what a point-based hit test would return for the same 1726 // different node than what a point-based hit test would return for the same
1727 // point. 1727 // point.
1728 // FIXME: Fix touch adjustment to avoid the need for a redundant hit test. 1728 // FIXME: Fix touch adjustment to avoid the need for a redundant hit test.
1729 // http://crbug.com/398914 1729 // http://crbug.com/398914
1730 if (shouldApplyTouchAdjustment(gestureEvent)) { 1730 if (shouldApplyTouchAdjustment(gestureEvent)) {
1731 LocalFrame* hitFrame = hitTestResult.innerNodeFrame(); 1731 LocalFrame* hitFrame = hitTestResult.innerNodeFrame();
1732 if (!hitFrame) 1732 if (!hitFrame)
1733 hitFrame = m_frame; 1733 hitFrame = m_frame;
1734 hitTestResult = EventHandlingUtil::hitTestResultInFrame( 1734 hitTestResult = EventHandlingUtil::hitTestResultInFrame(
1735 hitFrame, hitFrame->view()->rootFrameToContents( 1735 hitFrame,
1736 flooredIntPoint(adjustedEvent.positionInRootFrame())), 1736 hitFrame->view()->rootFrameToContents(
1737 flooredIntPoint(adjustedEvent.positionInRootFrame())),
1737 (hitType | HitTestRequest::ReadOnly) & ~HitTestRequest::ListBased); 1738 (hitType | HitTestRequest::ReadOnly) & ~HitTestRequest::ListBased);
1738 } 1739 }
1739 1740
1740 // If we did a rect-based hit test it must be resolved to the best single node 1741 // If we did a rect-based hit test it must be resolved to the best single node
1741 // by now to ensure consumers don't accidentally use one of the other 1742 // by now to ensure consumers don't accidentally use one of the other
1742 // candidates. 1743 // candidates.
1743 ASSERT(!hitTestResult.isRectBasedTest()); 1744 ASSERT(!hitTestResult.isRectBasedTest());
1744 1745
1745 return GestureEventWithHitTestResults(adjustedEvent, hitTestResult); 1746 return GestureEventWithHitTestResults(adjustedEvent, hitTestResult);
1746 } 1747 }
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 } 2133 }
2133 2134
2134 FrameHost* EventHandler::frameHost() const { 2135 FrameHost* EventHandler::frameHost() const {
2135 if (!m_frame->page()) 2136 if (!m_frame->page())
2136 return nullptr; 2137 return nullptr;
2137 2138
2138 return &m_frame->page()->frameHost(); 2139 return &m_frame->page()->frameHost();
2139 } 2140 }
2140 2141
2141 } // namespace blink 2142 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698