diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 02:36:26 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 02:36:26 +0000 |
| commit | 7ffba7b2ba94b74d1c6530c9c102f12f084fc7a6 (patch) | |
| tree | 9809b4d0b6613c309e016aa96a0397d95ad74094 | |
| parent | 8c9526605a46e6b4375b43a824d03ec4876573e0 (diff) | |
| download | chromium_src-7ffba7b2ba94b74d1c6530c9c102f12f084fc7a6.zip chromium_src-7ffba7b2ba94b74d1c6530c9c102f12f084fc7a6.tar.gz chromium_src-7ffba7b2ba94b74d1c6530c9c102f12f084fc7a6.tar.bz2 | |
Revert my caret blinking change for now.
Review URL: http://codereview.chromium.org/12419
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5961 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/port/platform/chromium/RenderThemeGtk.cpp | 7 | ||||
| -rw-r--r-- | webkit/port/rendering/RenderThemeWin.cpp | 2 |
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(); |