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 #if defined(OS_WIN) | 5 #if defined(OS_WIN) |
6 #include <windows.h> | 6 #include <windows.h> |
7 #endif | 7 #endif |
8 | 8 |
9 #include "content/common/gpu/gpu_channel.h" | 9 #include "content/common/gpu/gpu_channel.h" |
10 | 10 |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 window, | 325 window, |
326 mailbox_manager_, | 326 mailbox_manager_, |
327 gfx::Size(), | 327 gfx::Size(), |
328 disallowed_features_, | 328 disallowed_features_, |
329 init_params.allowed_extensions, | 329 init_params.allowed_extensions, |
330 init_params.attribs, | 330 init_params.attribs, |
331 init_params.gpu_preference, | 331 init_params.gpu_preference, |
332 *route_id, | 332 *route_id, |
333 surface_id, | 333 surface_id, |
334 watchdog_, | 334 watchdog_, |
335 software_)); | 335 software_, |
| 336 init_params.active_url)); |
336 if (preempt_by_counter_.get()) | 337 if (preempt_by_counter_.get()) |
337 stub->SetPreemptByCounter(preempt_by_counter_); | 338 stub->SetPreemptByCounter(preempt_by_counter_); |
338 router_.AddRoute(*route_id, stub.get()); | 339 router_.AddRoute(*route_id, stub.get()); |
339 stubs_.AddWithID(stub.release(), *route_id); | 340 stubs_.AddWithID(stub.release(), *route_id); |
340 #endif // ENABLE_GPU | 341 #endif // ENABLE_GPU |
341 } | 342 } |
342 | 343 |
343 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) { | 344 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) { |
344 return stubs_.Lookup(route_id); | 345 return stubs_.Lookup(route_id); |
345 } | 346 } |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 share_group, | 494 share_group, |
494 gfx::GLSurfaceHandle(), | 495 gfx::GLSurfaceHandle(), |
495 mailbox_manager_.get(), | 496 mailbox_manager_.get(), |
496 size, | 497 size, |
497 disallowed_features_, | 498 disallowed_features_, |
498 init_params.allowed_extensions, | 499 init_params.allowed_extensions, |
499 init_params.attribs, | 500 init_params.attribs, |
500 init_params.gpu_preference, | 501 init_params.gpu_preference, |
501 route_id, | 502 route_id, |
502 0, watchdog_, | 503 0, watchdog_, |
503 software_)); | 504 software_, |
| 505 init_params.active_url)); |
504 if (preempt_by_counter_.get()) | 506 if (preempt_by_counter_.get()) |
505 stub->SetPreemptByCounter(preempt_by_counter_); | 507 stub->SetPreemptByCounter(preempt_by_counter_); |
506 router_.AddRoute(route_id, stub.get()); | 508 router_.AddRoute(route_id, stub.get()); |
507 stubs_.AddWithID(stub.release(), route_id); | 509 stubs_.AddWithID(stub.release(), route_id); |
508 TRACE_EVENT1("gpu", "GpuChannel::OnCreateOffscreenCommandBuffer", | 510 TRACE_EVENT1("gpu", "GpuChannel::OnCreateOffscreenCommandBuffer", |
509 "route_id", route_id); | 511 "route_id", route_id); |
510 #endif | 512 #endif |
511 | 513 |
512 GpuChannelMsg_CreateOffscreenCommandBuffer::WriteReplyParams( | 514 GpuChannelMsg_CreateOffscreenCommandBuffer::WriteReplyParams( |
513 reply_message, | 515 reply_message, |
(...skipping 14 matching lines...) Expand all Loading... |
528 // In case the renderer is currently blocked waiting for a sync reply from | 530 // In case the renderer is currently blocked waiting for a sync reply from |
529 // the stub, we need to make sure to reschedule the GpuChannel here. | 531 // the stub, we need to make sure to reschedule the GpuChannel here. |
530 if (need_reschedule) | 532 if (need_reschedule) |
531 OnScheduled(); | 533 OnScheduled(); |
532 } | 534 } |
533 | 535 |
534 if (reply_message) | 536 if (reply_message) |
535 Send(reply_message); | 537 Send(reply_message); |
536 } | 538 } |
537 | 539 |
OLD | NEW |