Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId (Closed)
Patch Set: Fixed windows + android + mac issues Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 params.image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); 374 params.image_decode_color_space = gfx::ICCProfile::FromBestMonitor();
375 GetWidget()->GetResizeParams(&params.initial_size); 375 GetWidget()->GetResizeParams(&params.initial_size);
376 376
377 if (!Send(new ViewMsg_New(params))) 377 if (!Send(new ViewMsg_New(params)))
378 return false; 378 return false;
379 GetWidget()->SetInitialRenderSizeParams(params.initial_size); 379 GetWidget()->SetInitialRenderSizeParams(params.initial_size);
380 380
381 // If the RWHV has not yet been set, the surface ID namespace will get 381 // If the RWHV has not yet been set, the surface ID namespace will get
382 // passed down by the call to SetView(). 382 // passed down by the call to SetView().
383 if (GetWidget()->GetView()) { 383 if (GetWidget()->GetView()) {
384 Send(new ViewMsg_SetSurfaceClientId( 384 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(),
385 GetRoutingID(), GetWidget()->GetView()->GetSurfaceClientId())); 385 GetWidget()->GetView()->GetFrameSinkId()));
386 } 386 }
387 387
388 // If it's enabled, tell the renderer to set up the Javascript bindings for 388 // If it's enabled, tell the renderer to set up the Javascript bindings for
389 // sending messages back to the browser. 389 // sending messages back to the browser.
390 if (GetProcess()->IsForGuestsOnly()) 390 if (GetProcess()->IsForGuestsOnly())
391 DCHECK_EQ(0, enabled_bindings_); 391 DCHECK_EQ(0, enabled_bindings_);
392 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); 392 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_));
393 // Let our delegate know that we created a RenderView. 393 // Let our delegate know that we created a RenderView.
394 delegate_->RenderViewCreated(this); 394 delegate_->RenderViewCreated(this);
395 395
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 // Note: We are using the origin URL provided by the sender here. It may be 1324 // Note: We are using the origin URL provided by the sender here. It may be
1325 // different from the receiver's. 1325 // different from the receiver's.
1326 file_system_file.url = 1326 file_system_file.url =
1327 GURL(storage::GetIsolatedFileSystemRootURIString( 1327 GURL(storage::GetIsolatedFileSystemRootURIString(
1328 file_system_url.origin(), filesystem_id, std::string()) 1328 file_system_url.origin(), filesystem_id, std::string())
1329 .append(register_name)); 1329 .append(register_name));
1330 } 1330 }
1331 } 1331 }
1332 1332
1333 } // namespace content 1333 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698