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 "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | 44 #include "webkit/compositor_bindings/web_compositor_support_impl.h" |
45 #include "webkit/glue/fling_curve_configuration.h" | 45 #include "webkit/glue/fling_curve_configuration.h" |
46 #include "webkit/glue/touch_fling_gesture_curve.h" | 46 #include "webkit/glue/touch_fling_gesture_curve.h" |
47 #include "webkit/glue/web_discardable_memory_impl.h" | 47 #include "webkit/glue/web_discardable_memory_impl.h" |
48 #include "webkit/glue/webkit_glue.h" | 48 #include "webkit/glue/webkit_glue.h" |
49 #include "webkit/glue/websocketstreamhandle_impl.h" | 49 #include "webkit/glue/websocketstreamhandle_impl.h" |
50 #include "webkit/glue/webthread_impl.h" | 50 #include "webkit/glue/webthread_impl.h" |
51 #include "webkit/glue/weburlloader_impl.h" | 51 #include "webkit/glue/weburlloader_impl.h" |
52 #include "webkit/glue/worker_task_runner.h" | 52 #include "webkit/glue/worker_task_runner.h" |
53 #include "webkit/media/audio_decoder.h" | 53 #include "webkit/media/audio_decoder.h" |
| 54 #include "webkit/media/webmediasourceclient_impl.h" |
54 #include "webkit/plugins/npapi/plugin_instance.h" | 55 #include "webkit/plugins/npapi/plugin_instance.h" |
55 #include "webkit/plugins/webplugininfo.h" | 56 #include "webkit/plugins/webplugininfo.h" |
56 #include "webkit/user_agent/user_agent.h" | 57 #include "webkit/user_agent/user_agent.h" |
57 | 58 |
58 #if defined(OS_ANDROID) | 59 #if defined(OS_ANDROID) |
59 #include "webkit/glue/fling_animator_impl_android.h" | 60 #include "webkit/glue/fling_animator_impl_android.h" |
60 #endif | 61 #endif |
61 | 62 |
62 using WebKit::WebAudioBus; | 63 using WebKit::WebAudioBus; |
63 using WebKit::WebCookie; | 64 using WebKit::WebCookie; |
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
954 WebKitPlatformSupportImpl::allocateAndLockDiscardableMemory(size_t bytes) { | 955 WebKitPlatformSupportImpl::allocateAndLockDiscardableMemory(size_t bytes) { |
955 if (!base::DiscardableMemory::Supported()) | 956 if (!base::DiscardableMemory::Supported()) |
956 return NULL; | 957 return NULL; |
957 scoped_ptr<WebDiscardableMemoryImpl> discardable( | 958 scoped_ptr<WebDiscardableMemoryImpl> discardable( |
958 new WebDiscardableMemoryImpl()); | 959 new WebDiscardableMemoryImpl()); |
959 if (discardable->InitializeAndLock(bytes)) | 960 if (discardable->InitializeAndLock(bytes)) |
960 return discardable.release(); | 961 return discardable.release(); |
961 return NULL; | 962 return NULL; |
962 } | 963 } |
963 | 964 |
| 965 bool WebKitPlatformSupportImpl::isTypeSupportedForMediaSource( |
| 966 const WebKit::WebString& type, |
| 967 const WebKit::WebVector<WebKit::WebString>& codecs) { |
| 968 return webkit_media::WebMediaSourceClientImpl::isTypeSupported(type, codecs); |
| 969 } |
964 | 970 |
965 } // namespace webkit_glue | 971 } // namespace webkit_glue |
OLD | NEW |