Bug 1552911 - Drop the constructor of ResizeObserverEntry. r=dholbert…

…,smaug There is a spec issue about should we expose this API: w3c/csswg-drafts#3946 It's no clear that should we really need this API, so let's match Chromium for now. Differential Revision: https://phabricator.services.mozilla.com/D31891
trman · Aug 19, 2020 · 15f11c2 · 15f11c2
1 parent 550a266
commit 15f11c2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/dom/base/ResizeObserver.cpp b/dom/base/ResizeObserver.cpp
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/ResizeObserver.h"
 
+#include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/Document.h"
 #include "nsIContent.h"
 #include "nsSVGUtils.h"
@@ -271,13 +272,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ResizeObserverEntry)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
-already_AddRefed<ResizeObserverEntry> ResizeObserverEntry::Constructor(
-    const GlobalObject& aGlobal, Element& aTarget, ErrorResult& aRv) {
-  RefPtr<ResizeObserverEntry> observerEntry =
-      new ResizeObserverEntry(aGlobal.GetAsSupports(), aTarget);
-  return observerEntry.forget();
-}
-
 void ResizeObserverEntry::SetBorderBoxSize(const nsSize& aSize) {
   nsIFrame* frame = mTarget->GetPrimaryFrame();
   const WritingMode wm = frame ? frame->GetWritingMode() : WritingMode();
@@ -292,7 +286,7 @@ void ResizeObserverEntry::SetContentRectAndSize(const nsSize& aSize) {
   // Per the spec, we need to use the top-left padding offset as the origin of
   // our contentRect.
   nsRect rect(nsPoint(padding.left, padding.top), aSize);
-  RefPtr<DOMRect> contentRect = new DOMRect(mTarget);
+  RefPtr<DOMRect> contentRect = new DOMRect(this);
   contentRect->SetLayoutRect(rect);
   mContentRect = contentRect.forget();
 

diff --git a/dom/base/ResizeObserver.h b/dom/base/ResizeObserver.h
@@ -188,9 +188,6 @@ class ResizeObserverEntry final : public nsISupports, public nsWrapperCache {
     return ResizeObserverEntry_Binding::Wrap(aCx, this, aGivenProto);
   }
 
-  static already_AddRefed<ResizeObserverEntry> Constructor(
-      const GlobalObject& global, Element& target, ErrorResult& aRv);
-
   Element* Target() const { return mTarget; }
 
   /**

diff --git a/dom/webidl/ResizeObserver.webidl b/dom/webidl/ResizeObserver.webidl
@@ -29,8 +29,7 @@ interface ResizeObserver {
 
 callback ResizeObserverCallback = void (sequence<ResizeObserverEntry> entries, ResizeObserver observer);
 
-[Constructor(Element target),
- Pref="layout.css.resizeobserver.enabled"]
+[Pref="layout.css.resizeobserver.enabled"]
 interface ResizeObserverEntry {
     readonly attribute Element target;
     readonly attribute DOMRectReadOnly contentRect;

diff --git a/layout/style/crashtests/1552911.html b/layout/style/crashtests/1552911.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+  <script>
+    function start() {
+      const o1 =
+        document.createElementNS('http://www.w3.org/1999/xhtml', 'slot');
+      const observer = new ResizeObserverEntry(o1);
+      typeof observer.borderBoxSize;
+      typeof observer.contentBoxSize;
+    }
+
+    window.addEventListener('load', start);
+  </script>
+</head>
+</html>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
@@ -306,3 +306,4 @@ load 1533891.html
 pref(gfx.omta.background-color,true) load 1533968.html
 load 1541126.html
 load 1545177.html
+pref(layout.css.resizeobserver.enabled,true) load 1552911.html
diff --git a/testing/web-platform/meta/resize-observer/idlharness.window.js.ini b/testing/web-platform/meta/resize-observer/idlharness.window.js.ini
@@ -46,3 +46,7 @@
   [ResizeObservation interface: attribute observedBox]
     expected: FAIL
     bug: https://github.com/w3c/csswg-drafts/issues/3839
+
+  [ResizeObserverEntry interface object length]
+    expected: FAIL
+    bug: https://github.com/w3c/csswg-drafts/issues/3946