We use cookies to ensure you get the best experience on our website
Startsida Utforska Hjälp
Registrera dig Logga in
0ct0pu5
/
ladybird
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

LibWeb: Null layout and paintable pointers of removed DOM::Node

When a node is removed from the DOM tree, its paintable needs to be
removed to ensure that it is not used to obtain sizes that are no
longer valid.

This change enables the ResizeObserver to send a notification if a node
is removed, as it should, because a removed node now has a size of zero

It should be okay to nullify pointers without concerning
parent/sibling/child relationships because the layout and paintable
trees will be rebuilt following any DOM mutation anyway.
Aliaksandr Kalenik 1 år sedan
förälder
2b7e7cc1ad
incheckning
036cd9b2dd
6 ändrade filer med 103 tillägg och 1 borttagningar
Delad Vy Visa Diff Statistik
  1. 2 0
      Tests/LibWeb/Text/expected/ResizeObserver/notify-if-node-is-removed.txt
  2. 2 0
      Tests/LibWeb/Text/expected/ResizeObserver/notify-if-parent-is-removed.txt
  3. 46 0
      Tests/LibWeb/Text/input/ResizeObserver/notify-if-node-is-removed.html
  4. 46 0
      Tests/LibWeb/Text/input/ResizeObserver/notify-if-parent-is-removed.html
  5. 6 0
      Userland/Libraries/LibWeb/DOM/Node.cpp
  6. 1 1
      Userland/Libraries/LibWeb/DOM/Node.h

+ 2 - 0
Tests/LibWeb/Text/expected/ResizeObserver/notify-if-node-is-removed.txt
Visa fil 

@@ -0,0 +1,2 @@
 
+    Size changed: 200px x 200px
 
+Size changed: 0px x 0px

+ 2 - 0
Tests/LibWeb/Text/expected/ResizeObserver/notify-if-parent-is-removed.txt
Visa fil 

@@ -0,0 +1,2 @@
 
+    Size changed: 200px x 200px
 
+Size changed: 0px x 0px

+ 46 - 0
Tests/LibWeb/Text/input/ResizeObserver/notify-if-node-is-removed.html
Visa fil 

@@ -0,0 +1,46 @@
 
+<!DOCTYPE html>
 
+<head>
 
+    <style>
 
+        #box {
 
+            width: 200px;
 
+            height: 200px;
 
+            background-color: lightblue;
 
+        }
 
+    </style>
 
+</head>
 
+<body>
 
+    <div id="box"></div>
 
+</body>
 
+<script src="../include.js"></script>
 
+<script>
 
+    asyncTest(async done => {
 
+        const box = document.getElementById("box");
 
+
 
+        let resolve = null;
 
+        function createResizeObserverPromise() {
 
+            return new Promise(r => {
 
+                resolve = r;
 
+            });
 
+        }
 
+
 
+        const resizeObserver = new ResizeObserver(entries => {
 
+            for (let entry of entries) {
 
+                const { width, height } = entry.contentRect;
 
+                println(`Size changed: ${width}px x ${height}px`);
 
+            }
 
+
 
+            if (resolve) resolve();
 
+        });
 
+
 
+        let observerCallbackInvocation = createResizeObserverPromise();
 
+        resizeObserver.observe(box);
 
+        await observerCallbackInvocation;
 
+
 
+        box.remove();
 
+
 
+        observerCallbackInvocation = createResizeObserverPromise();
 
+        await observerCallbackInvocation;
 
+
 
+        done();
 
+    });
 
+</script>

+ 46 - 0
Tests/LibWeb/Text/input/ResizeObserver/notify-if-parent-is-removed.html
Visa fil 

@@ -0,0 +1,46 @@
 
+<!DOCTYPE html>
 
+<head>
 
+    <style>
 
+        #box {
 
+            width: 200px;
 
+            height: 200px;
 
+            background-color: lightblue;
 
+        }
 
+    </style>
 
+</head>
 
+<body>
 
+    <div><div id="box"></div></div>
 
+</body>
 
+<script src="../include.js"></script>
 
+<script>
 
+    asyncTest(async done => {
 
+        const box = document.getElementById("box");
 
+
 
+        let resolve = null;
 
+        function createResizeObserverPromise() {
 
+            return new Promise(r => {
 
+                resolve = r;
 
+            });
 
+        }
 
+
 
+        const resizeObserver = new ResizeObserver(entries => {
 
+            for (let entry of entries) {
 
+                const { width, height } = entry.contentRect;
 
+                println(`Size changed: ${width}px x ${height}px`);
 
+            }
 
+
 
+            if (resolve) resolve();
 
+        });
 
+
 
+        let observerCallbackInvocation = createResizeObserverPromise();
 
+        resizeObserver.observe(box);
 
+        await observerCallbackInvocation;
 
+
 
+        box.parentElement.remove();
 
+
 
+        observerCallbackInvocation = createResizeObserverPromise();
 
+        await observerCallbackInvocation;
 
+
 
+        done();
 
+    });
 
+</script>

+ 6 - 0
Userland/Libraries/LibWeb/DOM/Node.cpp
Visa fil 

@@ -974,6 +974,12 @@ void Node::inserted()
 
     set_needs_style_update(true);
 
 }
 
 
+void Node::removed_from(Node*)
 
+{
 
+    m_layout_node = nullptr;
 
+    m_paintable = nullptr;
 
+}
 
+
 
 ParentNode* Node::parent_or_shadow_host()
 
 {
 
     if (is<ShadowRoot>(*this))

+ 1 - 1
Userland/Libraries/LibWeb/DOM/Node.h
Visa fil 

@@ -187,7 +187,7 @@ public:
 
     Element const* parent_element() const;
 
 
     virtual void inserted();
 
-    virtual void removed_from(Node*) { }
 
+    virtual void removed_from(Node*);
 
     virtual void children_changed() { }
 
     virtual void adopted_from(Document&) { }
 
     virtual void cloned(Node&, bool) {};

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5