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_message_filter.h" | 5 #include "content/browser/renderer_host/render_message_filter.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 case 1: | 583 case 1: |
584 key_size_in_bits = 1024; | 584 key_size_in_bits = 1024; |
585 break; | 585 break; |
586 default: | 586 default: |
587 DCHECK(false) << "Illegal key_size_index " << key_size_index; | 587 DCHECK(false) << "Illegal key_size_index " << key_size_index; |
588 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); | 588 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
589 Send(reply_msg); | 589 Send(reply_msg); |
590 return; | 590 return; |
591 } | 591 } |
592 | 592 |
| 593 if (!GetContentClient()->browser()->AllowKeygen(url, resource_context_)) { |
| 594 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
| 595 Send(reply_msg); |
| 596 return; |
| 597 } |
| 598 |
593 resource_context_->CreateKeygenHandler( | 599 resource_context_->CreateKeygenHandler( |
594 key_size_in_bits, | 600 key_size_in_bits, |
595 challenge_string, | 601 challenge_string, |
596 url, | 602 url, |
597 base::Bind( | 603 base::Bind( |
598 &RenderMessageFilter::PostKeygenToWorkerThread, this, reply_msg)); | 604 &RenderMessageFilter::PostKeygenToWorkerThread, this, reply_msg)); |
599 } | 605 } |
600 | 606 |
601 void RenderMessageFilter::PostKeygenToWorkerThread( | 607 void RenderMessageFilter::PostKeygenToWorkerThread( |
602 IPC::Message* reply_msg, | 608 IPC::Message* reply_msg, |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
698 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( | 704 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( |
699 gfx::GpuMemoryBufferId id, | 705 gfx::GpuMemoryBufferId id, |
700 const gpu::SyncToken& sync_token) { | 706 const gpu::SyncToken& sync_token) { |
701 DCHECK(BrowserGpuMemoryBufferManager::current()); | 707 DCHECK(BrowserGpuMemoryBufferManager::current()); |
702 | 708 |
703 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( | 709 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( |
704 id, PeerHandle(), render_process_id_, sync_token); | 710 id, PeerHandle(), render_process_id_, sync_token); |
705 } | 711 } |
706 | 712 |
707 } // namespace content | 713 } // namespace content |
OLD | NEW |