Merge inbound to m-c. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 06 Aug 2017 21:18:07 -0400
changeset 641444 bb8de16ce00cb57b587a14c210ecc7505f366328
parent 641422 813810854eeaae9f2c5cb8f6879f91ac45e5038a (current diff)
parent 641443 74ad02373c4af25417e43585309525d108bab8cc (diff)
child 641445 44edb197a893322f950595ed4864c82527c8bb27
child 641451 c5bc44b64817ebab6acf1d7b75b29e8e603206ef
child 641455 87138eed8a81e895140983b676f08a74b6105959
child 641457 8c3b7769dcace6e76485665c93eff56e814016f3
child 641458 0bcf965bf8fafa13b5889ca12ef9dd152fff5f28
child 641464 7b8e5bedb22414747d1e331fc62eb21d3a2ee5c1
child 641471 e0ac58ed1c1be2bdee5c8ad9d5acd1efa5775f91
child 641476 b43350eec256748bc1ec9fb4e67a54626ddf7e24
child 641477 6d52a2f53f345fbc58c29624de587142e5cd1925
child 641478 16ca7d6782870db294534d9dd5b2a4ecdeb12259
child 641484 277efe7d873a4a18f4b0dbd0cd60d44dd7347a8d
child 641489 4645781a65a05c8c29e0bade5555d57c648d1575
child 641490 d8772a14a0a82fbf668f30b9248b9a8530c8107a
child 641497 cc284cd6cb3f5f7aca56cf606db277222ec03217
child 641498 e1f7398822eade97fddeed715f76e9536212d96e
child 641501 adda9baff236d28bd62b088b6a1d8bd42e0e9ffa
child 641503 f730b43e1ed55740dc1b0ff1cb917ed111b003c9
child 641504 be1bd805a80de4c078782f962315cda969ba8856
child 641507 9539f37f2e98f8fbf41a9dd5974af8328bcd3ff4
child 641509 35c8b8fe10dcebd719480cbd6be16c8c36c811f7
child 641510 5d43d759e841b574d4d274509fa458a74d5821bd
child 641511 b1197f5fbb1cfa6314815140ed342b5e0be9d6c3
child 641513 c310ba6b61f9f4d67703702ae921a8bc885cc3a6
child 641514 f556effe234eccdc333e0ea55fea59017b1c7f06
child 641536 efd88aeb86bcc2becc0afe063bc9e2771c2e41c2
child 641537 b98dcf6945ddba57c103391d989dd7fad36ba6ed
child 641539 6ed0a7bd1f57cf9666dfa030a6169ba4417a9be2
child 641540 a572d208ae4469712eab18760fe495d4dcd565c8
child 641541 d19f86d191f323a252471d57234e7917fff7136f
child 641542 8a9069a5df3ac6b899b0f18c023ba47675f0b26c
child 641548 e7b2a7744e40f1cbc08b217a422f47a4dd36f1b5
child 641549 ba4486fd655979367d37f20390dbb042ff9d2ba0
child 641550 3391d782a29a6686191a7f9ca897f5c53d8a042f
child 641551 f0e0933da740a1c9050aa18bc729b8b6bbfeca4a
child 641553 97b9ce390c1744c6246bea361133c78f05b72d24
child 641558 520b84dae72212945e04e57bc41b86e9325813b2
child 641565 58f4368f105c4e7de5322a689e7d2bbcf106b54c
child 641569 f2df8633a4ff3c6464ad75659b209defd7d15d04
child 641612 c348778e05f3aa948306060e890801f87489c648
child 641621 786307b0fed4d978bb52653527374138c3097a95
child 641623 b50d2fb7a4ad7add8c326e2b1627bcf1a80d0a0d
child 641626 c6e3a9c79f6350cdd3a7c603d252ba6955990029
child 641642 25dee99374c28d4c679b6d86df1fd83a226f7cbb
child 641643 442f9e522c804939ecdc2577e19f26f6cf1bd28c
child 642048 349086aa86c06f55b88fad7f3e9095a80e2d2320
child 642058 9ad2af3fde89116152e2d65cd279f6efb739ef66
child 642061 0029c0d3a3767893470ebdef86f0095e2ebe1adf
child 642068 9be0bd68f862d89f833dbaf413a54ae79142b4f1
child 642079 157d9adcfd4c6a85b3f6c773595014cdc2835eab
child 642306 de4beb5607020915d0ca04d7d75955e2a3a7fa16
child 642359 b0f29e79b8815b9d6b71d2df5ae641169008ed02
child 642381 f074b8d7cc3dd53ce816c26b1361f381fd88a168
child 642413 833d4b69accbf7d1d60f9f11d807ee37d608b6fe
child 642430 866124fcfd7cbcba35afbf084b21e963363f2d5d
child 642468 497d8cad6f162817ecb40e8cdeacb923e1556610
child 642493 1d5d3676b4c709cd6fa63c25fae174febefd6000
child 642571 02e5974fe43c6956718a245e567b78639c126adb
child 642995 5383e0fa9bbec3a4b9e15fd50fb030b6b9b268df
child 643060 2838512d9f22a263d9b22b48f29e9731ab89c20e
child 643094 e45769b6f37bc8e18f0cd4ac6f5f28c8b7c5dfe4
child 643186 e484867c43ac75c35509bfee3836e15a6d095e7b
child 643200 79dd06fdbf813a89868744314cb8c4918dad31f4
child 643250 f9340c349819f08fc3aaf88f1ffec02f8fa4b6db
child 643257 65d549df0c7e21ab6054ca6b35c7da5e9a60fcc3
child 643260 2719f5231656625b4ba9f9b408d774d04d6ea1f0
child 643741 3fd8196485c1295a89e6f7e80afa3b4760a58587
child 643781 5eff2d9a24c1a608bbedafcaaf2a2e72bd57c3bf
child 643821 0807812b95666908c9f6cbcbcde7f9e9ea803549
child 643875 c2ec7775790229f14c1a4966f7163deab774e546
child 643909 a990bb0a79f254037ada58bbc7bd6f941fd26343
child 644042 0b2cac0408a7aef7b40847847bf0e1cedee66ba1
child 644047 d38539fed8f7a1caeec2390aa17c42bd0248b705
child 644059 1503d77f1916e796ce082e6975f8a2098446b555
child 644756 a6a92092f2f53e37697645039475a56dbf658b2b
push id72520
push userhchang@mozilla.com
push dateMon, 07 Aug 2017 01:57:07 +0000
reviewersmerge
milestone57.0a1
Merge inbound to m-c. a=merge
--- a/docshell/test/test_bug694612.html
+++ b/docshell/test/test_bug694612.html
@@ -13,15 +13,22 @@ https://bugzilla.mozilla.org/show_bug.cg
 <p id="display"></p>
 <div id="content" style="display: none">
   
 </div>
 <pre id="test">
 <script type="application/javascript">
 /** Test for Bug 694612 **/
 SimpleTest.waitForExplicitFinish();
+
+window.addEventListener("message", receiveMessage);
+function receiveMessage(event) {
+  ok(event.data.result, "should have performance API in an <object>");
+  window.removeEventListener("message", receiveMessage);
+  SimpleTest.finish();
+}
 </script>
 <object type="text/html"
-        data="data:text/html,<script>parent.isnot(performance, null, 'should have performance API in an <object>'); parent.SimpleTest.finish();</script>">
+        data="data:text/html,<script>parent.postMessage({result:performance!=null},'*');</script>">
 </object>
 </pre>
 </body>
 </html>