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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTheme.cpp

Issue 2209773002: Remove the blocking touch handlers for the input[type=range] and add touch-action instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add parseAttribute back to pass one more test Created 4 years, 4 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 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 break; 203 break;
204 } 204 }
205 } 205 }
206 206
207 // Call the appropriate style adjustment method based off the appearance val ue. 207 // Call the appropriate style adjustment method based off the appearance val ue.
208 switch (style.appearance()) { 208 switch (style.appearance()) {
209 case MenulistPart: 209 case MenulistPart:
210 return adjustMenuListStyle(style, e); 210 return adjustMenuListStyle(style, e);
211 case MenulistButtonPart: 211 case MenulistButtonPart:
212 return adjustMenuListButtonStyle(style, e); 212 return adjustMenuListButtonStyle(style, e);
213 case SliderHorizontalPart:
214 case SliderVerticalPart:
215 case MediaFullScreenVolumeSliderPart:
216 case MediaSliderPart:
217 case MediaVolumeSliderPart:
218 return adjustSliderContainerStyle(style, e);
213 case SliderThumbHorizontalPart: 219 case SliderThumbHorizontalPart:
214 case SliderThumbVerticalPart: 220 case SliderThumbVerticalPart:
215 return adjustSliderThumbStyle(style); 221 return adjustSliderThumbStyle(style);
216 case SearchFieldPart: 222 case SearchFieldPart:
217 return adjustSearchFieldStyle(style); 223 return adjustSearchFieldStyle(style);
218 case SearchFieldCancelButtonPart: 224 case SearchFieldCancelButtonPart:
219 return adjustSearchFieldCancelButtonStyle(style); 225 return adjustSearchFieldCancelButtonStyle(style);
220 default: 226 default:
221 break; 227 break;
222 } 228 }
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 626
621 bool LayoutTheme::shouldHaveSpinButton(HTMLInputElement* inputElement) const 627 bool LayoutTheme::shouldHaveSpinButton(HTMLInputElement* inputElement) const
622 { 628 {
623 return inputElement->isSteppable() && inputElement->type() != InputTypeNames ::range; 629 return inputElement->isSteppable() && inputElement->type() != InputTypeNames ::range;
624 } 630 }
625 631
626 void LayoutTheme::adjustMenuListButtonStyle(ComputedStyle&, Element*) const 632 void LayoutTheme::adjustMenuListButtonStyle(ComputedStyle&, Element*) const
627 { 633 {
628 } 634 }
629 635
636 void LayoutTheme::adjustSliderContainerStyle(ComputedStyle& style, Element* e) c onst
637 {
638 if (e->shadowPseudoId() == "-webkit-media-slider-container" || e->shadowPseu doId() == "-webkit-slider-container") {
639 if (style.appearance() == SliderVerticalPart) {
640 style.setTouchAction(TouchActionPanX);
641 style.setAppearance(NoControlPart);
642 } else {
643 style.setTouchAction(TouchActionPanY);
644 style.setAppearance(NoControlPart);
645 }
646 }
647 }
648
630 void LayoutTheme::adjustSliderThumbStyle(ComputedStyle& style) const 649 void LayoutTheme::adjustSliderThumbStyle(ComputedStyle& style) const
631 { 650 {
632 adjustSliderThumbSize(style); 651 adjustSliderThumbSize(style);
633 } 652 }
634 653
635 void LayoutTheme::adjustSliderThumbSize(ComputedStyle&) const 654 void LayoutTheme::adjustSliderThumbSize(ComputedStyle&) const
636 { 655 {
637 } 656 }
638 657
639 void LayoutTheme::adjustSearchFieldStyle(ComputedStyle&) const 658 void LayoutTheme::adjustSearchFieldStyle(ComputedStyle&) const
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 923
905 // padding - not honored by WinIE, needs to be removed. 924 // padding - not honored by WinIE, needs to be removed.
906 style.resetPadding(); 925 style.resetPadding();
907 926
908 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 927 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
909 // for now, we will not honor it. 928 // for now, we will not honor it.
910 style.resetBorder(); 929 style.resetBorder();
911 } 930 }
912 931
913 } // namespace blink 932 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698