Source/core/html/HTMLLabelElement.cpp - Issue 1157833002: Revert of Refactor the selection code in EventHandler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/html/HTMLLabelElement.cpp

Issue 1157833002: Revert of Refactor the selection code in EventHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/html/HTMLLabelElement.cpp

diff --git a/Source/core/html/HTMLLabelElement.cpp b/Source/core/html/HTMLLabelElement.cpp

index 9fb3d825d058c56821984725824f397b2aaceb4f..8900abd58a74bd22187bfa7b0b5f4460410f3b96 100644

--- a/Source/core/html/HTMLLabelElement.cpp

+++ b/Source/core/html/HTMLLabelElement.cpp

@@ -29,7 +29,6 @@

#include "core/dom/Document.h"

#include "core/dom/ElementTraversal.h"

#include "core/editing/FrameSelection.h"

-#include "core/editing/SelectionController.h"

#include "core/events/MouseEvent.h"

#include "core/frame/LocalFrame.h"

#include "core/html/FormAssociatedElement.h"

@@ -161,7 +160,7 @@

if (LocalFrame* frame = document().frame()) {

// Check if there is a selection and click is not on the

// selection.

- if (!Position::nodeIsUserSelectNone(this) && frame->selection().isRange() && !frame->eventHandler().selectionController().singleClickInSelection())

+ if (!Position::nodeIsUserSelectNone(this) && frame->selection().isRange() && !frame->eventHandler().mouseDownWasSingleClickInSelection())

isLabelTextSelected = true;

// If selection is there and is single click i.e. text is

// selected by dragging over label text, then return.

« no previous file with comments | « Source/core/editing/SelectionController.cpp ('k') | Source/core/page/EventHandler.h » ('j') | no next file with comments »