Browse Source

LibHTML: Make TreeNode inherit from Weakable by default

This makes Node and LayoutNode weakable. Frame was already weakable.
Andreas Kling 5 years ago
parent
commit
877ff6bc13
2 changed files with 3 additions and 5 deletions
  1. 1 4
      Libraries/LibHTML/Frame.h
  2. 2 1
      Libraries/LibHTML/TreeNode.h

+ 1 - 4
Libraries/LibHTML/Frame.h

@@ -3,16 +3,13 @@
 #include <AK/Function.h>
 #include <AK/Function.h>
 #include <AK/Noncopyable.h>
 #include <AK/Noncopyable.h>
 #include <AK/RefPtr.h>
 #include <AK/RefPtr.h>
-#include <AK/Weakable.h>
 #include <LibDraw/Rect.h>
 #include <LibDraw/Rect.h>
 #include <LibDraw/Size.h>
 #include <LibDraw/Size.h>
 #include <LibHTML/TreeNode.h>
 #include <LibHTML/TreeNode.h>
 
 
 class Document;
 class Document;
 
 
-class Frame
-    : public TreeNode<Frame>
-    , public Weakable<Frame> {
+class Frame : public TreeNode<Frame> {
 public:
 public:
     static NonnullRefPtr<Frame> create() { return adopt(*new Frame); }
     static NonnullRefPtr<Frame> create() { return adopt(*new Frame); }
     ~Frame();
     ~Frame();

+ 2 - 1
Libraries/LibHTML/TreeNode.h

@@ -2,9 +2,10 @@
 
 
 #include <AK/Assertions.h>
 #include <AK/Assertions.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtr.h>
+#include <AK/Weakable.h>
 
 
 template<typename T>
 template<typename T>
-class TreeNode {
+class TreeNode : public Weakable<T> {
 public:
 public:
     void ref()
     void ref()
     {
     {