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/renderer/renderer_webkitplatformsupport_impl.h" | 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/platform_file.h" | 10 #include "base/platform_file.h" |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 base::SharedMemoryHandle font_data; | 494 base::SharedMemoryHandle font_data; |
495 if (!RenderThreadImpl::current()->Send(new ViewHostMsg_LoadFont( | 495 if (!RenderThreadImpl::current()->Send(new ViewHostMsg_LoadFont( |
496 src_font_descriptor, &font_data_size, &font_data, font_id))) { | 496 src_font_descriptor, &font_data_size, &font_data, font_id))) { |
497 *out = NULL; | 497 *out = NULL; |
498 *font_id = 0; | 498 *font_id = 0; |
499 return false; | 499 return false; |
500 } | 500 } |
501 | 501 |
502 if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle() || | 502 if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle() || |
503 *font_id == 0) { | 503 *font_id == 0) { |
504 NOTREACHED() << "Bad response from ViewHostMsg_LoadFont() for " << | 504 LOG(ERROR) << "Bad response from ViewHostMsg_LoadFont() for " << |
505 src_font_descriptor.font_name; | 505 src_font_descriptor.font_name; |
506 *out = NULL; | 506 *out = NULL; |
507 *font_id = 0; | 507 *font_id = 0; |
508 return false; | 508 return false; |
509 } | 509 } |
510 | 510 |
511 // TODO(jeremy): Need to call back into WebKit to make sure that the font | 511 // TODO(jeremy): Need to call back into WebKit to make sure that the font |
512 // isn't already activated, based on the font id. If it's already | 512 // isn't already activated, based on the font id. If it's already |
513 // activated, don't reactivate it here - crbug.com/72727 . | 513 // activated, don't reactivate it here - crbug.com/72727 . |
514 | 514 |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 DCHECK(render_thread); | 735 DCHECK(render_thread); |
736 if (!render_thread) | 736 if (!render_thread) |
737 return NULL; | 737 return NULL; |
738 return render_thread->CreateMediaStreamCenter(client); | 738 return render_thread->CreateMediaStreamCenter(client); |
739 } | 739 } |
740 | 740 |
741 GpuChannelHostFactory* | 741 GpuChannelHostFactory* |
742 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() { | 742 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() { |
743 return RenderThreadImpl::current(); | 743 return RenderThreadImpl::current(); |
744 } | 744 } |
OLD | NEW |