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

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

Issue 2758683002: Replace ASSERT_NOT_REACHED with NOTREACHED in core/layout/ (Closed)
Patch Set: Rebase with latest Created 3 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
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 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 return statusBar; 684 return statusBar;
685 case CSSValueWebkitMiniControl: 685 case CSSValueWebkitMiniControl:
686 return webkitMiniControl; 686 return webkitMiniControl;
687 case CSSValueWebkitSmallControl: 687 case CSSValueWebkitSmallControl:
688 return webkitSmallControl; 688 return webkitSmallControl;
689 case CSSValueWebkitControl: 689 case CSSValueWebkitControl:
690 return webkitControl; 690 return webkitControl;
691 case CSSValueNone: 691 case CSSValueNone:
692 return defaultDescription; 692 return defaultDescription;
693 default: 693 default:
694 ASSERT_NOT_REACHED(); 694 NOTREACHED();
695 return defaultDescription; 695 return defaultDescription;
696 } 696 }
697 } 697 }
698 698
699 void LayoutTheme::systemFont(CSSValueID systemFontID, 699 void LayoutTheme::systemFont(CSSValueID systemFontID,
700 FontDescription& fontDescription) { 700 FontDescription& fontDescription) {
701 fontDescription = getCachedFontDescription(systemFontID); 701 fontDescription = getCachedFontDescription(systemFontID);
702 if (fontDescription.isAbsoluteSize()) 702 if (fontDescription.isAbsoluteSize())
703 return; 703 return;
704 704
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 return activeListBoxSelectionBackgroundColor(); 779 return activeListBoxSelectionBackgroundColor();
780 case CSSValueInternalActiveListBoxSelectionText: 780 case CSSValueInternalActiveListBoxSelectionText:
781 return activeListBoxSelectionForegroundColor(); 781 return activeListBoxSelectionForegroundColor();
782 case CSSValueInternalInactiveListBoxSelection: 782 case CSSValueInternalInactiveListBoxSelection:
783 return inactiveListBoxSelectionBackgroundColor(); 783 return inactiveListBoxSelectionBackgroundColor();
784 case CSSValueInternalInactiveListBoxSelectionText: 784 case CSSValueInternalInactiveListBoxSelectionText:
785 return inactiveListBoxSelectionForegroundColor(); 785 return inactiveListBoxSelectionForegroundColor();
786 default: 786 default:
787 break; 787 break;
788 } 788 }
789 ASSERT_NOT_REACHED(); 789 NOTREACHED();
790 return Color(); 790 return Color();
791 } 791 }
792 792
793 Color LayoutTheme::platformTextSearchHighlightColor(bool activeMatch) const { 793 Color LayoutTheme::platformTextSearchHighlightColor(bool activeMatch) const {
794 if (activeMatch) 794 if (activeMatch)
795 return Color(255, 150, 50); // Orange. 795 return Color(255, 150, 50); // Orange.
796 return Color(255, 255, 0); // Yellow. 796 return Color(255, 255, 0); // Yellow.
797 } 797 }
798 798
799 Color LayoutTheme::platformTextSearchColor(bool activeMatch) const { 799 Color LayoutTheme::platformTextSearchColor(bool activeMatch) const {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 // padding - not honored by WinIE, needs to be removed. 911 // padding - not honored by WinIE, needs to be removed.
912 style.resetPadding(); 912 style.resetPadding();
913 913
914 // border - honored by WinIE, but looks terrible (just paints in the control 914 // border - honored by WinIE, but looks terrible (just paints in the control
915 // box and turns off the Windows XP theme) 915 // box and turns off the Windows XP theme)
916 // for now, we will not honor it. 916 // for now, we will not honor it.
917 style.resetBorder(); 917 style.resetBorder();
918 } 918 }
919 919
920 } // namespace blink 920 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableCol.h ('k') | third_party/WebKit/Source/core/layout/ListMarkerText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698