LibWebView: Include top-level traversable in CanonicalTraversable::find

This lets callers use the same canonical navigable lookup path for both
top-level and nested session history entry updates.

Author: shannonbooth

Libraries/LibWebView/CanonicalTraversable.cpp

@@ -40,18 +40,24 @@ CanonicalNavigable& CanonicalTraversable::insert(WebContentClient& reporting_cli
     return navigable_ref;
 }
 
-Optional<CanonicalNavigable&> CanonicalTraversable::find(Web::HTML::CrossProcessId frame_id)
+Optional<CanonicalNavigable&> CanonicalTraversable::find(Web::HTML::CrossProcessId navigable_id)
 {
-    auto navigable = m_navigable_index.get(frame_id);
+    if (id() == navigable_id)
+        return *this;
+
+    auto navigable = m_navigable_index.get(navigable_id);
     if (!navigable.has_value() || !navigable.value())
         return {};
 
     return *navigable.value();
 }
 
-Optional<CanonicalNavigable const&> CanonicalTraversable::find(Web::HTML::CrossProcessId frame_id) const
+Optional<CanonicalNavigable const&> CanonicalTraversable::find(Web::HTML::CrossProcessId navigable_id) const
 {
-    auto navigable = m_navigable_index.get(frame_id);
+    if (id() == navigable_id)
+        return *this;
+
+    auto navigable = m_navigable_index.get(navigable_id);
     if (!navigable.has_value() || !navigable.value())
         return {};
 

Libraries/LibWebView/CanonicalTraversable.h

@@ -211,8 +211,8 @@ class WEBVIEW_API CanonicalTraversable final
     virtual bool is_top_level_traversable() const override { return true; }
 
     CanonicalNavigable& insert(WebContentClient& reporting_client, u64 page_id, Web::HTML::CrossProcessId parent_frame_id, Web::HTML::CrossProcessId frame_id, CanonicalNavigable& fallback_parent);
-    Optional<CanonicalNavigable&> find(Web::HTML::CrossProcessId frame_id);
-    Optional<CanonicalNavigable const&> find(Web::HTML::CrossProcessId frame_id) const;
+    Optional<CanonicalNavigable&> find(Web::HTML::CrossProcessId navigable_id);
+    Optional<CanonicalNavigable const&> find(Web::HTML::CrossProcessId navigable_id) const;
     void remove(CanonicalNavigable&);
 
     TraversableSessionHistory const& session_history() const { return m_session_history; }