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

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

Issue 12082066: Merge 140778 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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 22
23 #import "CalendarPickerMac.h"
24 #import "LayoutTestSupport.h" 23 #import "LayoutTestSupport.h"
25 #import "LocalCurrentGraphicsContext.h" 24 #import "LocalCurrentGraphicsContext.h"
26 #import "RenderThemeChromiumMac.h" 25 #import "RenderThemeChromiumMac.h"
27 #import "PaintInfo.h" 26 #import "PaintInfo.h"
28 #import "RenderMediaControlsChromium.h" 27 #import "RenderMediaControlsChromium.h"
29 #import "WebCoreSystemInterface.h" 28 #import "WebCoreSystemInterface.h"
30 #import "UserAgentStyleSheets.h" 29 #import "UserAgentStyleSheets.h"
31 #import <Carbon/Carbon.h> 30 #import <Carbon/Carbon.h>
32 #import <Cocoa/Cocoa.h> 31 #import <Cocoa/Cocoa.h>
33 #import <wtf/RetainPtr.h> 32 #import <wtf/RetainPtr.h>
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgen tStyleSheet)); 174 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgen tStyleSheet));
176 } 175 }
177 176
178 #if ENABLE(DATALIST_ELEMENT) 177 #if ENABLE(DATALIST_ELEMENT)
179 LayoutUnit RenderThemeChromiumMac::sliderTickSnappingThreshold() const 178 LayoutUnit RenderThemeChromiumMac::sliderTickSnappingThreshold() const
180 { 179 {
181 return RenderThemeChromiumCommon::sliderTickSnappingThreshold(); 180 return RenderThemeChromiumCommon::sliderTickSnappingThreshold();
182 } 181 }
183 #endif 182 #endif
184 183
185 #if ENABLE(CALENDAR_PICKER)
186 CString RenderThemeChromiumMac::extraCalendarPickerStyleSheet()
187 {
188 return CString(calendarPickerMacCss, WTF_ARRAY_LENGTH(calendarPickerMacCss)) ;
189 }
190 #endif
191
192 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) && ENABLE(CALENDAR_PICKER) 184 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) && ENABLE(CALENDAR_PICKER)
193 bool RenderThemeChromiumMac::supportsCalendarPicker(const AtomicString& type) co nst 185 bool RenderThemeChromiumMac::supportsCalendarPicker(const AtomicString& type) co nst
194 { 186 {
195 return RenderThemeChromiumCommon::supportsCalendarPicker(type); 187 return RenderThemeChromiumCommon::supportsCalendarPicker(type);
196 } 188 }
197 #endif 189 #endif
198 190
199 bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* objec t, const PaintInfo& paintInfo, const IntRect& rect) 191 bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* objec t, const PaintInfo& paintInfo, const IntRect& rect)
200 { 192 {
201 return true; 193 return true;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 return RenderMediaControlsChromium::paintMediaControlsPart(MediaEnterFullscr eenButton, object, paintInfo, rect); 233 return RenderMediaControlsChromium::paintMediaControlsPart(MediaEnterFullscr eenButton, object, paintInfo, rect);
242 } 234 }
243 235
244 bool RenderThemeChromiumMac::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect) 236 bool RenderThemeChromiumMac::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
245 { 237 {
246 return RenderMediaControlsChromium::paintMediaControlsPart(MediaShowClosedCa ptionsButton, object, paintInfo, rect); 238 return RenderMediaControlsChromium::paintMediaControlsPart(MediaShowClosedCa ptionsButton, object, paintInfo, rect);
247 } 239 }
248 #endif 240 #endif
249 241
250 } // namespace WebCore 242 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderThemeChromiumMac.h ('k') | Source/WebKit/chromium/src/DateTimeChooserImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698