Import wpt@cf62b859e6b890abc34f8140d185ba91df95c5b6

third_party/WebKit/LayoutTests/resources/testharness.js

 /*global self*/
 /*jshint latedef: nofunc*/
 /*
 Distributed under both the W3C Test Suite License [1] and the W3C
 3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
 policies and contribution forms [3].
 
 [1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
 [2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
 [3] http://www.w3.org/2004/10/27-testcases
@@ skipping 371 matching lines @@
      * inside a shared web worker.
      */
     function SharedWorkerTestEnvironment() {
         WorkerTestEnvironment.call(this);
         var this_obj = this;
         // Shared workers receive message ports via the 'onconnect' event for
         // each connection.
         self.addEventListener("connect",
                 function(message_event) {
                     this_obj._add_message_port(message_event.source);
-                });
+                }, false);
     }
     SharedWorkerTestEnvironment.prototype = Object.create(WorkerTestEnvironment.prototype);
 
     SharedWorkerTestEnvironment.prototype.on_tests_ready = function() {
         WorkerTestEnvironment.prototype.on_tests_ready.call(this);
         // In the absence of an onload notification, we a require shared
         // workers to explicitly signal when the tests are done.
         tests.wait_for_finish = true;
     };
 
@@ skipping 20 matching lines @@
                             // ServiceWorkers yet.
                             this_obj._add_message_port(event.ports[0]);
                             event.ports[0].start();
                         } else {
                             // If there is no MessageChannel, then attempt to
                             // use the MessageEvent.source to send results
                             // back to the main window.
                             this_obj._add_message_port(event.source);
                         }
                     }
-                });
+                }, false);
 
         // The oninstall event is received after the service worker script and
         // all imported scripts have been fetched and executed. It's the
         // equivalent of an onload event for a document. All tests should have
         // been added by the time this event is received, thus it's not
         // necessary to wait until the onactivate event.
         on_event(self, "install",
                 function(event) {
                     this_obj.all_loaded = true;
                     if (this_obj.on_loaded_callback) {
@@ skipping 135 matching lines @@
             }
             // We need to null out waitingFor before calling the resolve function
             // since the Promise's resolve handlers may call wait_for() which will
             // need to set waitingFor.
             var resolveFunc = waitingFor.resolve;
             waitingFor = null;
             resolveFunc(evt);
         });
 
         for (var i = 0; i < eventTypes.length; i++) {
-            watchedNode.addEventListener(eventTypes[i], eventHandler);
+            watchedNode.addEventListener(eventTypes[i], eventHandler, false);
         }
 
         /**
          * Returns a Promise that will resolve after the specified event or
          * series of events has occured.
          */
         this.wait_for = function(types) {
             if (waitingFor) {
                 return Promise.reject('Already waiting for an event or events');
             }
             if (typeof types == 'string') {
                 types = [types];
             }
             return new Promise(function(resolve, reject) {
                 waitingFor = {
                     types: types,
                     resolve: resolve,
                     reject: reject
                 };
             });
         };
 
         function stop_watching() {
             for (var i = 0; i < eventTypes.length; i++) {
-                watchedNode.removeEventListener(eventTypes[i], eventHandler);
+                watchedNode.removeEventListener(eventTypes[i], eventHandler, false);
             }
         };
 
         test.add_cleanup(stop_watching);
 
         return this;
     }
     expose(EventWatcher, 'EventWatcher');
 
     function setup(func_or_properties, maybe_properties)
@@ skipping 2037 matching lines @@
         }
         return supports;
     }
 
     /**
      * Setup globals
      */
 
     var tests = new Tests();
 
-    addEventListener("error", function(e) {
+    var error_handler = function(e) {
         if (tests.file_is_test) {
             var test = tests.tests[0];
             if (test.phase >= test.phases.HAS_RESULT) {
                 return;
             }
             test.set_status(test.FAIL, e.message, e.stack);
             test.phase = test.phases.HAS_RESULT;
             test.done();
             done();
         } else if (!tests.allow_uncaught_exception) {
             tests.status.status = tests.status.ERROR;
             tests.status.message = e.message;
             tests.status.stack = e.stack;
         }
-    });
+    };
+
+    addEventListener("error", error_handler, false);
+    addEventListener("unhandledrejection", function(e){ error_handler(e.reason); }, false);
 
     test_environment.on_tests_ready();
 
 })();
 // vim: set expandtab shiftwidth=4 tabstop=4: