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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumMac.mm

Issue 18181010: Simplify media controls CSS (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename mediaControlsChromiumAndroid.css to mediaControlsAndroid.css Created 7 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 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* object, const Pa intInfo& paintInfo, const IntRect& rect) 1946 bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* object, const Pa intInfo& paintInfo, const IntRect& rect)
1947 { 1947 {
1948 return RenderMediaControlsChromium::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect); 1948 return RenderMediaControlsChromium::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect);
1949 } 1949 }
1950 1950
1951 bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, const P aintInfo& paintInfo, const IntRect& rect) 1951 bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, const P aintInfo& paintInfo, const IntRect& rect)
1952 { 1952 {
1953 return RenderMediaControlsChromium::paintMediaControlsPart(MediaSlider, obje ct, paintInfo, rect); 1953 return RenderMediaControlsChromium::paintMediaControlsPart(MediaSlider, obje ct, paintInfo, rect);
1954 } 1954 }
1955 1955
1956 String RenderThemeChromiumMac::extraMediaControlsStyleSheet()
1957 {
1958 return String(mediaControlsChromiumUserAgentStyleSheet, sizeof(mediaControls ChromiumUserAgentStyleSheet));
1959 }
1960
1961 String RenderThemeChromiumMac::extraFullScreenStyleSheet() 1956 String RenderThemeChromiumMac::extraFullScreenStyleSheet()
1962 { 1957 {
1963 // FIXME: Chromium may wish to style its default media controls differently in fullscreen. 1958 // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
1964 return String(); 1959 return String();
1965 } 1960 }
1966 1961
1967 String RenderThemeChromiumMac::extraDefaultStyleSheet() 1962 String RenderThemeChromiumMac::extraDefaultStyleSheet()
1968 { 1963 {
1969 return RenderTheme::extraDefaultStyleSheet() + 1964 return RenderTheme::extraDefaultStyleSheet() +
1970 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgen tStyleSheet)); 1965 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgen tStyleSheet));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
2012 2007
2013 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const 2008 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
2014 { 2009 {
2015 ControlPart part = style->appearance(); 2010 ControlPart part = style->appearance();
2016 if (part == CheckboxPart || part == RadioPart) 2011 if (part == CheckboxPart || part == RadioPart)
2017 return style->effectiveZoom() != 1; 2012 return style->effectiveZoom() != 1;
2018 return false; 2013 return false;
2019 } 2014 }
2020 2015
2021 } // namespace WebCore 2016 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.h ('k') | Source/core/rendering/RenderThemeChromiumSkia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698