OLD | NEW |
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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 params.image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); | 373 params.image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); |
374 GetWidget()->GetResizeParams(¶ms.initial_size); | 374 GetWidget()->GetResizeParams(¶ms.initial_size); |
375 | 375 |
376 if (!Send(new ViewMsg_New(params))) | 376 if (!Send(new ViewMsg_New(params))) |
377 return false; | 377 return false; |
378 GetWidget()->SetInitialRenderSizeParams(params.initial_size); | 378 GetWidget()->SetInitialRenderSizeParams(params.initial_size); |
379 | 379 |
380 // If the RWHV has not yet been set, the surface ID namespace will get | 380 // If the RWHV has not yet been set, the surface ID namespace will get |
381 // passed down by the call to SetView(). | 381 // passed down by the call to SetView(). |
382 if (GetWidget()->GetView()) { | 382 if (GetWidget()->GetView()) { |
383 Send(new ViewMsg_SetSurfaceClientId( | 383 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(), |
384 GetRoutingID(), GetWidget()->GetView()->GetSurfaceClientId())); | 384 GetWidget()->GetView()->GetFrameSinkId())); |
385 } | 385 } |
386 | 386 |
387 // If it's enabled, tell the renderer to set up the Javascript bindings for | 387 // If it's enabled, tell the renderer to set up the Javascript bindings for |
388 // sending messages back to the browser. | 388 // sending messages back to the browser. |
389 if (GetProcess()->IsForGuestsOnly()) | 389 if (GetProcess()->IsForGuestsOnly()) |
390 DCHECK_EQ(0, enabled_bindings_); | 390 DCHECK_EQ(0, enabled_bindings_); |
391 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); | 391 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); |
392 // Let our delegate know that we created a RenderView. | 392 // Let our delegate know that we created a RenderView. |
393 delegate_->RenderViewCreated(this); | 393 delegate_->RenderViewCreated(this); |
394 | 394 |
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 // Note: We are using the origin URL provided by the sender here. It may be | 1321 // Note: We are using the origin URL provided by the sender here. It may be |
1322 // different from the receiver's. | 1322 // different from the receiver's. |
1323 file_system_file.url = | 1323 file_system_file.url = |
1324 GURL(storage::GetIsolatedFileSystemRootURIString( | 1324 GURL(storage::GetIsolatedFileSystemRootURIString( |
1325 file_system_url.origin(), filesystem_id, std::string()) | 1325 file_system_url.origin(), filesystem_id, std::string()) |
1326 .append(register_name)); | 1326 .append(register_name)); |
1327 } | 1327 } |
1328 } | 1328 } |
1329 | 1329 |
1330 } // namespace content | 1330 } // namespace content |
OLD | NEW |