diff options
author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebCore/rendering/RenderThemeChromiumLinux.h | |
parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebCore/rendering/RenderThemeChromiumLinux.h')
-rw-r--r-- | WebCore/rendering/RenderThemeChromiumLinux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderThemeChromiumLinux.h b/WebCore/rendering/RenderThemeChromiumLinux.h index 90b043d..c60dec3 100644 --- a/WebCore/rendering/RenderThemeChromiumLinux.h +++ b/WebCore/rendering/RenderThemeChromiumLinux.h @@ -56,7 +56,7 @@ namespace WebCore { virtual void adjustSliderThumbSize(RenderObject*) const; - void setCaretBlinkInterval(double interval); + static void setCaretBlinkInterval(double interval); virtual double caretBlinkIntervalInternal() const; static void setSelectionColors(unsigned activeBackgroundColor, @@ -78,7 +78,7 @@ namespace WebCore { // A general method asking if any control tinting is supported at all. virtual bool supportsControlTints() const; - double m_caretBlinkInterval; + static double m_caretBlinkInterval; static unsigned m_activeSelectionBackgroundColor; static unsigned m_activeSelectionForegroundColor; |