Merge inbound to mozilla-central. a=merge

dom/smil/SMILAnimationFunction.cpp

@@ -7,12 +7,12 @@
 #include "SMILAnimationFunction.h"
 
 #include "mozilla/dom/SVGAnimationElement.h"
+#include "mozilla/Move.h"
+#include "mozilla/SMILCSSValueType.h"
+#include "mozilla/SMILNullType.h"
 #include "mozilla/SMILParserUtils.h"
 #include "mozilla/SMILTimedElement.h"
-#include "mozilla/Move.h"
 #include "nsISMILAttr.h"
-#include "SMILCSSValueType.h"
-#include "SMILNullType.h"
 #include "nsAttrValueInlines.h"
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"

dom/smil/SMILBoolType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SMILBOOLTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/SMILCSSProperty.cpp

@@ -11,9 +11,9 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/Move.h"
 #include "mozilla/ServoBindings.h"
+#include "mozilla/SMILCSSValueType.h"
 #include "mozilla/StyleAnimationValue.h"
 #include "nsDOMCSSAttrDeclaration.h"
-#include "SMILCSSValueType.h"
 #include "nsSMILValue.h"
 #include "nsCSSProps.h"
 

dom/smil/SMILCSSValueType.h

@@ -9,10 +9,10 @@
 #ifndef NS_SMILCSSVALUETYPE_H_
 #define NS_SMILCSSVALUETYPE_H_
 
-#include "SMILType.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/SMILType.h"
 #include "nsCSSPropertyID.h"
 #include "nsStringFwd.h"
