Fix several painting glitches for toolstrips.

chrome/browser/extensions/extension_view.cc

 // Copyright (c) 2006-2009 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/extensions/extension_view.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/extensions/extension.h"
@@ skipping 16 matching lines @@
 #include "grit/generated_resources.h"
 
 #include "webkit/glue/context_menu.h"
 
 ExtensionView::ExtensionView(Extension* extension,
                              const GURL& url,
                              SiteInstance* instance,
                              Browser* browser)
     : HWNDHtmlView(url, this, false, instance),
       extension_(extension),
-      browser_(browser) {
-  SetVisible(false);
+      browser_(browser),
+      did_stop_loading_(false),
+      pending_preferred_width_(0) {
+}
+
+void ExtensionView::ShowIfCompletelyLoaded() {
+  // We wait to show the ExtensionView until it has loaded and our parent has
+  // given us a background. These can happen in different orders.
+  if (did_stop_loading_ && !render_view_host()->view()->background().empty()) {
+    SetVisible(true);
+    DidContentsPreferredWidthChange(pending_preferred_width_);
+  }
+}
+
+void ExtensionView::SetBackground(const SkBitmap& background) {
+  HWNDHtmlView::SetBackground(background);
+  ShowIfCompletelyLoaded();
 }
 
 void ExtensionView::DidStopLoading(RenderViewHost* render_view_host,
       int32 page_id) {
   render_view_host->WasResized();
-  SetVisible(true);
+  did_stop_loading_ = true;
+  ShowIfCompletelyLoaded();
 }
 
 void ExtensionView::DidContentsPreferredWidthChange(const int pref_width) {
-  if (pref_width > 0) {
-    // SchedulePaint first because new_width may be smaller and we want
-    // the Parent to paint the vacated space.
-    SchedulePaint();
+  // Don't actually do anything with this information until we have been shown.
+  // Size changes will not be honored by lower layers while we are hidden.
+  if (!IsVisible()) {
+    pending_preferred_width_ = pref_width;
+  } else if (pref_width > 0) {
     set_preferred_size(gfx::Size(pref_width, height()));
     SizeToPreferredSize();
 
     // TODO(rafaelw): This assumes that the extension view is a child of an
     // ExtensionToolstrip, which is a child of the BookmarkBarView. There should
     // be a way to do this where the ExtensionView doesn't have to know it's
     // containment hierarchy.
     if (GetParent() != NULL && GetParent()->GetParent() != NULL) {
       GetParent()->GetParent()->Layout();
     }
 
     SchedulePaint();
-    render_view_host()->WasResized();
   }
 }
 
 void ExtensionView::CreatingRenderer() {
   render_view_host()->AllowExtensionBindings();
+  SetVisible(false);
 }
 
 void ExtensionView::RenderViewCreated(RenderViewHost* rvh) {
   URLRequestContext* context = rvh->process()->profile()->GetRequestContext();
   ExtensionMessageService::GetInstance(context)->RegisterExtension(
       extension_->id(), render_view_host()->process()->pid());
 }
 
 WebPreferences ExtensionView::GetWebkitPrefs() {
   PrefService* prefs = render_view_host()->process()->profile()->GetPrefs();
@@ skipping 72 matching lines @@
 }
 
 void ExtensionView::UpdateDragCursor(bool is_drop_target) {
 }
 
 void ExtensionView::TakeFocus(bool reverse) {
 }
 
 void ExtensionView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 }