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

Side by Side Diff: Source/core/rendering/RenderTheme.cpp

Issue 194273004: Check if input element is a range control before painting slider ticks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: moved test Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/forms/datalist/slider-appearance-with-ticks-crash-expected.txt ('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 * 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 return true; 861 return true;
862 } 862 }
863 863
864 void RenderTheme::paintSliderTicks(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect) 864 void RenderTheme::paintSliderTicks(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
865 { 865 {
866 Node* node = o->node(); 866 Node* node = o->node();
867 if (!node || !node->hasTagName(inputTag)) 867 if (!node || !node->hasTagName(inputTag))
868 return; 868 return;
869 869
870 HTMLInputElement* input = toHTMLInputElement(node); 870 HTMLInputElement* input = toHTMLInputElement(node);
871 if (!input->isRangeControl())
872 return;
873
871 HTMLDataListElement* dataList = input->dataList(); 874 HTMLDataListElement* dataList = input->dataList();
872 if (!dataList) 875 if (!dataList)
873 return; 876 return;
874 877
875 double min = input->minimum(); 878 double min = input->minimum();
876 double max = input->maximum(); 879 double max = input->maximum();
877 ControlPart part = o->style()->appearance(); 880 ControlPart part = o->style()->appearance();
878 // We don't support ticks on alternate sliders like MediaVolumeSliders. 881 // We don't support ticks on alternate sliders like MediaVolumeSliders.
879 if (part != SliderHorizontalPart && part != SliderVerticalPart) 882 if (part != SliderHorizontalPart && part != SliderVerticalPart)
880 return; 883 return;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 1251
1249 // padding - not honored by WinIE, needs to be removed. 1252 // padding - not honored by WinIE, needs to be removed.
1250 style->resetPadding(); 1253 style->resetPadding();
1251 1254
1252 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 1255 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
1253 // for now, we will not honor it. 1256 // for now, we will not honor it.
1254 style->resetBorder(); 1257 style->resetBorder();
1255 } 1258 }
1256 1259
1257 } // namespace WebCore 1260 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/forms/datalist/slider-appearance-with-ticks-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698