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

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

Issue 2048733002: Selecting with shift+drag results in unexpected drag-n-drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 391
392 m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets(); 392 m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
393 393
394 if (FrameView* frameView = m_frame->view()) { 394 if (FrameView* frameView = m_frame->view()) {
395 if (frameView->isPointInScrollbarCorner(event.event().position())) 395 if (frameView->isPointInScrollbarCorner(event.event().position()))
396 return WebInputEventResult::NotHandled; 396 return WebInputEventResult::NotHandled;
397 } 397 }
398 398
399 bool singleClick = event.event().clickCount() <= 1; 399 bool singleClick = event.event().clickCount() <= 1;
400 400
401 m_mouseDownMayStartDrag = singleClick && !isLinkSelection(event); 401 m_mouseDownMayStartDrag = singleClick && !isLinkSelection(event) && !isExten dingSelection(event);
402 402
403 selectionController().handleMousePressEvent(event); 403 selectionController().handleMousePressEvent(event);
404 404
405 m_mouseDown = event.event(); 405 m_mouseDown = event.event();
406 406
407 if (m_frame->document()->isSVGDocument() && m_frame->document()->accessSVGEx tensions().zoomAndPanEnabled()) { 407 if (m_frame->document()->isSVGDocument() && m_frame->document()->accessSVGEx tensions().zoomAndPanEnabled()) {
408 if (event.event().shiftKey() && singleClick) { 408 if (event.event().shiftKey() && singleClick) {
409 m_svgPan = true; 409 m_svgPan = true;
410 m_frame->document()->accessSVGExtensions().startPan(m_frame->view()- >rootFrameToContents(event.event().position())); 410 m_frame->document()->accessSVGExtensions().startPan(m_frame->view()- >rootFrameToContents(event.event().position()));
411 return WebInputEventResult::HandledSystem; 411 return WebInputEventResult::HandledSystem;
(...skipping 3284 matching lines...) Expand 10 before | Expand all | Expand 10 after
3696 3696
3697 FrameHost* EventHandler::frameHost() const 3697 FrameHost* EventHandler::frameHost() const
3698 { 3698 {
3699 if (!m_frame->page()) 3699 if (!m_frame->page())
3700 return nullptr; 3700 return nullptr;
3701 3701
3702 return &m_frame->page()->frameHost(); 3702 return &m_frame->page()->frameHost();
3703 } 3703 }
3704 3704
3705 } // namespace blink 3705 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698