summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 00:04:05 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 00:04:05 +0000
commit66a257de543be47887bc1f6b6944c79df86adbc1 (patch)
treee3e051e9d5071719e4e191d6f9f579a923b17e59 /webkit
parent884db41554423ec017c57709f92cc2379e0cc02d (diff)
downloadchromium_src-66a257de543be47887bc1f6b6944c79df86adbc1.zip
chromium_src-66a257de543be47887bc1f6b6944c79df86adbc1.tar.gz
chromium_src-66a257de543be47887bc1f6b6944c79df86adbc1.tar.bz2
Fix a regression in RenderThemeGtk.
Review URL: http://codereview.chromium.org/12617 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/platform/chromium/RenderThemeGtk.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/port/platform/chromium/RenderThemeGtk.cpp b/webkit/port/platform/chromium/RenderThemeGtk.cpp
index 43d2e12..d4382bb 100644
--- a/webkit/port/platform/chromium/RenderThemeGtk.cpp
+++ b/webkit/port/platform/chromium/RenderThemeGtk.cpp
@@ -263,8 +263,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 0;
+ 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();