Track constant InputDeviceCapabilities objects per-window.

third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp

Index: third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp
diff --git a/third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp b/third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp
index 63309b8b450a04b6b65e7fb7aa4e6981b7379100..f112e2aad697939cb503e712893d2f30c205afb7 100644
--- a/third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp
+++ b/third_party/WebKit/Source/core/input/InputDeviceCapabilities.cpp
@@ -15,18 +15,16 @@ InputDeviceCapabilities::InputDeviceCapabilities(
   m_firesTouchEvents = initializer.firesTouchEvents();
 }
 
-InputDeviceCapabilities*
-InputDeviceCapabilities::firesTouchEventsSourceCapabilities() {
-  DEFINE_STATIC_LOCAL(InputDeviceCapabilities, instance,
-                      (InputDeviceCapabilities::create(true)));
-  return &instance;
-}
-
-InputDeviceCapabilities*
-InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities() {
-  DEFINE_STATIC_LOCAL(InputDeviceCapabilities, instance,
-                      (InputDeviceCapabilities::create(false)));
-  return &instance;
+InputDeviceCapabilities* InputDeviceCapabilitiesConstants::firesTouchEvents(
+    bool firesTouch) {
+  if (firesTouch) {
+    if (!m_firesTouchEvents)
+      m_firesTouchEvents = InputDeviceCapabilities::create(true);
+    return m_firesTouchEvents;
+  }
+  if (!m_doesntFireTouchEvents)
+    m_doesntFireTouchEvents = InputDeviceCapabilities::create(false);
+  return m_doesntFireTouchEvents;
 }
 
 }  // namespace blink