summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 17:07:23 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 17:07:23 +0000
commit34ac70504d7090a9689c78fbcadd1a1224fc9cdd (patch)
tree67aed39edc366610a7f3e56f057d8e7916e6975d /chrome/browser/renderer_host
parent43d4bfc54a2d1ef06281acbb0456f04dcae81c18 (diff)
downloadchromium_src-34ac70504d7090a9689c78fbcadd1a1224fc9cdd.zip
chromium_src-34ac70504d7090a9689c78fbcadd1a1224fc9cdd.tar.gz
chromium_src-34ac70504d7090a9689c78fbcadd1a1224fc9cdd.tar.bz2
Allow the initial size of TabContentViews to be based on the
size of another TabContents by having an optional TabContents* passed into the TabContents ctor. This fixes a race condition where it's possible for a web page to load before getting the sizing information from the browser. The new flow passes the size information to the renderer process before passing the URL to load. BUG=20159 Review URL: http://codereview.chromium.org/201130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_gtk.cc1
-rw-r--r--chrome/browser/renderer_host/test/site_instance_unittest.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 0f680bc..0440820 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -400,6 +400,7 @@ void RenderWidgetHostViewGtk::SetSize(const gfx::Size& size) {
// children.
gtk_widget_set_size_request(view_.get(), width, height);
#endif
+
requested_size_ = gfx::Size(width, height);
host_->WasResized();
}
diff --git a/chrome/browser/renderer_host/test/site_instance_unittest.cc b/chrome/browser/renderer_host/test/site_instance_unittest.cc
index 0320152..24b269e 100644
--- a/chrome/browser/renderer_host/test/site_instance_unittest.cc
+++ b/chrome/browser/renderer_host/test/site_instance_unittest.cc
@@ -116,7 +116,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
&siteDeleteCounter,
&browsingDeleteCounter);
{
- TabContents contents(profile.get(), instance, MSG_ROUTING_NONE, NULL);
+ TabContents contents(profile.get(), instance, MSG_ROUTING_NONE, NULL, NULL);
EXPECT_EQ(1, siteDeleteCounter);
EXPECT_EQ(1, browsingDeleteCounter);
}