Delay instantiating InputDeviceCapabilities until accessed.

third_party/WebKit/Source/core/events/UIEvent.h

Index: third_party/WebKit/Source/core/events/UIEvent.h
diff --git a/third_party/WebKit/Source/core/events/UIEvent.h b/third_party/WebKit/Source/core/events/UIEvent.h
index 584b9760afb8a502b6edd142bc65f8bcf6832292..2e7ea335246387ca24b4697b78fc2df51150f057 100644
--- a/third_party/WebKit/Source/core/events/UIEvent.h
+++ b/third_party/WebKit/Source/core/events/UIEvent.h
@@ -29,11 +29,10 @@
 #include "core/events/EventDispatchMediator.h"
 #include "core/events/UIEventInit.h"
 #include "core/frame/DOMWindow.h"
+#include "core/input/InputDeviceCapabilities.h"
 
 namespace blink {
 
-class InputDeviceCapabilities;
-
 // FIXME: Get rid of this type alias.
 using AbstractView = DOMWindow;
 
@@ -53,19 +52,18 @@ class CORE_EXPORT UIEvent : public Event {
                    bool cancelable,
                    AbstractView*,
                    int detail);
-  void initUIEventInternal(const AtomicString& type,
-                           bool canBubble,
-                           bool cancelable,
-                           EventTarget* relatedTarget,
-                           AbstractView*,
-                           int detail,
-                           InputDeviceCapabilities* sourceCapabilities);
+  void initUIEventInternal(
+      const AtomicString& type,
+      bool canBubble,
+      bool cancelable,
+      EventTarget* relatedTarget,
+      AbstractView*,
+      int detail,
+      const InputDeviceCapabilitiesValue& sourceCapabilities);
 
   AbstractView* view() const { return m_view.get(); }
   int detail() const { return m_detail; }
-  InputDeviceCapabilities* sourceCapabilities() const {
-    return m_sourceCapabilities.get();
-  }
+  InputDeviceCapabilities* sourceCapabilities();
 
   const AtomicString& interfaceName() const override;
   bool isUIEvent() const final;
@@ -83,13 +81,17 @@ class CORE_EXPORT UIEvent : public Event {
           TimeTicks platformTimeStamp,
           AbstractView*,
           int detail,
-          InputDeviceCapabilities* sourceCapabilities);
+          const InputDeviceCapabilitiesValue& sourceCapabilities);
   UIEvent(const AtomicString&, const UIEventInit&);
 
+  const InputDeviceCapabilitiesValue& sourceCapabilitiesValue() const {
+    return m_sourceCapabilities;
+  }
+
  private:
   Member<AbstractView> m_view;
   int m_detail;
-  Member<InputDeviceCapabilities> m_sourceCapabilities;
+  InputDeviceCapabilitiesValue m_sourceCapabilities;
 };
 
 }  // namespace blink