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

Unified Diff: ppapi/proxy/resource_creation_proxy.cc

Issue 7621070: Merge the plugin and impl side of the audio config and input event resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compile issues Created 9 years, 4 months 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
Index: ppapi/proxy/resource_creation_proxy.cc
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index c6d02a7e5d2bc55f1c82edd8bf8c8bf23497bc79..a98d8b05674415c65b5af05624b1455fb09ec19b 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -11,7 +11,6 @@
#include "ppapi/c/trusted/ppb_image_data_trusted.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/proxy/ppb_audio_config_proxy.h"
#include "ppapi/proxy/ppb_audio_proxy.h"
#include "ppapi/proxy/ppb_buffer_proxy.h"
#include "ppapi/proxy/ppb_broker_proxy.h"
@@ -32,6 +31,7 @@
#include "ppapi/proxy/ppb_url_request_info_proxy.h"
#include "ppapi/proxy/ppb_video_capture_proxy.h"
#include "ppapi/proxy/ppb_video_decoder_proxy.h"
+#include "ppapi/shared_impl/audio_config_impl.h"
#include "ppapi/shared_impl/font_impl.h"
#include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/shared_impl/host_resource.h"
@@ -69,7 +69,7 @@ PP_Resource ResourceCreationProxy::CreateAudioConfig(
PP_Instance instance,
PP_AudioSampleRate sample_rate,
uint32_t sample_frame_count) {
- return PPB_AudioConfig_Proxy::CreateProxyResource(
+ return AudioConfigImpl::CreateAsProxy(
instance, sample_rate, sample_frame_count);
}
@@ -217,7 +217,8 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent(
data.character_text = text_str->value();
}
- return PPB_InputEvent_Proxy::CreateProxyResource(instance, data);
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
@@ -243,7 +244,8 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
data.mouse_position = *mouse_position;
data.mouse_click_count = click_count;
- return PPB_InputEvent_Proxy::CreateProxyResource(instance, data);
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateGraphics3D(
@@ -326,7 +328,8 @@ PP_Resource ResourceCreationProxy::CreateWheelInputEvent(
data.wheel_ticks = *wheel_ticks;
data.wheel_scroll_by_page = PP_ToBool(scroll_by_page);
- return PPB_InputEvent_Proxy::CreateProxyResource(instance, data);
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
bool ResourceCreationProxy::Send(IPC::Message* msg) {

Powered by Google App Engine
This is Rietveld 408576698