Delay instantiating InputDeviceCapabilities until accessed.

third_party/WebKit/Source/core/dom/Element.h

Index: third_party/WebKit/Source/core/dom/Element.h
diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
index 8a26e38bde88c7f6809dcd81070e0e62cd5c169b..87fc4e0a01371d07426b6ab1dcd8859738bbca84 100644
--- a/third_party/WebKit/Source/core/dom/Element.h
+++ b/third_party/WebKit/Source/core/dom/Element.h
@@ -37,6 +37,7 @@
 #include "core/dom/ElementData.h"
 #include "core/dom/SpaceSplitString.h"
 #include "core/html/CollectionType.h"
+#include "core/input/InputDeviceCapabilities.h"
 #include "platform/heap/Handle.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "public/platform/WebFocusType.h"
@@ -57,7 +58,6 @@ class ElementRareData;
 class ElementShadow;
 class ExceptionState;
 class Image;
-class InputDeviceCapabilities;
 class Locale;
 class MutableStylePropertySet;
 class NamedNodeMap;
@@ -107,7 +107,7 @@ struct FocusParams {
   FocusParams() {}
   FocusParams(SelectionBehaviorOnFocus selection,
               WebFocusType focusType,
-              InputDeviceCapabilities* capabilities)
+              const InputDeviceCapabilitiesValue& capabilities)
       : selectionBehavior(selection),
         type(focusType),
         sourceCapabilities(capabilities) {}
@@ -115,7 +115,7 @@ struct FocusParams {
   SelectionBehaviorOnFocus selectionBehavior =
       SelectionBehaviorOnFocus::Restore;
   WebFocusType type = WebFocusTypeNone;
-  Member<InputDeviceCapabilities> sourceCapabilities = nullptr;
+  InputDeviceCapabilitiesValue sourceCapabilities;
 };
 
 typedef HeapVector<Member<Attr>> AttrNodeList;
@@ -534,23 +534,19 @@ class CORE_EXPORT Element : public ContainerNode {
   bool isFocusedElementInDocument() const;
   Element* adjustedFocusedElementInTreeScope() const;
 
-  virtual void dispatchFocusEvent(
-      Element* oldFocusedElement,
-      WebFocusType,
-      InputDeviceCapabilities* sourceCapabilities = nullptr);
-  virtual void dispatchBlurEvent(
-      Element* newFocusedElement,
-      WebFocusType,
-      InputDeviceCapabilities* sourceCapabilities = nullptr);
-  virtual void dispatchFocusInEvent(
-      const AtomicString& eventType,
-      Element* oldFocusedElement,
-      WebFocusType,
-      InputDeviceCapabilities* sourceCapabilities = nullptr);
-  void dispatchFocusOutEvent(
-      const AtomicString& eventType,
-      Element* newFocusedElement,
-      InputDeviceCapabilities* sourceCapabilities = nullptr);
+  virtual void dispatchFocusEvent(Element* oldFocusedElement,
+                                  WebFocusType,
+                                  const InputDeviceCapabilitiesValue&);
+  virtual void dispatchBlurEvent(Element* newFocusedElement,
+                                 WebFocusType,
+                                 const InputDeviceCapabilitiesValue&);
+  virtual void dispatchFocusInEvent(const AtomicString& eventType,
+                                    Element* oldFocusedElement,
+                                    WebFocusType,
+                                    const InputDeviceCapabilitiesValue&);
+  void dispatchFocusOutEvent(const AtomicString& eventType,
+                             Element* newFocusedElement,
+                             const InputDeviceCapabilitiesValue&);
 
   virtual String innerText();
   String outerText();