We use cookies to ensure you get the best experience on our website
Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
0ct0pu5
/
ladybird
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

LibWeb: Return a WindowProxy from `document.defaultView`

This aligns our implementation with the most recent specification steps.
Tim Ledbetter há 10 meses atrás
pai
74f6dce9e6
commit
089139f09d
6 ficheiros alterados com 38 adições e 8 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 1 0
      Tests/LibWeb/Text/expected/DOM/Document-defaultView.txt
  2. 7 0
      Tests/LibWeb/Text/input/DOM/Document-defaultView.html
  3. 16 0
      Userland/Libraries/LibWeb/DOM/Document.cpp
  4. 2 2
      Userland/Libraries/LibWeb/DOM/Document.h
  5. 1 1
      Userland/Libraries/LibWeb/DOM/Document.idl
  6. 11 5
      Userland/Libraries/LibWeb/DOM/Element.cpp

+ 1 - 0
Tests/LibWeb/Text/expected/DOM/Document-defaultView.txt
Ver Ficheiro 

@@ -0,0 +1 @@
 
+document.defaultView === window: true

+ 7 - 0
Tests/LibWeb/Text/input/DOM/Document-defaultView.html
Ver Ficheiro 

@@ -0,0 +1,7 @@
 
+<!DOCTYPE html>
 
+<script src="../include.js"></script>
 
+<script>
 
+    test(() => {
 
+        println(`document.defaultView === window: ${document.defaultView === window}`);
 
+    });
 
+</script>

+ 16 - 0
Userland/Libraries/LibWeb/DOM/Document.cpp
Ver Ficheiro 

@@ -698,6 +698,22 @@ WebIDL::ExceptionOr<void> Document::close()
 
     return {};
 
 }
 
 
+// https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-document-defaultview
 
+JS::GCPtr<HTML::WindowProxy> Document::default_view()
 
+{
 
+    // If this's browsing context is null, then return null.
 
+    if (!browsing_context())
 
+        return {};
 
+
 
+    // 2. Return this's browsing context's WindowProxy object.
 
+    return browsing_context()->window_proxy();
 
+}
 
+
 
+JS::GCPtr<HTML::WindowProxy const> Document::default_view() const
 
+{
 
+    return const_cast<Document*>(this)->default_view();
 
+}
 
+
 
 HTML::Origin Document::origin() const
 
 {
 
     return m_origin;

+ 2 - 2
Userland/Libraries/LibWeb/DOM/Document.h
Ver Ficheiro 

@@ -370,8 +370,8 @@ public:
 
     WebIDL::ExceptionOr<JS::GCPtr<HTML::WindowProxy>> open(StringView url, StringView name, StringView features);
 
     WebIDL::ExceptionOr<void> close();
 
 
-    HTML::Window* default_view() { return m_window.ptr(); }
 
-    HTML::Window const* default_view() const { return m_window.ptr(); }
 
+    JS::GCPtr<HTML::WindowProxy const> default_view() const;
 
+    JS::GCPtr<HTML::WindowProxy> default_view();
 
 
     String const& content_type() const { return m_content_type; }
 
     void set_content_type(String content_type) { m_content_type = move(content_type); }

+ 1 - 1
Userland/Libraries/LibWeb/DOM/Document.idl
Ver Ficheiro 

@@ -48,7 +48,7 @@ interface Document : Node {
 
     readonly attribute DOMString inputEncoding;
 
     readonly attribute DOMString contentType;
 
 
-    readonly attribute Window? defaultView;
 
+    readonly attribute WindowProxy? defaultView;
 
 
     [CEReactions] Document open(optional DOMString unused1, optional DOMString unused2);
 
     WindowProxy? open(USVString url, DOMString name, DOMString features);

+ 11 - 5
Userland/Libraries/LibWeb/DOM/Element.cpp
Ver Ficheiro 

@@ -1246,7 +1246,8 @@ double Element::scroll_top() const
 
         return 0.0;
 
 
     // 3. Let window be the value of document’s defaultView attribute.
 
-    auto* window = document.default_view();
 
+    // FIXME: The specification expects defaultView to be a Window object, but defaultView actually returns a WindowProxy object.
 
+    auto window = document.window();
 
 
     // 4. If window is null, return zero and terminate these steps.
 
     if (!window)
 
@@ -1276,6 +1277,7 @@ double Element::scroll_top() const
 
     return paintable_box()->scroll_offset().y().to_double();
 
 }
 
 
+// https://drafts.csswg.org/cssom-view/#dom-element-scrollleft
 
 double Element::scroll_left() const
 
 {
 
     // 1. Let document be the element’s node document.
 
@@ -1286,7 +1288,8 @@ double Element::scroll_left() const
 
         return 0.0;
 
 
     // 3. Let window be the value of document’s defaultView attribute.
 
-    auto* window = document.default_view();
 
+    // FIXME: The specification expects defaultView to be a Window object, but defaultView actually returns a WindowProxy object.
 
+    auto window = document.window();
 
 
     // 4. If window is null, return zero and terminate these steps.
 
     if (!window)
 
@@ -1332,7 +1335,8 @@ void Element::set_scroll_left(double x)
 
         return;
 
 
     // 5. Let window be the value of document’s defaultView attribute.
 
-    auto* window = document.default_view();
 
+    // FIXME: The specification expects defaultView to be a Window object, but defaultView actually returns a WindowProxy object.
 
+    auto window = document.window();
 
 
     // 6. If window is null, terminate these steps.
 
     if (!window)
 
@@ -1388,7 +1392,8 @@ void Element::set_scroll_top(double y)
 
         return;
 
 
     // 5. Let window be the value of document’s defaultView attribute.
 
-    auto* window = document.default_view();
 
+    // FIXME: The specification expects defaultView to be a Window object, but defaultView actually returns a WindowProxy object.
 
+    auto window = document.window();
 
 
     // 6. If window is null, terminate these steps.
 
     if (!window)
 
@@ -2347,7 +2352,8 @@ void Element::scroll(double x, double y)
 
         return;
 
 
     // 5. Let window be the value of document’s defaultView attribute.
 
-    auto* window = document.default_view();
 
+    // FIXME: The specification expects defaultView to be a Window object, but defaultView actually returns a WindowProxy object.
 
+    auto window = document.window();
 
 
     // 6. If window is null, terminate these steps.
 
     if (!window)

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