Bug 910978 part.15 Implement nsFocusEvent::AssignFocusEventData() r=smaug

content/events/src/nsDOMEvent.cpp

@@ -655,9 +655,7 @@ nsDOMEvent::DuplicatePrivateData()
     {
       nsFocusEvent* newFocusEvent = new nsFocusEvent(false, msg);
       nsFocusEvent* oldFocusEvent = static_cast<nsFocusEvent*>(mEvent);
-      newFocusEvent->AssignGUIEventData(*oldFocusEvent, true);
-      newFocusEvent->fromRaise = oldFocusEvent->fromRaise;
-      newFocusEvent->isRefocus = oldFocusEvent->isRefocus;
+      newFocusEvent->AssignFocusEventData(*oldFocusEvent, true);
       newEvent = newFocusEvent;
       break;
     }

widget/nsGUIEvent.h

@@ -1908,6 +1908,15 @@ public:
 
   bool fromRaise;
   bool isRefocus;
+
+  void AssignFocusEventData(const nsFocusEvent& aEvent, bool aCopyTargets)
+  {
+    AssignUIEventData(aEvent, aCopyTargets);
+
+    relatedTarget = aCopyTargets ? aEvent.relatedTarget : nullptr;
+    fromRaise = aEvent.fromRaise;
+    isRefocus = aEvent.isRefocus;
+  }
 };
 
 /**

widget/tests/test_assign_event_data.html

@@ -415,6 +415,26 @@ const kTests = [
     },
     todoMismatch: [],
   },
+  { description: "nsFocusEvent (focus)",
+    targetID: "input-text", eventType: "focus",
+    dispatchEvent: function () {
+      document.getElementById(this.targetID).focus();
+    },
+    canRun: function () {
+      return true;
+    },
+    todoMismatch: [],
+  },
+  { description: "nsFocusEvent (blur)",
+    targetID: "input-text", eventType: "blur",
+    dispatchEvent: function () {
+      document.getElementById(this.targetID).blur();
+    },
+    canRun: function () {
+      return true;
+    },
+    todoMismatch: [],
+  },
 ];
 
 function doTest(aTest)