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

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

Issue 2536723007: Removed android scrolling fake mouse moves and device_supports_mouse (Closed)
Patch Set: Made checks mirror what previous logic Created 4 years 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 updateCursor(); 354 updateCursor();
355 } 355 }
356 356
357 void EventHandler::updateCursor() { 357 void EventHandler::updateCursor() {
358 TRACE_EVENT0("input", "EventHandler::updateCursor"); 358 TRACE_EVENT0("input", "EventHandler::updateCursor");
359 359
360 // We must do a cross-frame hit test because the frame that triggered the 360 // We must do a cross-frame hit test because the frame that triggered the
361 // cursor update could be occluded by a different frame. 361 // cursor update could be occluded by a different frame.
362 ASSERT(m_frame == m_frame->localFrameRoot()); 362 ASSERT(m_frame == m_frame->localFrameRoot());
363 363
364 if (m_mouseEventManager->isMousePositionUnknown())
bokan 2016/12/02 18:04:05 This can still get called after layout and style c
amaralp 2016/12/02 23:00:35 The next if statement already does this check thro
bokan 2016/12/07 00:09:53 Thanks, missed that.
365 return;
366
367 FrameView* view = m_frame->view(); 364 FrameView* view = m_frame->view();
368 if (!view || !view->shouldSetCursor()) 365 if (!view || !view->shouldSetCursor())
369 return; 366 return;
370 367
371 LayoutViewItem layoutViewItem = view->layoutViewItem(); 368 LayoutViewItem layoutViewItem = view->layoutViewItem();
372 if (layoutViewItem.isNull()) 369 if (layoutViewItem.isNull())
373 return; 370 return;
374 371
375 m_frame->document()->updateStyleAndLayout(); 372 m_frame->document()->updateStyleAndLayout();
376 373
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 } 2126 }
2130 2127
2131 FrameHost* EventHandler::frameHost() const { 2128 FrameHost* EventHandler::frameHost() const {
2132 if (!m_frame->page()) 2129 if (!m_frame->page())
2133 return nullptr; 2130 return nullptr;
2134 2131
2135 return &m_frame->page()->frameHost(); 2132 return &m_frame->page()->frameHost();
2136 } 2133 }
2137 2134
2138 } // namespace blink 2135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698