diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 01:07:44 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 01:07:44 +0000 |
| commit | fba962db1661e8529be0ac6bfc766ca8058331e8 (patch) | |
| tree | f74e4ebcab7cf25c4616bbc1d9081b1465ae47ab /content | |
| parent | bbb288fab24dc9a74a60b1ef68c1be4a51790915 (diff) | |
| download | chromium_src-fba962db1661e8529be0ac6bfc766ca8058331e8.zip chromium_src-fba962db1661e8529be0ac6bfc766ca8058331e8.tar.gz chromium_src-fba962db1661e8529be0ac6bfc766ca8058331e8.tar.bz2 | |
Always set up the GLSurfaceHandle in RenderWidgetHostImpl::SetView
Otherwise WebViewInteractiveTest.NewWindow_NewWindowNameTakesPrecendence would sometimes have the surface handle set up incorrectly, so the renderer couldn't create a context.
BUG=
Review URL: https://codereview.chromium.org/204943005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_impl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 7c3d98c5..dc71351 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -338,10 +338,8 @@ RenderWidgetHostImpl* RenderWidgetHostImpl::From(RenderWidgetHost* rwh) { void RenderWidgetHostImpl::SetView(RenderWidgetHostView* view) { view_ = RenderWidgetHostViewPort::FromRWHV(view); - if (!view_) { - GpuSurfaceTracker::Get()->SetSurfaceHandle( - surface_id_, gfx::GLSurfaceHandle()); - } + GpuSurfaceTracker::Get()->SetSurfaceHandle( + surface_id_, GetCompositingSurface()); synthetic_gesture_controller_.reset(); } |