fix: BrowserViews not painting their WebContents

electron · Jul 29, 2021 · f5ff36b · f5ff36b
1 parent c5ad7ed
commit f5ff36b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/shell/browser/native_browser_view_views.cc b/shell/browser/native_browser_view_views.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "shell/browser/ui/drag_util.h"
-#include "shell/browser/ui/inspectable_web_contents_view.h"
+#include "shell/browser/ui/inspectable_web_contents_view_views.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/background.h"
 #include "ui/views/view.h"
@@ -137,6 +137,13 @@ gfx::Rect NativeBrowserViewViews::GetBounds() {
   return iwc_view->GetView()->bounds();
 }
 
+void NativeBrowserViewViews::RenderViewReady() {
+  auto* iwc_view = GetInspectableWebContentsView();
+  if (!iwc_view)
+    return;
+  static_cast<InspectableWebContentsViewViews*>(iwc_view)->Layout();
+}
+
 void NativeBrowserViewViews::SetBackgroundColor(SkColor color) {
   auto* iwc_view = GetInspectableWebContentsView();
   if (!iwc_view)

diff --git a/shell/browser/native_browser_view_views.h b/shell/browser/native_browser_view_views.h
@@ -33,6 +33,9 @@ class NativeBrowserViewViews : public NativeBrowserView {
   void UpdateDraggableRegions(
       const std::vector<mojom::DraggableRegionPtr>& regions) override;
 
+  // WebContentsObserver:
+  void DidFirstVisuallyNonEmptyPaint() override;
+
   SkRegion* draggable_region() const { return draggable_region_.get(); }
 
  private:

diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.h b/shell/browser/ui/views/inspectable_web_contents_view_views.h
@@ -41,16 +41,16 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
       const DevToolsContentsResizingStrategy& strategy) override;
   void SetTitle(const std::u16string& title) override;
 
+  // views::View:
+  void Layout() override;
+
   InspectableWebContents* inspectable_web_contents() {
     return inspectable_web_contents_;
   }
 
   const std::u16string& GetTitle() const { return title_; }
 
  private:
-  // views::View:
-  void Layout() override;
-
   // Owns us.
   InspectableWebContents* inspectable_web_contents_;