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

Side by Side Diff: Source/core/html/shadow/SpinButtonElement.cpp

Issue 144713007: Spinner elements not to dispatch change event on hover (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test scripts update Created 6 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
« no previous file with comments | « Source/core/html/shadow/SpinButtonElement.h ('k') | 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, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Google Inc. All rights reserved.
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 29 matching lines...) Expand all
40 #include "platform/scroll/ScrollbarTheme.h" 40 #include "platform/scroll/ScrollbarTheme.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 using namespace HTMLNames; 44 using namespace HTMLNames;
45 45
46 inline SpinButtonElement::SpinButtonElement(Document& document, SpinButtonOwner& spinButtonOwner) 46 inline SpinButtonElement::SpinButtonElement(Document& document, SpinButtonOwner& spinButtonOwner)
47 : HTMLDivElement(document) 47 : HTMLDivElement(document)
48 , m_spinButtonOwner(&spinButtonOwner) 48 , m_spinButtonOwner(&spinButtonOwner)
49 , m_capturing(false) 49 , m_capturing(false)
50 , m_mouseEvent(false)
50 , m_upDownState(Indeterminate) 51 , m_upDownState(Indeterminate)
51 , m_pressStartingState(Indeterminate) 52 , m_pressStartingState(Indeterminate)
52 , m_repeatingTimer(this, &SpinButtonElement::repeatingTimerFired) 53 , m_repeatingTimer(this, &SpinButtonElement::repeatingTimerFired)
53 { 54 {
54 } 55 }
55 56
56 PassRefPtr<SpinButtonElement> SpinButtonElement::create(Document& document, Spin ButtonOwner& spinButtonOwner) 57 PassRefPtr<SpinButtonElement> SpinButtonElement::create(Document& document, Spin ButtonOwner& spinButtonOwner)
57 { 58 {
58 RefPtr<SpinButtonElement> element = adoptRef(new SpinButtonElement(document, spinButtonOwner)); 59 RefPtr<SpinButtonElement> element = adoptRef(new SpinButtonElement(document, spinButtonOwner));
59 element->setShadowPseudoId(AtomicString("-webkit-inner-spin-button", AtomicS tring::ConstructFromLiteral)); 60 element->setShadowPseudoId(AtomicString("-webkit-inner-spin-button", AtomicS tring::ConstructFromLiteral));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // might change the element state and we might need to 105 // might change the element state and we might need to
105 // cancel the repeating timer by the state change. If we 106 // cancel the repeating timer by the state change. If we
106 // started the timer after doStepAction(), we would have no 107 // started the timer after doStepAction(), we would have no
107 // chance to cancel the timer. 108 // chance to cancel the timer.
108 startRepeatingTimer(); 109 startRepeatingTimer();
109 doStepAction(m_upDownState == Up ? 1 : -1); 110 doStepAction(m_upDownState == Up ? 1 : -1);
110 } 111 }
111 } 112 }
112 event->setDefaultHandled(); 113 event->setDefaultHandled();
113 } 114 }
115 m_mouseEvent = true;
114 } else if (mouseEvent->type() == EventTypeNames::mouseup && mouseEvent->butt on() == LeftButton) { 116 } else if (mouseEvent->type() == EventTypeNames::mouseup && mouseEvent->butt on() == LeftButton) {
115 releaseCapture(); 117 releaseCapture();
118 m_mouseEvent = true;
116 } else if (event->type() == EventTypeNames::mousemove) { 119 } else if (event->type() == EventTypeNames::mousemove) {
117 if (box->pixelSnappedBorderBoxRect().contains(local)) { 120 if (box->pixelSnappedBorderBoxRect().contains(local)) {
118 if (!m_capturing) { 121 if (!m_capturing) {
119 if (Frame* frame = document().frame()) { 122 if (Frame* frame = document().frame()) {
120 frame->eventHandler().setCapturingMouseEventsNode(this); 123 frame->eventHandler().setCapturingMouseEventsNode(this);
121 m_capturing = true; 124 m_capturing = true;
122 if (Page* page = document().page()) 125 if (Page* page = document().page())
123 page->chrome().registerPopupOpeningObserver(this); 126 page->chrome().registerPopupOpeningObserver(this);
124 } 127 }
125 } 128 }
126 UpDownState oldUpDownState = m_upDownState; 129 UpDownState oldUpDownState = m_upDownState;
127 m_upDownState = (local.y() < box->height() / 2) ? Up : Down; 130 m_upDownState = (local.y() < box->height() / 2) ? Up : Down;
128 if (m_upDownState != oldUpDownState) 131 if (m_upDownState != oldUpDownState)
129 renderer()->repaint(); 132 renderer()->repaint();
130 } else { 133 } else {
131 releaseCapture(); 134 releaseCapture();
132 m_upDownState = Indeterminate; 135 m_upDownState = Indeterminate;
133 } 136 }
137 m_mouseEvent = true;
tkent 2014/02/04 04:57:34 This approach doesn't work for hovering case. 1. W
134 } 138 }
135 139
136 if (!event->defaultHandled()) 140 if (!event->defaultHandled())
137 HTMLDivElement::defaultEventHandler(event); 141 HTMLDivElement::defaultEventHandler(event);
138 } 142 }
139 143
140 void SpinButtonElement::willOpenPopup() 144 void SpinButtonElement::willOpenPopup()
141 { 145 {
142 releaseCapture(); 146 releaseCapture();
143 m_upDownState = Indeterminate; 147 m_upDownState = Indeterminate;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 void SpinButtonElement::releaseCapture() 195 void SpinButtonElement::releaseCapture()
192 { 196 {
193 stopRepeatingTimer(); 197 stopRepeatingTimer();
194 if (m_capturing) { 198 if (m_capturing) {
195 if (Frame* frame = document().frame()) { 199 if (Frame* frame = document().frame()) {
196 frame->eventHandler().setCapturingMouseEventsNode(0); 200 frame->eventHandler().setCapturingMouseEventsNode(0);
197 m_capturing = false; 201 m_capturing = false;
198 if (Page* page = document().page()) 202 if (Page* page = document().page())
199 page->chrome().unregisterPopupOpeningObserver(this); 203 page->chrome().unregisterPopupOpeningObserver(this);
200 } 204 }
201 if (m_spinButtonOwner) 205 }
202 m_spinButtonOwner->spinButtonDidReleaseMouseCapture(); 206 if (m_spinButtonOwner && m_mouseEvent) {
207 m_spinButtonOwner->spinButtonDidReleaseMouseCapture();
208 m_mouseEvent = false;
203 } 209 }
204 } 210 }
205 211
206 bool SpinButtonElement::matchesReadOnlyPseudoClass() const 212 bool SpinButtonElement::matchesReadOnlyPseudoClass() const
207 { 213 {
208 return shadowHost()->matchesReadOnlyPseudoClass(); 214 return shadowHost()->matchesReadOnlyPseudoClass();
209 } 215 }
210 216
211 bool SpinButtonElement::matchesReadWritePseudoClass() const 217 bool SpinButtonElement::matchesReadWritePseudoClass() const
212 { 218 {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 m_upDownState = Indeterminate; 257 m_upDownState = Indeterminate;
252 HTMLDivElement::setHovered(flag); 258 HTMLDivElement::setHovered(flag);
253 } 259 }
254 260
255 bool SpinButtonElement::shouldRespondToMouseEvents() 261 bool SpinButtonElement::shouldRespondToMouseEvents()
256 { 262 {
257 return !m_spinButtonOwner || m_spinButtonOwner->shouldSpinButtonRespondToMou seEvents(); 263 return !m_spinButtonOwner || m_spinButtonOwner->shouldSpinButtonRespondToMou seEvents();
258 } 264 }
259 265
260 } 266 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/SpinButtonElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698