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

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

Issue 2270833002: Fix the crash of issue 2209773002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another crash. 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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 { 628 {
629 return inputElement->isSteppable() && inputElement->type() != InputTypeNames ::range; 629 return inputElement->isSteppable() && inputElement->type() != InputTypeNames ::range;
630 } 630 }
631 631
632 void LayoutTheme::adjustMenuListButtonStyle(ComputedStyle&, Element*) const 632 void LayoutTheme::adjustMenuListButtonStyle(ComputedStyle&, Element*) const
633 { 633 {
634 } 634 }
635 635
636 void LayoutTheme::adjustSliderContainerStyle(ComputedStyle& style, Element* e) c onst 636 void LayoutTheme::adjustSliderContainerStyle(ComputedStyle& style, Element* e) c onst
637 { 637 {
638 if (e->shadowPseudoId() == "-webkit-media-slider-container" || e->shadowPseu doId() == "-webkit-slider-container") { 638 if (e && (e->shadowPseudoId() == "-webkit-media-slider-container" || e->shad owPseudoId() == "-webkit-slider-container")) {
639 if (style.appearance() == SliderVerticalPart) { 639 if (style.appearance() == SliderVerticalPart) {
640 style.setTouchAction(TouchActionPanX); 640 style.setTouchAction(TouchActionPanX);
641 style.setAppearance(NoControlPart); 641 style.setAppearance(NoControlPart);
642 } else { 642 } else {
643 style.setTouchAction(TouchActionPanY); 643 style.setTouchAction(TouchActionPanY);
644 style.setAppearance(NoControlPart); 644 style.setAppearance(NoControlPart);
645 } 645 }
646 } 646 }
647 } 647 }
648 648
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 933
934 // padding - not honored by WinIE, needs to be removed. 934 // padding - not honored by WinIE, needs to be removed.
935 style.resetPadding(); 935 style.resetPadding();
936 936
937 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 937 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
938 // for now, we will not honor it. 938 // for now, we will not honor it.
939 style.resetBorder(); 939 style.resetBorder();
940 } 940 }
941 941
942 } // namespace blink 942 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698