diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 19:08:17 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 19:08:17 +0000 |
commit | 088e6a3814c7de976650e8ad2b5cb075656d8665 (patch) | |
tree | a497d84665b80654395510d7f9634d02c31cc32c | |
parent | 68c51ad5dd7a93413ba8cb54c97005c0072163f2 (diff) | |
download | chromium_src-088e6a3814c7de976650e8ad2b5cb075656d8665.zip chromium_src-088e6a3814c7de976650e8ad2b5cb075656d8665.tar.gz chromium_src-088e6a3814c7de976650e8ad2b5cb075656d8665.tar.bz2 |
Fix paint flashing when switching tabs on ChromeOS. It seems like this hidden tab host window isn't necessary... it was previously. Anyway, this fixes the flashing.
BUG=chromium-os:15507
TEST=see bug
Review URL: http://codereview.chromium.org/7059017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86317 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc | 19 | ||||
-rw-r--r-- | views/widget/native_widget_gtk.cc | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc index 144728e..1ba0c6e 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc @@ -57,22 +57,6 @@ gboolean OnMouseScroll(GtkWidget* widget, GdkEventScroll* event, return FALSE; } -gfx::NativeView GetHiddenTabHostWindow() { - static views::Widget* widget = NULL; - - if (!widget) { - widget = new views::Widget; - // We don't want this widget to be closed automatically, this causes - // problems in tests that close the last non-secondary window. - widget->set_is_secondary_widget(false); - views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - widget->Init(params); - } - - return static_cast<views::NativeWidgetGtk*>(widget->native_widget())-> - window_contents(); -} - } // namespace //////////////////////////////////////////////////////////////////////////////// @@ -130,9 +114,6 @@ void NativeTabContentsViewGtk::InitNativeTabContentsView() { } void NativeTabContentsViewGtk::Unparent() { - // Note that we do not DCHECK on focus_manager_ as it may be NULL when used - // with an external tab container. - NativeWidget::ReparentNativeView(GetNativeView(), GetHiddenTabHostWindow()); } RenderWidgetHostView* NativeTabContentsViewGtk::CreateRenderWidgetHostView( diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index ba3364c..a838b64 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -897,8 +897,6 @@ void NativeWidgetGtk::SetSize(const gfx::Size& size) { if (GTK_IS_VIEWS_FIXED(parent)) { gtk_views_fixed_set_widget_size(widget_, size.width(), size.height()); } else { - DCHECK(GTK_IS_FIXED(parent)) - << "Parent of NativeWidgetGtk has to be Fixed or ViewsFixed"; gtk_widget_set_size_request(widget_, size.width(), size.height()); } } else { |