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 "webkit/glue/webkitclient_impl.h" | 5 #include "webkit/glue/webkitclient_impl.h" |
6 | 6 |
7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <malloc.h> | 8 #include <malloc.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" | 30 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" |
31 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" | 31 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" |
32 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h" | 32 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h" |
33 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" | 33 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" |
34 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" | 34 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" |
35 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" | 35 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" |
36 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" | 36 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" |
37 #include "webkit/glue/media/audio_decoder.h" | 37 #include "webkit/glue/media/audio_decoder.h" |
38 #include "webkit/plugins/npapi/plugin_instance.h" | 38 #include "webkit/plugins/npapi/plugin_instance.h" |
39 #include "webkit/plugins/npapi/webplugininfo.h" | 39 #include "webkit/plugins/npapi/webplugininfo.h" |
| 40 #include "webkit/glue/webaudiodevice_impl.h" |
40 #include "webkit/glue/webkit_glue.h" | 41 #include "webkit/glue/webkit_glue.h" |
41 #include "webkit/glue/websocketstreamhandle_impl.h" | 42 #include "webkit/glue/websocketstreamhandle_impl.h" |
42 #include "webkit/glue/weburlloader_impl.h" | 43 #include "webkit/glue/weburlloader_impl.h" |
43 | 44 |
44 #if defined(OS_LINUX) | 45 #if defined(OS_LINUX) |
45 #include "v8/include/v8.h" | 46 #include "v8/include/v8.h" |
46 #endif | 47 #endif |
47 | 48 |
48 using WebKit::WebAudioBus; | 49 using WebKit::WebAudioBus; |
| 50 using WebKit::WebAudioDevice; |
49 using WebKit::WebCookie; | 51 using WebKit::WebCookie; |
50 using WebKit::WebData; | 52 using WebKit::WebData; |
51 using WebKit::WebLocalizedString; | 53 using WebKit::WebLocalizedString; |
52 using WebKit::WebPluginListBuilder; | 54 using WebKit::WebPluginListBuilder; |
53 using WebKit::WebString; | 55 using WebKit::WebString; |
54 using WebKit::WebSocketStreamHandle; | 56 using WebKit::WebSocketStreamHandle; |
55 using WebKit::WebThemeEngine; | 57 using WebKit::WebThemeEngine; |
56 using WebKit::WebURL; | 58 using WebKit::WebURL; |
57 using WebKit::WebURLLoader; | 59 using WebKit::WebURLLoader; |
58 using WebKit::WebVector; | 60 using WebKit::WebVector; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 } | 206 } |
205 | 207 |
206 WebThemeEngine* WebKitClientImpl::themeEngine() { | 208 WebThemeEngine* WebKitClientImpl::themeEngine() { |
207 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) | 209 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) |
208 return &theme_engine_; | 210 return &theme_engine_; |
209 #else | 211 #else |
210 return NULL; | 212 return NULL; |
211 #endif | 213 #endif |
212 } | 214 } |
213 | 215 |
| 216 WebAudioDevice* WebKitClientImpl::createAudioDevice( |
| 217 size_t buffer_size, unsigned channels, double sample_rate, |
| 218 WebAudioDevice::RenderCallback* callback) { |
| 219 return new WebAudioDeviceImpl(buffer_size, |
| 220 channels, |
| 221 sample_rate, |
| 222 callback); |
| 223 } |
| 224 |
214 WebURLLoader* WebKitClientImpl::createURLLoader() { | 225 WebURLLoader* WebKitClientImpl::createURLLoader() { |
215 return new WebURLLoaderImpl(); | 226 return new WebURLLoaderImpl(); |
216 } | 227 } |
217 | 228 |
218 WebSocketStreamHandle* WebKitClientImpl::createSocketStreamHandle() { | 229 WebSocketStreamHandle* WebKitClientImpl::createSocketStreamHandle() { |
219 return new WebSocketStreamHandleImpl(); | 230 return new WebSocketStreamHandleImpl(); |
220 } | 231 } |
221 | 232 |
222 WebString WebKitClientImpl::userAgent(const WebURL& url) { | 233 WebString WebKitClientImpl::userAgent(const WebURL& url) { |
223 return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); | 234 return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 ++shared_timer_suspended_; | 550 ++shared_timer_suspended_; |
540 } | 551 } |
541 | 552 |
542 void WebKitClientImpl::ResumeSharedTimer() { | 553 void WebKitClientImpl::ResumeSharedTimer() { |
543 // The shared timer may have fired or been adjusted while we were suspended. | 554 // The shared timer may have fired or been adjusted while we were suspended. |
544 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 555 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
545 setSharedTimerFireTime(shared_timer_fire_time_); | 556 setSharedTimerFireTime(shared_timer_fire_time_); |
546 } | 557 } |
547 | 558 |
548 } // namespace webkit_glue | 559 } // namespace webkit_glue |
OLD | NEW |