summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 18:42:38 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 18:42:38 +0000
commit897d25b4d9dcd526ae97fb6fe990ed287ff214eb (patch)
tree14654f07b7cd32446b294988fa11cd264aa16175 /webkit
parent378aa56ae0fd1ab0f631d2e44f47cf14b344f657 (diff)
downloadchromium_src-897d25b4d9dcd526ae97fb6fe990ed287ff214eb.zip
chromium_src-897d25b4d9dcd526ae97fb6fe990ed287ff214eb.tar.gz
chromium_src-897d25b4d9dcd526ae97fb6fe990ed287ff214eb.tar.bz2
Revert caret blinking because I didn't do it right.
Review URL: http://codereview.chromium.org/12643 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index c086823..a740c9e 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -182,15 +182,6 @@ static void setSizeIfAuto(RenderStyle* style, const IntSize& size)
style->setHeight(Length(size.height(), Fixed));
}
-static double querySystemBlinkInterval() {
- UINT blinkTime = ::GetCaretBlinkTime();
- if (blinkTime == 0)
- return RenderTheme::caretBlinkFrequency();
- if (blinkTime == INFINITE)
- return 0;
- return blinkTime / 1000.0;
-}
-
// Implement WebCore::theme() for getting the global RenderTheme.
RenderTheme* theme()
{
@@ -252,9 +243,8 @@ double RenderThemeWin::caretBlinkFrequency() const
if (ChromiumBridge::layoutTestMode())
return 0;
- // This involves a system call, so we cache the result.
- static double blinkInterval = querySystemBlinkInterval();
- return blinkInterval;
+ // TODO(ericroman): this should be using the platform's blink frequency.
+ return RenderTheme::caretBlinkFrequency();
}
void RenderThemeWin::systemFont(int propId, Document* document, FontDescription& fontDescription) const