Move logic to turn off caret blinking for LayoutTests to LayoutTheme.

third_party/WebKit/Source/core/layout/LayoutTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 29 matching lines @@
 #include "core/html/shadow/MediaControlElements.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/SpinButtonElement.h"
 #include "core/html/shadow/TextControlInnerElements.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutThemeMobile.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/FileMetadata.h"
+#include "platform/LayoutTestSupport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/Theme.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/text/PlatformLocale.h"
 #include "platform/text/StringTruncator.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFallbackThemeEngine.h"
 #include "public/platform/WebRect.h"
 #include "wtf/text/StringBuilder.h"
 
@@ skipping 586 matching lines @@
 
 void LayoutTheme::platformColorsDidChange() {
   Page::platformColorsChanged();
 }
 
 void LayoutTheme::setCaretBlinkInterval(double interval) {
   m_caretBlinkInterval = interval;
 }
 
 double LayoutTheme::caretBlinkInterval() const {
-  return m_caretBlinkInterval;
+  // Disable the blinking caret in layout test mode, as it introduces
+  // a race condition for the pixel tests. http://b/1198440
+  return LayoutTestSupport::isRunningLayoutTest() ? 0 : m_caretBlinkInterval;
 }
 
 static FontDescription& getCachedFontDescription(CSSValueID systemFontID) {
   DEFINE_STATIC_LOCAL(FontDescription, caption, ());
   DEFINE_STATIC_LOCAL(FontDescription, icon, ());
   DEFINE_STATIC_LOCAL(FontDescription, menu, ());
   DEFINE_STATIC_LOCAL(FontDescription, messageBox, ());
   DEFINE_STATIC_LOCAL(FontDescription, smallCaption, ());
   DEFINE_STATIC_LOCAL(FontDescription, statusBar, ());
   DEFINE_STATIC_LOCAL(FontDescription, webkitMiniControl, ());
@@ skipping 242 matching lines @@
   // padding - not honored by WinIE, needs to be removed.
   style.resetPadding();
 
   // border - honored by WinIE, but looks terrible (just paints in the control
   // box and turns off the Windows XP theme)
   // for now, we will not honor it.
   style.resetBorder();
 }
 
 }  // namespace blink