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

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

Issue 536973002: Revert 180822 "Specify clip rects when drawing Mac native widgets" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2145/
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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderThemeChromiumMac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const OVERRIDE; 115 virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const OVERRIDE;
116 virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, con st IntRect&) OVERRIDE; 116 virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, con st IntRect&) OVERRIDE;
117 117
118 virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const OVERRIDE; 118 virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const OVERRIDE;
119 virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInf o&, const IntRect&) OVERRIDE; 119 virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInf o&, const IntRect&) OVERRIDE;
120 120
121 private: 121 private:
122 virtual String fileListNameForWidth(Locale&, const FileList*, const Font&, i nt width) const OVERRIDE; 122 virtual String fileListNameForWidth(Locale&, const FileList*, const Font&, i nt width) const OVERRIDE;
123 123
124 IntRect inflateRect(const IntRect&, const IntSize&, const int* margins, floa t zoomLevel = 1.0f) const;
125
124 FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const Ren derObject* partRenderer, const FloatRect& inputRect, const IntRect&) const; 126 FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const Ren derObject* partRenderer, const FloatRect& inputRect, const IntRect&) const;
125 127
126 // Get the control size based off the font. Used by some of the controls (li ke buttons). 128 // Get the control size based off the font. Used by some of the controls (li ke buttons).
127 NSControlSize controlSizeForFont(RenderStyle*) const; 129 NSControlSize controlSizeForFont(RenderStyle*) const;
128 NSControlSize controlSizeForSystemFont(RenderStyle*) const; 130 NSControlSize controlSizeForSystemFont(RenderStyle*) const;
129 void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, f loat zoomLevel = 1.0f); 131 void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, f loat zoomLevel = 1.0f);
130 void setSizeFromFont(RenderStyle*, const IntSize* sizes) const; 132 void setSizeFromFont(RenderStyle*, const IntSize* sizes) const;
131 IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const; 133 IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const;
132 IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const; 134 IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const;
133 void setFontFromControlSize(RenderStyle*, NSControlSize) const; 135 void setFontFromControlSize(RenderStyle*, NSControlSize) const;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 mutable RetainPtr<NSTextFieldCell> m_textField; 201 mutable RetainPtr<NSTextFieldCell> m_textField;
200 202
201 mutable HashMap<int, RGBA32> m_systemColorCache; 203 mutable HashMap<int, RGBA32> m_systemColorCache;
202 204
203 RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver; 205 RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver;
204 }; 206 };
205 207
206 } // namespace blink 208 } // namespace blink
207 209
208 #endif // RenderThemeChromiumMac_h 210 #endif // RenderThemeChromiumMac_h
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderThemeChromiumMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698