summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/port/platform/chromium/RenderThemeGtk.cpp7
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp2
2 files changed, 6 insertions, 3 deletions
diff --git a/webkit/port/platform/chromium/RenderThemeGtk.cpp b/webkit/port/platform/chromium/RenderThemeGtk.cpp
index b261b6e..7059d0c 100644
--- a/webkit/port/platform/chromium/RenderThemeGtk.cpp
+++ b/webkit/port/platform/chromium/RenderThemeGtk.cpp
@@ -261,8 +261,11 @@ double RenderThemeGtk::caretBlinkFrequency() const
{
// Disable the blinking caret in layout test mode, as it introduces
// a race condition for the pixel tests. http://b/1198440
- if (ChromiumBridge::layoutTestMode())
- return 999999999;
+ if (ChromiumBridge::layoutTestMode()) {
+ // TODO(port): We need to disable this under linux, but returning 0
+ // (like Windows does) sends gtk into an infinite expose loop. Do
+ // something about this later.
+ }
GtkSettings* settings = gtk_settings_get_default();
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 3536d4d..50d5b35 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -241,7 +241,7 @@ double RenderThemeWin::caretBlinkFrequency() const
// Disable the blinking caret in layout test mode, as it introduces
// a race condition for the pixel tests. http://b/1198440
if (ChromiumBridge::layoutTestMode())
- return 999999999;
+ return 0;
// TODO(ericroman): this should be using the platform's blink frequency.
return RenderTheme::caretBlinkFrequency();