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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

Issue 2508743002: Changed EWhiteSpace to an enum class and renamed its members to keywords (Closed)
Patch Set: Small mac fix Created 4 years 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 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Google, Inc. 3 * Copyright (C) 2008, 2009 Google, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 Element* e) const { 711 Element* e) const {
712 NSControlSize controlSize = controlSizeForFont(style); 712 NSControlSize controlSize = controlSizeForFont(style);
713 713
714 style.resetBorder(); 714 style.resetBorder();
715 style.resetPadding(); 715 style.resetPadding();
716 716
717 // Height is locked to auto. 717 // Height is locked to auto.
718 style.setHeight(Length(Auto)); 718 style.setHeight(Length(Auto));
719 719
720 // White-space is locked to pre. 720 // White-space is locked to pre.
721 style.setWhiteSpace(PRE); 721 style.setWhiteSpace(EWhiteSpace::Pre);
722 722
723 // Set the foreground color to black or gray when we have the aqua look. 723 // Set the foreground color to black or gray when we have the aqua look.
724 // Cast to RGB32 is to work around a compiler bug. 724 // Cast to RGB32 is to work around a compiler bug.
725 style.setColor(e && !e->isDisabledFormControl() 725 style.setColor(e && !e->isDisabledFormControl()
726 ? static_cast<RGBA32>(Color::black) 726 ? static_cast<RGBA32>(Color::black)
727 : Color::darkGray); 727 : Color::darkGray);
728 728
729 // Set the button's vertical size. 729 // Set the button's vertical size.
730 setSizeFromFont(style, menuListButtonSizes()); 730 setSizeFromFont(style, menuListButtonSizes());
731 731
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 } 1102 }
1103 1103
1104 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const { 1104 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const {
1105 ControlPart part = style.appearance(); 1105 ControlPart part = style.appearance();
1106 if (part == CheckboxPart || part == RadioPart) 1106 if (part == CheckboxPart || part == RadioPart)
1107 return style.effectiveZoom() != 1; 1107 return style.effectiveZoom() != 1;
1108 return false; 1108 return false;
1109 } 1109 }
1110 1110
1111 } // namespace blink 1111 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTheme.cpp ('k') | third_party/WebKit/Source/core/layout/line/BreakingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698