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

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

Issue 438843004: Move the user agent styles sheets to blink_resources.grd (Part 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #import "config.h" 21 #import "config.h"
22 #import "core/rendering/RenderThemeChromiumMac.h" 22 #import "core/rendering/RenderThemeChromiumMac.h"
23 23
24 #import "core/CSSValueKeywords.h" 24 #import "core/CSSValueKeywords.h"
25 #import "core/HTMLNames.h" 25 #import "core/HTMLNames.h"
26 #import "core/UserAgentStyleSheets.h"
27 #import "core/css/CSSValueList.h" 26 #import "core/css/CSSValueList.h"
28 #import "core/dom/Document.h" 27 #import "core/dom/Document.h"
29 #import "core/dom/Element.h" 28 #import "core/dom/Element.h"
30 #import "core/fileapi/FileList.h" 29 #import "core/fileapi/FileList.h"
31 #import "core/html/HTMLInputElement.h" 30 #import "core/html/HTMLInputElement.h"
32 #import "core/html/HTMLMediaElement.h" 31 #import "core/html/HTMLMediaElement.h"
33 #import "core/html/HTMLMeterElement.h" 32 #import "core/html/HTMLMeterElement.h"
34 #import "core/html/TimeRanges.h" 33 #import "core/html/TimeRanges.h"
35 #import "core/html/shadow/MediaControlElements.h" 34 #import "core/html/shadow/MediaControlElements.h"
36 #import "core/frame/FrameView.h" 35 #import "core/frame/FrameView.h"
(...skipping 11 matching lines...) Expand all
48 #import "platform/graphics/BitmapImage.h" 47 #import "platform/graphics/BitmapImage.h"
49 #import "platform/graphics/GraphicsContextStateSaver.h" 48 #import "platform/graphics/GraphicsContextStateSaver.h"
50 #import "platform/graphics/Image.h" 49 #import "platform/graphics/Image.h"
51 #import "platform/graphics/ImageBuffer.h" 50 #import "platform/graphics/ImageBuffer.h"
52 #import "platform/mac/ColorMac.h" 51 #import "platform/mac/ColorMac.h"
53 #import "platform/mac/LocalCurrentGraphicsContext.h" 52 #import "platform/mac/LocalCurrentGraphicsContext.h"
54 #import "platform/mac/ThemeMac.h" 53 #import "platform/mac/ThemeMac.h"
55 #import "platform/mac/WebCoreNSCellExtras.h" 54 #import "platform/mac/WebCoreNSCellExtras.h"
56 #import "platform/text/PlatformLocale.h" 55 #import "platform/text/PlatformLocale.h"
57 #import "platform/text/StringTruncator.h" 56 #import "platform/text/StringTruncator.h"
57 #import "public/platform/Platform.h"
58 #import "public/platform/WebData.h"
58 59
59 #import <AvailabilityMacros.h> 60 #import <AvailabilityMacros.h>
60 #import <Carbon/Carbon.h> 61 #import <Carbon/Carbon.h>
61 #import <Cocoa/Cocoa.h> 62 #import <Cocoa/Cocoa.h>
62 #import <math.h> 63 #import <math.h>
63 #import <wtf/RetainPtr.h> 64 #import <wtf/RetainPtr.h>
64 #import <wtf/StdLibExtras.h> 65 #import <wtf/StdLibExtras.h>
65 66
66 // The methods in this file are specific to the Mac OS X platform. 67 // The methods in this file are specific to the Mac OS X platform.
67 68
(...skipping 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 } 1801 }
1801 1802
1802 String RenderThemeChromiumMac::extraFullScreenStyleSheet() 1803 String RenderThemeChromiumMac::extraFullScreenStyleSheet()
1803 { 1804 {
1804 // FIXME: Chromium may wish to style its default media controls differently in fullscreen. 1805 // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
1805 return String(); 1806 return String();
1806 } 1807 }
1807 1808
1808 String RenderThemeChromiumMac::extraDefaultStyleSheet() 1809 String RenderThemeChromiumMac::extraDefaultStyleSheet()
1809 { 1810 {
1810 return RenderTheme::extraDefaultStyleSheet() + 1811 const WebData& themeChromiumCssResource = Platform::current()->loadResource( "themeChromium.css");
1811 String(themeChromiumCss, sizeof(themeChromiumCss)) + 1812 String themeChromiumRules = themeChromiumCssResource.toASCIIString();
1812 String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss)) + 1813 ASSERT(!themeChromiumRules.isEmpty());
1813 String(themeMacCss, sizeof(themeMacCss)); 1814
1815 const WebData& themeInputMultipleFieldsCssResource = Platform::current()->lo adResource("themeInputMultipleFields.css");
1816 String themeInputMultipleFieldsRules = themeInputMultipleFieldsCssResource.t oASCIIString();
1817 ASSERT(!themeInputMultipleFieldsRules.isEmpty());
1818
1819 const WebData& themeMacCssResource = Platform::current()->loadResource("them eMac.css");
1820 String themeMacRules = themeMacCssResource.toASCIIString();
1821 ASSERT(!themeMacRules.isEmpty());
1822
1823 return RenderTheme::extraDefaultStyleSheet() + themeChromiumRules + themeInp utMultipleFieldsRules + themeMacRules;
1814 } 1824 }
1815 1825
1816 bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* objec t, const PaintInfo& paintInfo, const IntRect& rect) 1826 bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* objec t, const PaintInfo& paintInfo, const IntRect& rect)
1817 { 1827 {
1818 return true; 1828 return true;
1819 } 1829 }
1820 1830
1821 bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, c onst PaintInfo& paintInfo, const IntRect& rect) 1831 bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, c onst PaintInfo& paintInfo, const IntRect& rect)
1822 { 1832 {
1823 return RenderMediaControls::paintMediaControlsPart(MediaVolumeSlider, object , paintInfo, rect); 1833 return RenderMediaControls::paintMediaControlsPart(MediaVolumeSlider, object , paintInfo, rect);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1855 1865
1856 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const 1866 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
1857 { 1867 {
1858 ControlPart part = style->appearance(); 1868 ControlPart part = style->appearance();
1859 if (part == CheckboxPart || part == RadioPart) 1869 if (part == CheckboxPart || part == RadioPart)
1860 return style->effectiveZoom() != 1; 1870 return style->effectiveZoom() != 1;
1861 return false; 1871 return false;
1862 } 1872 }
1863 1873
1864 } // namespace blink 1874 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698