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

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

Issue 15838011: Fix where the clear button will be drawn when adding padding to the input element. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 private: 130 private:
131 virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const OVERRIDE; 131 virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const OVERRIDE;
132 132
133 IntRect inflateRect(const IntRect&, const IntSize&, const int* margins, floa t zoomLevel = 1.0f) const; 133 IntRect inflateRect(const IntRect&, const IntSize&, const int* margins, floa t zoomLevel = 1.0f) const;
134 134
135 FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const Ren derObject* partRenderer, const FloatRect& inputRect, const IntRect&) const; 135 FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const Ren derObject* partRenderer, const FloatRect& inputRect, const IntRect&) const;
136 136
137 // Get the control size based off the font. Used by some of the controls (li ke buttons). 137 // Get the control size based off the font. Used by some of the controls (li ke buttons).
138 NSControlSize controlSizeForFont(RenderStyle*) const; 138 NSControlSize controlSizeForFont(RenderStyle*) const;
139 NSControlSize cancelButtonControlSizeForFont(RenderStyle*) const;
139 NSControlSize controlSizeForSystemFont(RenderStyle*) const; 140 NSControlSize controlSizeForSystemFont(RenderStyle*) const;
140 void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, f loat zoomLevel = 1.0f); 141 void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, f loat zoomLevel = 1.0f);
141 void setSizeFromFont(RenderStyle*, const IntSize* sizes) const; 142 void setSizeFromFont(RenderStyle*, const IntSize* sizes) const;
142 IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const; 143 IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const;
143 IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const; 144 IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const;
144 void setFontFromControlSize(StyleResolver*, RenderStyle*, NSControlSize) con st; 145 void setFontFromControlSize(StyleResolver*, RenderStyle*, NSControlSize) con st;
145 146
146 void updateCheckedState(NSCell*, const RenderObject*); 147 void updateCheckedState(NSCell*, const RenderObject*);
147 void updateEnabledState(NSCell*, const RenderObject*); 148 void updateEnabledState(NSCell*, const RenderObject*);
148 void updateFocusedState(NSCell*, const RenderObject*); 149 void updateFocusedState(NSCell*, const RenderObject*);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 bool m_isSliderThumbVerticalPressed; 221 bool m_isSliderThumbVerticalPressed;
221 222
222 mutable HashMap<int, RGBA32> m_systemColorCache; 223 mutable HashMap<int, RGBA32> m_systemColorCache;
223 224
224 RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver; 225 RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver;
225 }; 226 };
226 227
227 } // namespace WebCore 228 } // namespace WebCore
228 229
229 #endif // RenderThemeChromiumMac_h 230 #endif // RenderThemeChromiumMac_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698