-#include "mozilla/Attributes.h"
 
 namespace mozilla {
 struct AnimationValue;

dom/smil/SMILEnumType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SMILENUMTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/SMILFloatType.h

@@ -8,7 +8,7 @@
 #define NS_SMILFLOATTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/SMILIntegerType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SMILINTEGERTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/SMILNullType.h

@@ -8,7 +8,7 @@
 #define NS_SMILNULLTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/SMILStringType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SMILSTRINGTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 namespace mozilla {
 

dom/smil/moz.build

@@ -19,22 +19,22 @@ EXPORTS += [
     'nsSMILTimeValueSpecParams.h',
     'nsSMILTypes.h',
     'nsSMILValue.h',
-    'SMILCSSValueType.h',
-    'SMILNullType.h',
-    'SMILType.h',
 ]
 
 EXPORTS.mozilla += [
     'SMILAnimationController.h',
     'SMILAnimationFunction.h',
     'SMILCompositorTable.h',
+    'SMILCSSValueType.h',
     'SMILKeySpline.h',
     'SMILMilestone.h',
+    'SMILNullType.h',
     'SMILParserUtils.h',
     'SMILSetAnimationFunction.h',
     'SMILTargetIdentifier.h',
     'SMILTimeContainer.h',
     'SMILTimedElement.h',
+    'SMILType.h',
 ]
 
 EXPORTS.mozilla.dom += [

dom/smil/nsSMILValue.h

@@ -7,8 +7,8 @@
 #ifndef NS_SMILVALUE_H_
 #define NS_SMILVALUE_H_
 
-#include "SMILType.h"
-#include "SMILNullType.h"
+#include "mozilla/SMILNullType.h"
+#include "mozilla/SMILType.h"
 
 /**
  * Although objects of this type are generally only created on the stack and

dom/svg/SVGIntegerPairSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGINTEGERPAIRSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGLengthListSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGLENGTHLISTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGMotionSMILType.h

@@ -11,7 +11,7 @@
 
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGNumberListSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGNUMBERLISTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGNumberPairSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGNUMBERPAIRSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGOrientSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGORIENTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGPathSegListSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGPATHSEGLISTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGPointListSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGPOINTLISTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

dom/svg/SVGTransformListSMILType.h

@@ -8,7 +8,7 @@
 #define SVGTRANSFORMLISTSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 #include "nsTArray.h"
 
 class nsSMILValue;

dom/svg/SVGViewBoxSMILType.h

@@ -8,7 +8,7 @@
 #define MOZILLA_SVGVIEWBOXSMILTYPE_H_
 
 #include "mozilla/Attributes.h"
-#include "SMILType.h"
+#include "mozilla/SMILType.h"
 
 class nsSMILValue;
 

editor/libeditor/EditorEventListener.cpp

@@ -169,15 +169,12 @@ nsresult EditorEventListener::InstallToEditor() {
                                TrustedEventsAtCapture());
   elmP->AddEventListenerByType(this, NS_LITERAL_STRING("click"),
                                TrustedEventsAtCapture());
-  // Focus event doesn't bubble so adding the listener to capturing phase.
-  // XXX Should we listen focus/blur events of system group too? Or should
-  //     editor notified focus/blur of the element from nsFocusManager
-  //     directly?  Because if the event propagation is stopped by JS,
-  //     editor cannot initialize selection as expected.
+  // Focus event doesn't bubble so adding the listener to capturing phase as
+  // system event group.
   elmP->AddEventListenerByType(this, NS_LITERAL_STRING("blur"),
-                               TrustedEventsAtCapture());
+                               TrustedEventsAtSystemGroupCapture());
   elmP->AddEventListenerByType(this, NS_LITERAL_STRING("focus"),
-                               TrustedEventsAtCapture());
+                               TrustedEventsAtSystemGroupCapture());
   elmP->AddEventListenerByType(this, NS_LITERAL_STRING("text"),
                                TrustedEventsAtSystemGroupBubble());
   elmP->AddEventListenerByType(this, NS_LITERAL_STRING("compositionstart"),
@@ -243,9 +240,9 @@ void EditorEventListener::UninstallFromEditor() {
   elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("click"),
                                   TrustedEventsAtCapture());
   elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("blur"),
-                                  TrustedEventsAtCapture());
+                                  TrustedEventsAtSystemGroupCapture());
   elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("focus"),
-                                  TrustedEventsAtCapture());
+                                  TrustedEventsAtSystemGroupCapture());
   elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("text"),
                                   TrustedEventsAtSystemGroupBubble());
   elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("compositionstart"),

js/src/gc/GC.cpp

@@ -670,8 +670,7 @@ static inline bool FinalizeTypedArenas(FreeOp* fop, Arena** src,
 }
 
 /*
- * Finalize the list. On return, |al|'s cursor points to the first non-empty
- * arena in the list (which may be null if all arenas are full).
+ * Finalize the list of areans.
  */
 static bool FinalizeArenas(FreeOp* fop, Arena** src, SortedArenaList& dest,
                            AllocKind thingKind, SliceBudget& budget,

layout/base/tests/bug1097242-1.html

@@ -1,18 +1,22 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script src="/tests/SimpleTest/EventUtils.js"></script>
   <script>
-    function test() {
-      focus();
-      synthesizeMouseAtCenter(document.querySelector("span"), {});
-    }
     function focused() {
       document.documentElement.removeAttribute("class");
     }
   </script>
-  <body onload="setTimeout(test, 0)">
+  <body>
     <div contenteditable spellcheck="false" onfocus="focused()"
       style="outline: none">foo<span contenteditable=false
       style="-moz-user-select: none">bar</span>baz</div>
+    <script>
+      SimpleTest.waitForFocus(() => {
+        SimpleTest.executeSoon(() => {
+          synthesizeMouseAtCenter(document.querySelector("span"), {});
+        });
+      });
+    </script>
   </body>
 </html>

layout/base/tests/bug1109968-1.html

@@ -3,7 +3,7 @@
     <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   </head>
   <body onload="start()">
-    <div onfocus="done()" contenteditable>foo<div contenteditable="false"><a href="#">bar</a></div>baz</div>
+    <div onfocus="setTimeout(done, 0)" contenteditable>foo<div contenteditable="false"><a href="#">bar</a></div>baz</div>
     <script>
       var div = document.querySelector("div");
       function start() {

layout/base/tests/bug1109968-2.html

@@ -3,7 +3,7 @@
     <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   </head>
   <body onload="start()">
-    <div onfocus="done()" contenteditable>foo<div contenteditable="false"><img src="image_rgrg-256x256.png" width="10" height="10"></div>bar</div>
+    <div onfocus="setTimeout(done, 0)" contenteditable>foo<div contenteditable="false"><img src="image_rgrg-256x256.png" width="10" height="10"></div>bar</div>
     <script>
       var div = document.querySelector("div");
       function start() {

layout/base/tests/bug1123067-1.html

@@ -29,7 +29,7 @@
 </head>
 <body>
 
-<div id="test1" contenteditable="true" spellcheck="false" onfocus="test()">This text is NOT selectable.</div>
+<div id="test1" contenteditable="true" spellcheck="false" onfocus="setTimeout(test, 0)">This text is NOT selectable.</div>
 
 <script>
 SimpleTest.waitForFocus(runTests);

layout/base/tests/bug1123067-ref.html

@@ -24,7 +24,7 @@
 </head>
 <body>
 
-<div id="test1" contenteditable="true" spellcheck="false" onfocus="test()">This text is NOT selectable.</div>
+<div id="test1" contenteditable="true" spellcheck="false" onfocus="setTimeout(test, 0)">This text is NOT selectable.</div>
 
 <script>
 SimpleTest.waitForFocus(runTests);

layout/base/tests/bug1237236-2-ref.html

@@ -19,7 +19,7 @@
 </head>
 <body>
 
-<pre contenteditable tabindex=1 onfocus="test1()" spellcheck="false">abc
+<pre contenteditable tabindex=1 onfocus="setTimeout(test1, 0)" spellcheck="false">abc
 def</pre>
 
 <script>

layout/base/tests/bug1258308-2-ref.html

@@ -19,7 +19,7 @@
 </head>
 <body>
 
-<pre contenteditable tabindex=1 onfocus="test1()" spellcheck="false">abc
+<pre contenteditable tabindex=1 onfocus="setTimeout(test1, 0)" spellcheck="false">abc
 def
 ghi</pre>
 

layout/base/tests/bug1259949-2-ref.html

@@ -19,7 +19,7 @@
 </head>
 <body>
 
-<pre contenteditable tabindex=1 onfocus="test1()" spellcheck="false">abcdef
+<pre contenteditable tabindex=1 onfocus="setTimeout(test1, 0)" spellcheck="false">abcdef
 
 </pre>
 

layout/base/tests/bug1423331-1.html

@@ -17,10 +17,12 @@
 <div id="editable" contenteditable></div>
 <script>
 SimpleTest.waitForFocus(function() {
-  let div = document.getElementById("editable");
-  synthesizeMouseAtCenter(div, {});
-  synthesizeMouseAtCenter(div, {});
-  document.documentElement.className ="";
+  SimpleTest.executeSoon(() => {
+    let div = document.getElementById("editable");
+    synthesizeMouseAtCenter(div, {});
+    synthesizeMouseAtCenter(div, {});
+    document.documentElement.className ="";
+  });
 });
 </script>
 </html>

layout/base/tests/bug1423331-2.html

@@ -17,11 +17,13 @@
 <div id="editable" contenteditable></div>
 <script>
 SimpleTest.waitForFocus(function() {
-  let div = document.getElementById("editable");
-  synthesizeMouseAtCenter(div, {});
-  synthesizeMouseAtCenter(div, {});
-  sendString("xxx");
-  document.documentElement.className = "";
+  SimpleTest.executeSoon(() => {
+    let div = document.getElementById("editable");
+    synthesizeMouseAtCenter(div, {});
+    synthesizeMouseAtCenter(div, {});
+    sendString("xxx");
+    document.documentElement.className = "";
+  });
 });
 </script>
 </html>

layout/base/tests/bug989012-1.html

@@ -4,7 +4,7 @@
     <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   </head>
   <body onload="start()">
-    <div onfocus="done()" contenteditable>foo<img alt="IMAGE">bar</div>
+    <div onfocus="setTimeout(done, 0)" contenteditable>foo<img alt="IMAGE">bar</div>
     <script>
       var div = document.querySelector("div");
       function start() {