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

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

Issue 1156993013: New media playback UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: manual rebaseline. Created 5 years, 5 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 * 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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 { 1008 {
1009 return -9; 1009 return -9;
1010 } 1010 }
1011 1011
1012 void LayoutThemeMac::adjustSliderThumbSize(ComputedStyle& style, Element*) const 1012 void LayoutThemeMac::adjustSliderThumbSize(ComputedStyle& style, Element*) const
1013 { 1013 {
1014 float zoomLevel = style.effectiveZoom(); 1014 float zoomLevel = style.effectiveZoom();
1015 if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) { 1015 if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) {
1016 style.setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fi xed)); 1016 style.setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fi xed));
1017 style.setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed)); 1017 style.setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
1018 } else {
1019 adjustMediaSliderThumbSize(style);
philipj_slow 2015/07/08 10:31:52 Why was this change needed?
liberato (no reviews please) 2015/07/09 12:10:56 the original adjust..Size() did nothing unless the
1018 } 1020 }
1019
1020 adjustMediaSliderThumbSize(style);
1021 } 1021 }
1022 1022
1023 NSPopUpButtonCell* LayoutThemeMac::popupButton() const 1023 NSPopUpButtonCell* LayoutThemeMac::popupButton() const
1024 { 1024 {
1025 if (!m_popupButton) { 1025 if (!m_popupButton) {
1026 m_popupButton.adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsD own:NO]); 1026 m_popupButton.adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsD own:NO]);
1027 [m_popupButton.get() setUsesItemFromMenu:NO]; 1027 [m_popupButton.get() setUsesItemFromMenu:NO];
1028 [m_popupButton.get() setFocusRingType:NSFocusRingTypeExterior]; 1028 [m_popupButton.get() setFocusRingType:NSFocusRingTypeExterior];
1029 } 1029 }
1030 1030
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 1169
1170 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const 1170 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
1171 { 1171 {
1172 ControlPart part = style.appearance(); 1172 ControlPart part = style.appearance();
1173 if (part == CheckboxPart || part == RadioPart) 1173 if (part == CheckboxPart || part == RadioPart)
1174 return style.effectiveZoom() != 1; 1174 return style.effectiveZoom() != 1;
1175 return false; 1175 return false;
1176 } 1176 }
1177 1177
1178 } // namespace blink 1178 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698