Title: [102660] trunk/Source/WebCore
- Revision
- 102660
- Author
- [email protected]
- Date
- 2011-12-13 00:17:31 -0800 (Tue, 13 Dec 2011)
Log Message
RenderTheme should have a function for disabled text color adjustment
https://bugs.webkit.org/show_bug.cgi?id=74143
Change disabledTextColor to private method.
Patch by Yosifumi Inoue <[email protected]> on 2011-12-13
Reviewed by Kent Tamura.
No new tests / existing tests cover this change.
* rendering/RenderThemeChromiumMac.h: Change disabledTextColor to private.
* rendering/RenderThemeChromiumSkia.h: Change disabledTextColor to private.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102659 => 102660)
--- trunk/Source/WebCore/ChangeLog 2011-12-13 08:02:10 UTC (rev 102659)
+++ trunk/Source/WebCore/ChangeLog 2011-12-13 08:17:31 UTC (rev 102660)
@@ -1,3 +1,17 @@
+2011-12-13 Yosifumi Inoue <[email protected]>
+
+ RenderTheme should have a function for disabled text color adjustment
+ https://bugs.webkit.org/show_bug.cgi?id=74143
+
+ Change disabledTextColor to private method.
+
+ Reviewed by Kent Tamura.
+
+ No new tests / existing tests cover this change.
+
+ * rendering/RenderThemeChromiumMac.h: Change disabledTextColor to private.
+ * rendering/RenderThemeChromiumSkia.h: Change disabledTextColor to private.
+
2011-12-12 Daniel Bates <[email protected]>
Unreviewed, rolling out r102656.
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h (102659 => 102660)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h 2011-12-13 08:02:10 UTC (rev 102659)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h 2011-12-13 08:17:31 UTC (rev 102660)
@@ -32,8 +32,6 @@
public:
static PassRefPtr<RenderTheme> create();
- virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }
-
protected:
#if ENABLE(VIDEO)
virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
@@ -62,6 +60,7 @@
virtual int popupInternalPaddingRight(RenderStyle*) const;
private:
+ virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }
virtual void updateActiveState(NSCell*, const RenderObject*);
virtual String extraDefaultStyleSheet();
virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h (102659 => 102660)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h 2011-12-13 08:02:10 UTC (rev 102659)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h 2011-12-13 08:17:31 UTC (rev 102660)
@@ -58,8 +58,6 @@
virtual Color platformInactiveSelectionForegroundColor() const;
virtual Color platformFocusRingColor() const;
- virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }
-
// To change the blink interval, override caretBlinkIntervalInternal instead of this one so that we may share layout test code an intercepts.
virtual double caretBlinkInterval() const;
@@ -154,6 +152,7 @@
#endif
private:
+ virtual Color disabledTextColor(const Color& textColor, const Color&) const OVERRIDE { return textColor; }
virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;
int menuListInternalPadding(RenderStyle*, int paddingType) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
