OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_webkitclient_impl.h" | 5 #include "content/renderer/renderer_webkitclient_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/platform_file.h" | 9 #include "base/platform_file.h" |
10 #include "base/shared_memory.h" | 10 #include "base/shared_memory.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 #include "content/common/webmessageportchannel_impl.h" | 22 #include "content/common/webmessageportchannel_impl.h" |
23 #include "content/plugin/npobject_util.h" | 23 #include "content/plugin/npobject_util.h" |
24 #include "content/renderer/render_view.h" | 24 #include "content/renderer/render_view.h" |
25 #include "content/renderer/renderer_webaudiodevice_impl.h" | 25 #include "content/renderer/renderer_webaudiodevice_impl.h" |
26 #include "content/renderer/renderer_webidbfactory_impl.h" | 26 #include "content/renderer/renderer_webidbfactory_impl.h" |
27 #include "content/renderer/renderer_webstoragenamespace_impl.h" | 27 #include "content/renderer/renderer_webstoragenamespace_impl.h" |
28 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h" | 28 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h" |
29 #include "content/renderer/websharedworkerrepository_impl.h" | 29 #include "content/renderer/websharedworkerrepository_impl.h" |
30 #include "googleurl/src/gurl.h" | 30 #include "googleurl/src/gurl.h" |
31 #include "ipc/ipc_sync_message_filter.h" | 31 #include "ipc/ipc_sync_message_filter.h" |
32 #include "media/audio/audio_util.h" | |
32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" |
33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D. h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D. h" |
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" |
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" |
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" |
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptVa lue.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptVa lue.h" |
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispat cher.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispat cher.h" |
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" |
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
528 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); | 529 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); |
529 } else { | 530 } else { |
530 #if defined(ENABLE_GPU) | 531 #if defined(ENABLE_GPU) |
531 return new WebGraphicsContext3DCommandBufferImpl(); | 532 return new WebGraphicsContext3DCommandBufferImpl(); |
532 #else | 533 #else |
533 return NULL; | 534 return NULL; |
534 #endif | 535 #endif |
535 } | 536 } |
536 } | 537 } |
537 | 538 |
539 double RendererWebKitClientImpl::audioHardwareSampleRate() { | |
540 return media::GetAudioHardwareSampleRate(); | |
scherkus (not reviewing)
2011/03/23 04:57:57
nit: two space indent
| |
541 } | |
542 | |
538 WebAudioDevice* | 543 WebAudioDevice* |
539 RendererWebKitClientImpl::createAudioDevice( | 544 RendererWebKitClientImpl::createAudioDevice( |
540 size_t buffer_size, | 545 size_t buffer_size, |
541 unsigned channels, | 546 unsigned channels, |
542 double sample_rate, | 547 double sample_rate, |
543 WebAudioDevice::RenderCallback* callback) { | 548 WebAudioDevice::RenderCallback* callback) { |
544 return new RendererWebAudioDeviceImpl(buffer_size, | 549 return new RendererWebAudioDeviceImpl(buffer_size, |
545 channels, | 550 channels, |
546 sample_rate, | 551 sample_rate, |
547 callback); | 552 callback); |
(...skipping 14 matching lines...) Expand all Loading... | |
562 return WebString::fromUTF8(signed_public_key); | 567 return WebString::fromUTF8(signed_public_key); |
563 } | 568 } |
564 | 569 |
565 //------------------------------------------------------------------------------ | 570 //------------------------------------------------------------------------------ |
566 | 571 |
567 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() { | 572 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() { |
568 if (!blob_registry_.get()) | 573 if (!blob_registry_.get()) |
569 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current())); | 574 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current())); |
570 return blob_registry_.get(); | 575 return blob_registry_.get(); |
571 } | 576 } |
OLD | NEW |