Wait showing html dialog until renderer finish painting after page is loaded.

chrome/browser/ui/views/html_dialog_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/html_dialog_view.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/window.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/native_web_keyboard_event.h"
+#include "content/common/notification_details.h"
+#include "content/common/notification_source.h"
+#include "content/common/notification_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "views/window/native_window_gtk.h"
 #endif
 
+class RenderWidgetHost;
+
 namespace browser {
 
 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile,
                                  HtmlDialogUIDelegate* delegate) {
   HtmlDialogView* html_view =
       new HtmlDialogView(profile, delegate);
   browser::CreateViewsWindow(parent, gfx::Rect(), html_view);
   html_view->InitDialog();
   html_view->window()->Show();
   return html_view->window()->GetNativeWindow();
 }
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, public:
 
 HtmlDialogView::HtmlDialogView(Profile* profile,
                                HtmlDialogUIDelegate* delegate)
     : DOMView(),
       HtmlDialogTabContentsDelegate(profile),
+      state_(NONE),
       delegate_(delegate) {
 }
 
 HtmlDialogView::~HtmlDialogView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::View implementation:
 
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
   if (delegate_)
     delegate_->GetDialogSize(&out);
   return out;
 }
 
 bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
   // Pressing ESC closes the dialog.
   DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
   OnWindowClosed();
   OnDialogClosed(std::string());
   return true;
 }
 
+void HtmlDialogView::ViewHierarchyChanged(
+    bool is_add, View* parent, View* child) {
+  DOMView::ViewHierarchyChanged(is_add, parent, child);
+  if (is_add && GetWidget() && state_ == NONE) {
+    state_ = INITIALIZED;
+#if defined(OS_CHROMEOS)

[sky, 2011/06/07 15:41:17]

Should the ifdefs be OS_LINUX?

[oshima, 2011/06/07 19:08:58]

This make sense only with chromeos wm. Note that this requires different
mechanism when we move to NativeWidgetViews.

+    CHECK(
+        static_cast<views::NativeWidgetGtk*>(
+            GetWidget()->native_widget())->SuppressFreezeUpdates());
+#endif
+    RegisterDialogAccelerators();
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::WindowDelegate implementation:
 
 bool HtmlDialogView::CanResize() const {
   return true;
 }
 
 bool HtmlDialogView::IsModal() const {
   if (delegate_)
     return delegate_->IsDialogModal();
@@ skipping 136 matching lines @@
 void HtmlDialogView::InitDialog() {
   // Now Init the DOMView. This view runs in its own process to render the html.
   DOMView::Init(profile(), NULL);
 
   tab_contents_->set_delegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),
                                                   this);
-
-  // Pressing the ESC key will close the dialog.
-  AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
+  notification_registrar_.Add(
+      this,
+      NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+      Source<TabContents>(tab_contents()));
+  notification_registrar_.Add(
+      this,
+      NotificationType::LOAD_COMPLETED_MAIN_FRAME,
+      Source<TabContents>(tab_contents()));
 
   DOMView::LoadURL(GetDialogContentURL());
 }
+
+void HtmlDialogView::Observe(NotificationType type,
+                             const NotificationSource& source,
+                             const NotificationDetails& details) {
+  if (type == NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB) {

[sky, 2011/06/07 15:41:17]

nit: a switch would be more readable here.

[oshima, 2011/06/07 19:08:58]

Done.

+    RenderWidgetHost* rwh = Details<RenderWidgetHost>(details).ptr();
+    notification_registrar_.Add(
+        this,
+        NotificationType::RENDER_WIDGET_HOST_DID_PAINT,
+        Source<RenderWidgetHost>(rwh));
+    return;
+  }
+
+  if (type == NotificationType::LOAD_COMPLETED_MAIN_FRAME &&
+      state_ == INITIALIZED) {
+    state_ = LOADED;
+  } else if (type == NotificationType::RENDER_WIDGET_HOST_DID_PAINT &&
+             state_ == LOADED) {
+    state_ = PAINTED;
+#if defined(OS_CHROMEOS)
+    views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
+        GTK_WINDOW(GetWidget()->GetNativeView()), false);
+#endif
+  }
+}
+
+void HtmlDialogView::RegisterDialogAccelerators() {
+  // Pressing the ESC key will close the dialog.
+  AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
+}