Source/WebCore/rendering/RenderThemeChromiumMac.h - Issue 12082066: Merge 140778

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

OLD	NEW
1 /*	1 /*

2 * This file is part of the theme implementation for form controls in WebCore.	2 * This file is part of the theme implementation for form controls in WebCore.

3 *	3 *

4 * Copyright (C) 2005 Apple Computer, Inc.	4 * Copyright (C) 2005 Apple Computer, Inc.

5 * Copyright (C) 2008, 2009 Google, Inc.	5 * Copyright (C) 2008, 2009 Google, Inc.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 virtual int popupInternalPaddingLeft(RenderStyle*) const;	67 virtual int popupInternalPaddingLeft(RenderStyle*) const;

68 virtual int popupInternalPaddingRight(RenderStyle*) const;	68 virtual int popupInternalPaddingRight(RenderStyle*) const;

69	69

70 private:	70 private:

71 virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }	71 virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }

72 virtual void updateActiveState(NSCell, const RenderObject);	72 virtual void updateActiveState(NSCell, const RenderObject);

73 virtual String extraDefaultStyleSheet();	73 virtual String extraDefaultStyleSheet();

74 #if ENABLE(DATALIST_ELEMENT)	74 #if ENABLE(DATALIST_ELEMENT)

75 virtual LayoutUnit sliderTickSnappingThreshold() const OVERRIDE;	75 virtual LayoutUnit sliderTickSnappingThreshold() const OVERRIDE;

76 #endif	76 #endif

77 #if ENABLE(CALENDAR_PICKER)

78 virtual CString extraCalendarPickerStyleSheet() OVERRIDE;

79 #endif

80 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)	77 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)

81 virtual bool supportsCalendarPicker(const AtomicString& type) const OVERRIDE ;	78 virtual bool supportsCalendarPicker(const AtomicString& type) const OVERRIDE ;

82 #endif	79 #endif

83 virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;	80 virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;

84 };	81 };

85	82

86 } // namespace WebCore	83 } // namespace WebCore

87	84

88 #endif // RenderThemeChromiumMac_h	85 #endif // RenderThemeChromiumMac_h

OLD	NEW

« no previous file with comments | « Source/WebCore/rendering/RenderTheme.cpp ('k') | Source/WebCore/rendering/RenderThemeChromiumMac.mm » ('j') | no next file with comments »