diff options
Diffstat (limited to 'webkit')
25 files changed, 55 insertions, 54 deletions
diff --git a/webkit/plugins/ppapi/mock_resource.h b/webkit/plugins/ppapi/mock_resource.h index 3db87f6..01f7fb6 100644 --- a/webkit/plugins/ppapi/mock_resource.h +++ b/webkit/plugins/ppapi/mock_resource.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,7 +15,8 @@ namespace ppapi { // static_cast to get its own implementation. class MockResource : public ::ppapi::Resource { public: - MockResource(PP_Instance instance) : Resource(instance) {} + MockResource(PP_Instance instance) + : Resource(::ppapi::OBJECT_IS_IMPL, instance) {} virtual ~MockResource() {} }; diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index fc7fb75..a1f541a 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -596,8 +596,7 @@ bool PluginInstance::SendCompositionEventWithUnderlineInformationToPlugin( else handled = true; // Unfiltered events are assumed to be handled. scoped_refptr<PPB_InputEvent_Shared> event_resource( - new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), - pp_instance(), event)); + new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, pp_instance(), event)); handled |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent( pp_instance(), event_resource->pp_resource())); return handled; @@ -697,7 +696,7 @@ bool PluginInstance::HandleInputEvent(const WebKit::WebInputEvent& event, else rv = true; // Unfiltered events are assumed to be handled. scoped_refptr<PPB_InputEvent_Shared> event_resource( - new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, pp_instance(), events[i])); rv |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent( @@ -1054,7 +1053,7 @@ void PluginInstance::SendDidChangeView(const ViewData& previous_view) { sent_initial_did_change_view_ = true; ScopedPPResource resource( ScopedPPResource::PassRef(), - (new PPB_View_Shared(PPB_View_Shared::InitAsImpl(), + (new PPB_View_Shared(::ppapi::OBJECT_IS_IMPL, pp_instance(), view_data_))->GetReference()); instance_interface_->DidChangeView(pp_instance(), resource, diff --git a/webkit/plugins/ppapi/ppb_audio_impl.cc b/webkit/plugins/ppapi/ppb_audio_impl.cc index 9408897..152c4f5 100644 --- a/webkit/plugins/ppapi/ppb_audio_impl.cc +++ b/webkit/plugins/ppapi/ppb_audio_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,7 +28,7 @@ namespace ppapi { // PPB_Audio_Impl -------------------------------------------------------------- PPB_Audio_Impl::PPB_Audio_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), audio_(NULL) { } diff --git a/webkit/plugins/ppapi/ppb_audio_input_impl.cc b/webkit/plugins/ppapi/ppb_audio_input_impl.cc index 3f2a672..ff9cb06 100644 --- a/webkit/plugins/ppapi/ppb_audio_input_impl.cc +++ b/webkit/plugins/ppapi/ppb_audio_input_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,7 +28,7 @@ namespace ppapi { // PPB_AudioInput_Impl --------------------------------------------------------- PPB_AudioInput_Impl::PPB_AudioInput_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), audio_input_(NULL) { } diff --git a/webkit/plugins/ppapi/ppb_broker_impl.cc b/webkit/plugins/ppapi/ppb_broker_impl.cc index 42273a1..6f69e8d 100644 --- a/webkit/plugins/ppapi/ppb_broker_impl.cc +++ b/webkit/plugins/ppapi/ppb_broker_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,7 @@ namespace ppapi { // PPB_Broker_Impl ------------------------------------------------------ PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), broker_(NULL), connect_callback_(), pipe_handle_(PlatformFileToInt(base::kInvalidPlatformFileValue)) { diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.cc b/webkit/plugins/ppapi/ppb_buffer_impl.cc index dc3e70f..9a9ccbb 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.cc +++ b/webkit/plugins/ppapi/ppb_buffer_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ namespace webkit { namespace ppapi { PPB_Buffer_Impl::PPB_Buffer_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), size_(0), map_count_(0) { } diff --git a/webkit/plugins/ppapi/ppb_directory_reader_impl.cc b/webkit/plugins/ppapi/ppb_directory_reader_impl.cc index 7992ce7..2f38121 100644 --- a/webkit/plugins/ppapi/ppb_directory_reader_impl.cc +++ b/webkit/plugins/ppapi/ppb_directory_reader_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -56,7 +56,7 @@ FilePath::StringType UTF8StringToFilePathString(const std::string& str) { PPB_DirectoryReader_Impl::PPB_DirectoryReader_Impl( PPB_FileRef_Impl* directory_ref) - : Resource(directory_ref->pp_instance()), + : Resource(::ppapi::OBJECT_IS_IMPL, directory_ref->pp_instance()), directory_ref_(directory_ref), has_more_(true), entry_(NULL) { diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc index 38e8f16..522007c 100644 --- a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -69,7 +69,7 @@ PPB_FileChooser_Impl::PPB_FileChooser_Impl( PP_Instance instance, PP_FileChooserMode_Dev mode, const char* accept_mime_types) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), mode_(mode), next_chosen_file_index_(0) { if (accept_mime_types) diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index 4e9abc5..cdd044b 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -80,14 +80,14 @@ std::string GetNameForVirtualFilePath(const std::string& path) { PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, PPB_FileSystem_Impl* file_system) - : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), + : PPB_FileRef_Shared(::ppapi::OBJECT_IS_IMPL, info), file_system_(file_system), external_file_system_path_() { } PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, const FilePath& external_file_path) - : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), + : PPB_FileRef_Shared(::ppapi::OBJECT_IS_IMPL, info), file_system_(), external_file_system_path_(external_file_path) { } diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.cc b/webkit/plugins/ppapi/ppb_file_system_impl.cc index 6d6df5d..9428e3a 100644 --- a/webkit/plugins/ppapi/ppb_file_system_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_system_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,7 +27,7 @@ namespace ppapi { PPB_FileSystem_Impl::PPB_FileSystem_Impl(PP_Instance instance, PP_FileSystemType type) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), type_(type), opened_(false), called_open_(false) { diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc index 6c181d0..aa3f768 100644 --- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -97,7 +97,7 @@ bool ConvertMenuData(const PP_Flash_Menu* in_menu, } // namespace PPB_Flash_Menu_Impl::PPB_Flash_Menu_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), selected_id_out_(NULL) { } diff --git a/webkit/plugins/ppapi/ppb_flash_message_loop_impl.cc b/webkit/plugins/ppapi/ppb_flash_message_loop_impl.cc index ccefd18..8a3ff48 100644 --- a/webkit/plugins/ppapi/ppb_flash_message_loop_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_message_loop_impl.cc @@ -41,7 +41,7 @@ class PPB_Flash_MessageLoop_Impl::State }; PPB_Flash_MessageLoop_Impl::PPB_Flash_MessageLoop_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), state_(new State()) { } diff --git a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc index 62ad9b9..b3db5ac 100644 --- a/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_net_connector_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ namespace webkit { namespace ppapi { PPB_Flash_NetConnector_Impl::PPB_Flash_NetConnector_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), socket_out_(NULL), local_addr_out_(NULL), remote_addr_out_(NULL) { diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc index 5384b0f..9be560a 100644 --- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc @@ -154,7 +154,7 @@ struct PPB_Graphics2D_Impl::QueuedOperation { }; PPB_Graphics2D_Impl::PPB_Graphics2D_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), bound_instance_(NULL), offscreen_flush_pending_(false), is_always_opaque_(false), diff --git a/webkit/plugins/ppapi/ppb_image_data_impl.cc b/webkit/plugins/ppapi/ppb_image_data_impl.cc index fa30601..ea5f2c6 100644 --- a/webkit/plugins/ppapi/ppb_image_data_impl.cc +++ b/webkit/plugins/ppapi/ppb_image_data_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,7 +26,7 @@ namespace webkit { namespace ppapi { PPB_ImageData_Impl::PPB_ImageData_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), format_(PP_IMAGEDATAFORMAT_BGRA_PREMUL), width_(0), height_(0) { diff --git a/webkit/plugins/ppapi/ppb_layer_compositor_impl.cc b/webkit/plugins/ppapi/ppb_layer_compositor_impl.cc index 43b5dc0..542feb1 100644 --- a/webkit/plugins/ppapi/ppb_layer_compositor_impl.cc +++ b/webkit/plugins/ppapi/ppb_layer_compositor_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ namespace webkit { namespace ppapi { PPB_LayerCompositor_Impl::PPB_LayerCompositor_Impl(PP_Instance instance) - : Resource(instance) { + : Resource(::ppapi::OBJECT_IS_IMPL, instance) { } PPB_LayerCompositor_Impl::~PPB_LayerCompositor_Impl() { diff --git a/webkit/plugins/ppapi/ppb_transport_impl.cc b/webkit/plugins/ppapi/ppb_transport_impl.cc index e0d90ad..caa60e4 100644 --- a/webkit/plugins/ppapi/ppb_transport_impl.cc +++ b/webkit/plugins/ppapi/ppb_transport_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -69,7 +69,7 @@ WebKit::WebFrame* GetFrameForResource(const ::ppapi::Resource* resource) { } // namespace PPB_Transport_Impl::PPB_Transport_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), type_(PP_TRANSPORTTYPE_DATAGRAM), started_(false), writable_(false) { diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc index eccdfe5..7e4fdef 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc @@ -67,7 +67,7 @@ WebFrame* GetFrameForResource(const Resource* resource) { PPB_URLLoader_Impl::PPB_URLLoader_Impl(PP_Instance instance, bool main_document_loader) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), main_document_loader_(main_document_loader), pending_callback_(), bytes_sent_(0), diff --git a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc index 421b39a..2d8af89 100644 --- a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc @@ -49,7 +49,7 @@ const int32_t kDefaultPrefetchBufferLowerThreshold = 50 * 1000 * 1000; PPB_URLRequestInfo_Impl::PPB_URLRequestInfo_Impl( PP_Instance instance, const PPB_URLRequestInfo_Data& data) - : PPB_URLRequestInfo_Shared(instance, data) { + : PPB_URLRequestInfo_Shared(::ppapi::OBJECT_IS_IMPL, instance, data) { } PPB_URLRequestInfo_Impl::~PPB_URLRequestInfo_Impl() { diff --git a/webkit/plugins/ppapi/ppb_url_response_info_impl.cc b/webkit/plugins/ppapi/ppb_url_response_info_impl.cc index cb96f8e..20950fe 100644 --- a/webkit/plugins/ppapi/ppb_url_response_info_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_response_info_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -51,7 +51,7 @@ bool IsRedirect(int32_t status) { } // namespace PPB_URLResponseInfo_Impl::PPB_URLResponseInfo_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), status_code_(-1) { } diff --git a/webkit/plugins/ppapi/ppb_video_capture_impl.cc b/webkit/plugins/ppapi/ppb_video_capture_impl.cc index f2cb26c..63a19a4 100644 --- a/webkit/plugins/ppapi/ppb_video_capture_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_capture_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,7 +37,7 @@ namespace webkit { namespace ppapi { PPB_VideoCapture_Impl::PPB_VideoCapture_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), buffer_count_hint_(0), ppp_videocapture_(NULL), status_(PP_VIDEO_CAPTURE_STATUS_STOPPED), diff --git a/webkit/plugins/ppapi/ppb_video_layer_impl.cc b/webkit/plugins/ppapi/ppb_video_layer_impl.cc index aa90f13..5b9a8a962 100644 --- a/webkit/plugins/ppapi/ppb_video_layer_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_layer_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,7 +14,7 @@ namespace webkit { namespace ppapi { PPB_VideoLayer_Impl::PPB_VideoLayer_Impl(PP_Instance instance) - : Resource(instance) { + : Resource(::ppapi::OBJECT_IS_IMPL, instance) { } PPB_VideoLayer_Impl::~PPB_VideoLayer_Impl() { diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.cc b/webkit/plugins/ppapi/ppb_websocket_impl.cc index 61d6bc1..0a55e52 100644 --- a/webkit/plugins/ppapi/ppb_websocket_impl.cc +++ b/webkit/plugins/ppapi/ppb_websocket_impl.cc @@ -78,7 +78,7 @@ namespace webkit { namespace ppapi { PPB_WebSocket_Impl::PPB_WebSocket_Impl(PP_Instance instance) - : Resource(instance), + : Resource(::ppapi::OBJECT_IS_IMPL, instance), state_(PP_WEBSOCKETREADYSTATE_INVALID), error_was_received_(false), receive_callback_var_(NULL), diff --git a/webkit/plugins/ppapi/ppb_widget_impl.cc b/webkit/plugins/ppapi/ppb_widget_impl.cc index c071067..306a1b5 100644 --- a/webkit/plugins/ppapi/ppb_widget_impl.cc +++ b/webkit/plugins/ppapi/ppb_widget_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ namespace webkit { namespace ppapi { PPB_Widget_Impl::PPB_Widget_Impl(PP_Instance instance) - : Resource(instance) { + : Resource(::ppapi::OBJECT_IS_IMPL, instance) { memset(&location_, 0, sizeof(location_)); } diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 36b652c..e0ca2fe 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -70,8 +70,8 @@ PP_Resource ResourceCreationImpl::CreateAudioConfig( PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) { - return ::ppapi::PPB_AudioConfig_Shared::CreateAsImpl(instance, sample_rate, - sample_frame_count); + return ::ppapi::PPB_AudioConfig_Shared::Create( + ::ppapi::OBJECT_IS_IMPL, instance, sample_rate, sample_frame_count); } PP_Resource ResourceCreationImpl::CreateAudioTrusted( @@ -152,8 +152,9 @@ PP_Resource ResourceCreationImpl::CreateFontObject( ResourceHelper::PPInstanceToPluginInstance(instance); if (!plugin_instance) return 0; - return ::ppapi::PPB_Font_Shared::CreateAsImpl( - instance, *description, plugin_instance->delegate()->GetPreferences()); + return ::ppapi::PPB_Font_Shared::Create( + ::ppapi::OBJECT_IS_IMPL, instance, *description, + plugin_instance->delegate()->GetPreferences()); } PP_Resource ResourceCreationImpl::CreateGraphics2D( @@ -209,7 +210,7 @@ PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent( data.character_text = string_var->value(); } - return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + return (new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, instance, data))->GetReference(); } @@ -238,7 +239,7 @@ PP_Resource ResourceCreationImpl::CreateMouseInputEvent( data.mouse_click_count = click_count; data.mouse_movement = *mouse_movement; - return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + return (new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, instance, data))->GetReference(); } @@ -252,7 +253,7 @@ PP_Resource ResourceCreationImpl::CreateResourceArray( const PP_Resource elements[], uint32_t size) { PPB_ResourceArray_Shared* object = new PPB_ResourceArray_Shared( - PPB_ResourceArray_Shared::InitAsImpl(), instance, elements, size); + ::ppapi::OBJECT_IS_IMPL, instance, elements, size); return object->GetReference(); } @@ -323,7 +324,7 @@ PP_Resource ResourceCreationImpl::CreateWheelInputEvent( data.wheel_ticks = *wheel_ticks; data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); - return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + return (new PPB_InputEvent_Shared(::ppapi::OBJECT_IS_IMPL, instance, data))->GetReference(); } |