Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 8570010: Moving media-related files from webkit/glue/ to webkit/media/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: minor fixes Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webmediaplayer_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitplatformsupport_impl.cc
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 4ab1a54681d9159dc484d7a09f022ae77a1c1136..7c0863f3d7293438ff27101514566c89f30b76b6 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -37,13 +37,13 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
-#include "webkit/glue/media/audio_decoder.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/webplugininfo.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/websocketstreamhandle_impl.h"
#include "webkit/glue/webthread_impl.h"
#include "webkit/glue/weburlloader_impl.h"
+#include "webkit/media/audio_decoder.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/webplugininfo.h"
#if defined(OS_LINUX)
#include "v8/include/v8.h"
@@ -450,10 +450,10 @@ WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
bool WebKitPlatformSupportImpl::loadAudioResource(
WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
size_t data_size, double sample_rate) {
- return DecodeAudioFileData(destination_bus,
- audio_file_data,
- data_size,
- sample_rate);
+ return webkit_media::DecodeAudioFileData(destination_bus,
+ audio_file_data,
+ data_size,
+ sample_rate);
}
WebString WebKitPlatformSupportImpl::queryLocalizedString(
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webmediaplayer_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698