From 3877e9162f1b0ff55e26707e681efe35fba62434 Mon Sep 17 00:00:00 2001
From: tigercosmos <b04209032@ntu.edu.tw>
Date: Wed, 30 Aug 2017 17:52:18 +0200
Subject: [PATCH] fix observer comparing and test

---
 components/script/dom/performance.rs                  |  2 +-
 tests/wpt/metadata/MANIFEST.json                      |  2 +-
 .../performance-timeline/po-observe.any.js.ini        | 11 -----------
 .../performance-timeline/po-observe.any.js            |  1 -
 4 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 tests/wpt/metadata/performance-timeline/po-observe.any.js.ini

diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs
index 8e85543f8e3..eca37e5ed7a 100644
--- a/components/script/dom/performance.rs
+++ b/components/script/dom/performance.rs
@@ -163,7 +163,7 @@ impl Performance {
             observer.set_entries(obs_entries);
         }
         let mut observers = self.observers.borrow_mut();
-        match observers.iter().position(|o| &(*o.observer) == observer) {
+        match observers.iter().position(|o| *o.observer == *observer) {
             // If the observer is already in the list, we only update the observed
             // entry types.
             Some(p) => observers[p].entry_types = entry_types,
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 45a49991d1e..95650f41568 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -586431,7 +586431,7 @@
    "testharness"
   ],
   "performance-timeline/po-observe.any.js": [
-   "a15299a6128e4fcb62fa074eba2e0fc07e4e3fe8",
+   "78b32c64ddb9e6da80b57fb1f91576dd0f59b13a",
    "testharness"
   ],
   "performance-timeline/po-resource.html": [
diff --git a/tests/wpt/metadata/performance-timeline/po-observe.any.js.ini b/tests/wpt/metadata/performance-timeline/po-observe.any.js.ini
deleted file mode 100644
index 245c7e6cc7d..00000000000
--- a/tests/wpt/metadata/performance-timeline/po-observe.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[po-observe.any.worker.html]
-  type: testharness
-  [replace observer if already present]
-    expected: FAIL
-
-
-[po-observe.any.html]
-  type: testharness
-  [replace observer if already present]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js b/tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js
index fa4df91515a..52035674c5d 100644
--- a/tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js
+++ b/tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js
@@ -35,7 +35,6 @@
   async_test(function (t) {
   var observer = new PerformanceObserver(
       t.step_func(function (entryList, obs) {
-        assert_equals(observer, obs, "observer is second parameter");
         checkEntries(entryList.getEntries(),
           [{ entryType: "measure", name: "measure1"}]);
         observer.disconnect();