Revert revisions 47902 and 47900....

views/controls/native/native_view_host_gtk.cc

 // Copyright (c) 2010 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 "views/controls/native/native_view_host_gtk.h"
 
 #include <gtk/gtk.h>
 #include <algorithm>
 
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
-#include "views/widget/gtk_views_fixed.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
 
 namespace {
 static bool signal_id_initialized_ = false;
 static guint focus_in_event_signal_id_;
 static guint focus_out_event_signal_id_;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 198 matching lines @@
   int child_h = h;
   if (installed_clip_) {
     child_x = -installed_clip_bounds_.x();
     child_y = -installed_clip_bounds_.y();
     fixed_x += -child_x;
     fixed_y += -child_y;
     fixed_w = std::min(installed_clip_bounds_.width(), w);
     fixed_h = std::min(installed_clip_bounds_.height(), h);
   }
 
-  // Size and place the hosted NativeView. It should be done BEFORE placing
-  // fixed_ itself, otherwise controls will initially appear at 0,0 of fixed_
-  // parent.
-  GtkAllocation alloc = { child_x, child_y, child_w, child_h };
-  gtk_widget_size_allocate(host_->native_view(), &alloc);
-  gtk_views_fixed_set_use_allocated_size(host_->native_view(), true);
-  gtk_fixed_move(GTK_FIXED(fixed_), host_->native_view(), child_x, child_y);
-
   // Size and place the fixed_.
   GetHostWidget()->PositionChild(fixed_, fixed_x, fixed_y, fixed_w, fixed_h);
 
+  // Size and place the hosted NativeView.
+  gtk_widget_set_size_request(host_->native_view(), child_w, child_h);
+  gtk_fixed_move(GTK_FIXED(fixed_), host_->native_view(), child_x, child_y);
+
   gtk_widget_show(fixed_);
   gtk_widget_show(host_->native_view());
 }
 
 void NativeViewHostGtk::HideWidget() {
   gtk_widget_hide(fixed_);
 }
 
 void NativeViewHostGtk::SetFocus() {
   DCHECK(host_->native_view());
@@ skipping 17 matching lines @@
   if (focused_widget) {
     // A descendant of our fixed has focus. When we destroy the fixed focus is
     // automatically moved. Temporarily move focus to our host widget, then
     // restore focus after we create the new fixed_. This way focus hasn't
     // really moved.
     gtk_widget_grab_focus(GetHostWidget()->GetNativeView());
   }
 
   DestroyFixed();
 
-  fixed_ = gtk_views_fixed_new();
+  fixed_ = gtk_fixed_new();
   gtk_widget_set_name(fixed_, "views-native-view-host-fixed");
   gtk_fixed_set_has_window(GTK_FIXED(fixed_), needs_window);
   // Defeat refcounting. We need to own the fixed.
   gtk_widget_ref(fixed_);
 
   WidgetGtk* widget_gtk = GetHostWidget();
   if (widget_gtk)
     widget_gtk->AddChild(fixed_);
 
   if (host_->native_view())
@@ skipping 74 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostGtk(host);
 }
 
 }  // namespace views