diff options
25 files changed, 271 insertions, 275 deletions
diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc index 20a28ac..183b6e1 100644 --- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc +++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc @@ -59,9 +59,17 @@ scoped_ptr<ResourceHost> ContentBrowserPepperHostFactory::CreateResourceHost( return scoped_ptr<ResourceHost>(new PepperFileSystemBrowserHost( host_, instance, params.pp_resource(), file_system_type)); } - case PpapiHostMsg_Gamepad_Create::ID: + case PpapiHostMsg_Gamepad_Create::ID: { return scoped_ptr<ResourceHost>(new PepperGamepadHost( host_, instance, params.pp_resource())); + } + case PpapiHostMsg_HostResolver_Create::ID: { + scoped_refptr<ResourceMessageFilter> host_resolver( + new PepperHostResolverMessageFilter(host_, instance, false)); + return scoped_ptr<ResourceHost>(new MessageFilterHost( + host_->GetPpapiHost(), instance, params.pp_resource(), + host_resolver)); + } case PpapiHostMsg_FileRef_CreateInternal::ID: { PP_Resource file_system; std::string internal_path; @@ -84,13 +92,6 @@ scoped_ptr<ResourceHost> ContentBrowserPepperHostFactory::CreateResourceHost( // Dev interfaces. if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) { switch (message.type()) { - case PpapiHostMsg_HostResolver_Create::ID: { - scoped_refptr<ResourceMessageFilter> host_resolver( - new PepperHostResolverMessageFilter(host_, instance, false)); - return scoped_ptr<ResourceHost>(new MessageFilterHost( - host_->GetPpapiHost(), instance, params.pp_resource(), - host_resolver)); - } case PpapiHostMsg_Printing_Create::ID: { scoped_ptr<PepperPrintSettingsManager> manager( new PepperPrintSettingsManagerImpl()); diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 19906ad..65c19bd 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -276,7 +276,6 @@ include/ppapi/c/dev/ppb_find_dev.h include/ppapi/c/dev/ppb_font_dev.h include/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h include/ppapi/c/dev/ppb_graphics_2d_dev.h -include/ppapi/c/dev/ppb_host_resolver_dev.h include/ppapi/c/dev/ppb_ime_input_event_dev.h include/ppapi/c/dev/ppb_keyboard_input_event_dev.h include/ppapi/c/dev/ppb_memory_dev.h @@ -329,6 +328,7 @@ include/ppapi/c/ppb_gamepad.h include/ppapi/c/ppb_graphics_2d.h include/ppapi/c/ppb_graphics_3d.h include/ppapi/c/ppb.h +include/ppapi/c/ppb_host_resolver.h include/ppapi/c/ppb_image_data.h include/ppapi/c/ppb_input_event.h include/ppapi/c/ppb_instance.h @@ -381,7 +381,6 @@ include/ppapi/cpp/dev/file_chooser_dev.h include/ppapi/cpp/dev/find_dev.h include/ppapi/cpp/dev/font_dev.h include/ppapi/cpp/dev/graphics_2d_dev.h -include/ppapi/cpp/dev/host_resolver_dev.h include/ppapi/cpp/dev/ime_input_event_dev.h include/ppapi/cpp/dev/memory_dev.h include/ppapi/cpp/dev/printing_dev.h @@ -421,6 +420,7 @@ include/ppapi/cpp/graphics_2d.h include/ppapi/cpp/graphics_3d_client.h include/ppapi/c/pp_graphics_3d.h include/ppapi/cpp/graphics_3d.h +include/ppapi/cpp/host_resolver.h include/ppapi/cpp/image_data.h include/ppapi/c/pp_input_event.h include/ppapi/cpp/input_event.h @@ -709,7 +709,7 @@ src/ppapi_cpp/graphics_2d.cc src/ppapi_cpp/graphics_2d_dev.cc src/ppapi_cpp/graphics_3d.cc src/ppapi_cpp/graphics_3d_client.cc -src/ppapi_cpp/host_resolver_dev.cc +src/ppapi_cpp/host_resolver.cc src/ppapi_cpp/image_data.cc src/ppapi_cpp/ime_input_event_dev.cc src/ppapi_cpp/input_event.cc diff --git a/native_client_sdk/src/libraries/ppapi/library.dsc b/native_client_sdk/src/libraries/ppapi/library.dsc index 94fde6a..df94c2d 100644 --- a/native_client_sdk/src/libraries/ppapi/library.dsc +++ b/native_client_sdk/src/libraries/ppapi/library.dsc @@ -31,6 +31,7 @@ 'ppb_graphics_2d.h', 'ppb_graphics_3d.h', 'ppb.h', + 'ppb_host_resolver.h', 'ppb_image_data.h', 'ppb_input_event.h', 'ppb_instance.h', @@ -92,7 +93,6 @@ 'ppb_font_dev.h', 'ppb_gles_chromium_texture_mapping_dev.h', 'ppb_graphics_2d_dev.h', - 'ppb_host_resolver_dev.h', 'ppb_ime_input_event_dev.h', 'ppb_keyboard_input_event_dev.h', 'ppb_memory_dev.h', diff --git a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc index c9321a9..6c49285 100644 --- a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc +++ b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc @@ -29,6 +29,7 @@ 'graphics_2d.cc', 'graphics_3d.cc', 'graphics_3d_client.cc', + 'host_resolver.cc', 'image_data.cc', 'input_event.cc', 'instance.cc', @@ -78,7 +79,6 @@ 'printing_dev.cc', 'scriptable_object_deprecated.cc', 'audio_input_dev.cc', - 'host_resolver_dev.cc', 'scrollbar_dev.cc', 'graphics_2d_dev.cc', 'widget_dev.cc', @@ -120,6 +120,7 @@ 'graphics_2d.h', 'graphics_3d_client.h', 'graphics_3d.h', + 'host_resolver.h', 'image_data.h', 'input_event.h', 'instance.h', @@ -164,7 +165,6 @@ 'find_dev.h', 'font_dev.h', 'graphics_2d_dev.h', - 'host_resolver_dev.h', 'ime_input_event_dev.h', 'memory_dev.h', 'printing_dev.h', diff --git a/ppapi/api/dev/ppb_host_resolver_dev.idl b/ppapi/api/ppb_host_resolver.idl index df78110..20ff906 100644 --- a/ppapi/api/dev/ppb_host_resolver_dev.idl +++ b/ppapi/api/ppb_host_resolver.idl @@ -4,46 +4,46 @@ */ /** - * This file defines the <code>PPB_HostResolver_Dev</code> interface. + * This file defines the <code>PPB_HostResolver</code> interface. */ [generate_thunk] label Chrome { - M29 = 0.1 + M29 = 1.0 }; /** - * <code>PP_HostResolver_Flags_Dev</code> is an enumeration of flags which can - * be OR-ed and passed to the host resolver. Currently there is only one flag + * <code>PP_HostResolver_Flag</code> is an enumeration of flags which can be + * OR-ed and passed to the host resolver. Currently there is only one flag * defined. */ [assert_size(4)] -enum PP_HostResolver_Flags_Dev { +enum PP_HostResolver_Flag { /** * Hint to request the canonical name of the host, which can be retrieved by * <code>GetCanonicalName()</code>. */ - PP_HOSTRESOLVER_FLAGS_CANONNAME = 1 << 0 + PP_HOSTRESOLVER_FLAG_CANONNAME = 1 << 0 }; /** - * <code>PP_HostResolver_Hint_Dev</code> represents hints for host resolution. + * <code>PP_HostResolver_Hint</code> represents hints for host resolution. */ [assert_size(8)] -struct PP_HostResolver_Hint_Dev { +struct PP_HostResolver_Hint { /** * Network address family. */ PP_NetAddress_Family family; /** - * Combination of flags from <code>PP_HostResolver_Flags_Dev</code>. + * Combination of flags from <code>PP_HostResolver_Flag</code>. */ int32_t flags; }; /** - * The <code>PPB_HostResolver_Dev</code> interface supports host name + * The <code>PPB_HostResolver</code> interface supports host name * resolution. * * Permissions: In order to run <code>Resolve()</code>, apps permission @@ -51,7 +51,7 @@ struct PP_HostResolver_Hint_Dev { * For more details about network communication permissions, please see: * http://developer.chrome.com/apps/app_network.html */ -interface PPB_HostResolver_Dev { +interface PPB_HostResolver { /** * Creates a host resolver resource. * @@ -69,8 +69,7 @@ interface PPB_HostResolver_Dev { * @param[in] resource A <code>PP_Resource</code> to check. * * @return <code>PP_TRUE</code> if the input is a - * <code>PPB_HostResolver_Dev</code> resource; <code>PP_FALSE</code> - * otherwise. + * <code>PPB_HostResolver</code> resource; <code>PP_FALSE</code> otherwise. */ PP_Bool IsHostResolver([in] PP_Resource resource); @@ -84,7 +83,7 @@ interface PPB_HostResolver_Dev { * @param[in] host The host name (or IP address literal) to resolve. * @param[in] port The port number to be set in the resulting network * addresses. - * @param[in] hint A <code>PP_HostResolver_Hint_Dev</code> structure providing + * @param[in] hint A <code>PP_HostResolver_Hint</code> structure providing * hints for host resolution. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. @@ -97,7 +96,7 @@ interface PPB_HostResolver_Dev { int32_t Resolve([in] PP_Resource host_resolver, [in] str_t host, [in] uint16_t port, - [in] PP_HostResolver_Hint_Dev hint, + [in] PP_HostResolver_Hint hint, [in] PP_CompletionCallback callback); /** @@ -107,9 +106,9 @@ interface PPB_HostResolver_Dev { * resolver. * * @return A string <code>PP_Var</code> on success, which is an empty string - * if <code>PP_HOSTRESOLVER_FLAGS_CANONNAME</code> is not set in the hint - * flags when calling <code>Resolve()</code>; an undefined <code>PP_Var</code> - * if there is a pending <code>Resolve()</code> call or the previous + * if <code>PP_HOSTRESOLVER_FLAG_CANONNAME</code> is not set in the hint flags + * when calling <code>Resolve()</code>; an undefined <code>PP_Var</code> if + * there is a pending <code>Resolve()</code> call or the previous * <code>Resolve()</code> call failed. */ PP_Var GetCanonicalName([in] PP_Resource host_resolver); diff --git a/ppapi/c/dev/ppb_host_resolver_dev.h b/ppapi/c/ppb_host_resolver.h index e06c10f..cc66ffa 100644 --- a/ppapi/c/dev/ppb_host_resolver_dev.h +++ b/ppapi/c/ppb_host_resolver.h @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -/* From dev/ppb_host_resolver_dev.idl modified Thu Jun 20 12:08:29 2013. */ +/* From ppb_host_resolver.idl modified Sat Jun 22 11:11:38 2013. */ -#ifndef PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ -#define PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ +#ifndef PPAPI_C_PPB_HOST_RESOLVER_H_ +#define PPAPI_C_PPB_HOST_RESOLVER_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" @@ -17,12 +17,12 @@ #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_net_address.h" -#define PPB_HOSTRESOLVER_DEV_INTERFACE_0_1 "PPB_HostResolver(Dev);0.1" -#define PPB_HOSTRESOLVER_DEV_INTERFACE PPB_HOSTRESOLVER_DEV_INTERFACE_0_1 +#define PPB_HOSTRESOLVER_INTERFACE_1_0 "PPB_HostResolver;1.0" +#define PPB_HOSTRESOLVER_INTERFACE PPB_HOSTRESOLVER_INTERFACE_1_0 /** * @file - * This file defines the <code>PPB_HostResolver_Dev</code> interface. + * This file defines the <code>PPB_HostResolver</code> interface. */ @@ -31,8 +31,8 @@ * @{ */ /** - * <code>PP_HostResolver_Flags_Dev</code> is an enumeration of flags which can - * be OR-ed and passed to the host resolver. Currently there is only one flag + * <code>PP_HostResolver_Flag</code> is an enumeration of flags which can be + * OR-ed and passed to the host resolver. Currently there is only one flag * defined. */ typedef enum { @@ -40,9 +40,9 @@ typedef enum { * Hint to request the canonical name of the host, which can be retrieved by * <code>GetCanonicalName()</code>. */ - PP_HOSTRESOLVER_FLAGS_CANONNAME = 1 << 0 -} PP_HostResolver_Flags_Dev; -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flags_Dev, 4); + PP_HOSTRESOLVER_FLAG_CANONNAME = 1 << 0 +} PP_HostResolver_Flag; +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flag, 4); /** * @} */ @@ -52,19 +52,19 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_HostResolver_Flags_Dev, 4); * @{ */ /** - * <code>PP_HostResolver_Hint_Dev</code> represents hints for host resolution. + * <code>PP_HostResolver_Hint</code> represents hints for host resolution. */ -struct PP_HostResolver_Hint_Dev { +struct PP_HostResolver_Hint { /** * Network address family. */ PP_NetAddress_Family family; /** - * Combination of flags from <code>PP_HostResolver_Flags_Dev</code>. + * Combination of flags from <code>PP_HostResolver_Flag</code>. */ int32_t flags; }; -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8); +PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint, 8); /** * @} */ @@ -74,7 +74,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8); * @{ */ /** - * The <code>PPB_HostResolver_Dev</code> interface supports host name + * The <code>PPB_HostResolver</code> interface supports host name * resolution. * * Permissions: In order to run <code>Resolve()</code>, apps permission @@ -82,7 +82,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_HostResolver_Hint_Dev, 8); * For more details about network communication permissions, please see: * http://developer.chrome.com/apps/app_network.html */ -struct PPB_HostResolver_Dev_0_1 { +struct PPB_HostResolver_1_0 { /** * Creates a host resolver resource. * @@ -99,8 +99,7 @@ struct PPB_HostResolver_Dev_0_1 { * @param[in] resource A <code>PP_Resource</code> to check. * * @return <code>PP_TRUE</code> if the input is a - * <code>PPB_HostResolver_Dev</code> resource; <code>PP_FALSE</code> - * otherwise. + * <code>PPB_HostResolver</code> resource; <code>PP_FALSE</code> otherwise. */ PP_Bool (*IsHostResolver)(PP_Resource resource); /** @@ -113,7 +112,7 @@ struct PPB_HostResolver_Dev_0_1 { * @param[in] host The host name (or IP address literal) to resolve. * @param[in] port The port number to be set in the resulting network * addresses. - * @param[in] hint A <code>PP_HostResolver_Hint_Dev</code> structure providing + * @param[in] hint A <code>PP_HostResolver_Hint</code> structure providing * hints for host resolution. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. @@ -126,7 +125,7 @@ struct PPB_HostResolver_Dev_0_1 { int32_t (*Resolve)(PP_Resource host_resolver, const char* host, uint16_t port, - const struct PP_HostResolver_Hint_Dev* hint, + const struct PP_HostResolver_Hint* hint, struct PP_CompletionCallback callback); /** * Gets the canonical name of the host. @@ -135,9 +134,9 @@ struct PPB_HostResolver_Dev_0_1 { * resolver. * * @return A string <code>PP_Var</code> on success, which is an empty string - * if <code>PP_HOSTRESOLVER_FLAGS_CANONNAME</code> is not set in the hint - * flags when calling <code>Resolve()</code>; an undefined <code>PP_Var</code> - * if there is a pending <code>Resolve()</code> call or the previous + * if <code>PP_HOSTRESOLVER_FLAG_CANONNAME</code> is not set in the hint flags + * when calling <code>Resolve()</code>; an undefined <code>PP_Var</code> if + * there is a pending <code>Resolve()</code> call or the previous * <code>Resolve()</code> call failed. */ struct PP_Var (*GetCanonicalName)(PP_Resource host_resolver); @@ -166,10 +165,10 @@ struct PPB_HostResolver_Dev_0_1 { PP_Resource (*GetNetAddress)(PP_Resource host_resolver, uint32_t index); }; -typedef struct PPB_HostResolver_Dev_0_1 PPB_HostResolver_Dev; +typedef struct PPB_HostResolver_1_0 PPB_HostResolver; /** * @} */ -#endif /* PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ */ +#endif /* PPAPI_C_PPB_HOST_RESOLVER_H_ */ diff --git a/ppapi/cpp/dev/host_resolver_dev.cc b/ppapi/cpp/dev/host_resolver_dev.cc deleted file mode 100644 index 7075bb0..0000000 --- a/ppapi/cpp/dev/host_resolver_dev.cc +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2013 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. - -#include "ppapi/cpp/dev/host_resolver_dev.h" - -#include "ppapi/c/pp_errors.h" -#include "ppapi/cpp/completion_callback.h" -#include "ppapi/cpp/instance_handle.h" -#include "ppapi/cpp/module_impl.h" - -namespace pp { - -namespace { - -template <> const char* interface_name<PPB_HostResolver_Dev_0_1>() { - return PPB_HOSTRESOLVER_DEV_INTERFACE_0_1; -} - -} // namespace - -HostResolver_Dev::HostResolver_Dev() { -} - -HostResolver_Dev::HostResolver_Dev(const InstanceHandle& instance) { - if (has_interface<PPB_HostResolver_Dev_0_1>()) { - PassRefFromConstructor(get_interface<PPB_HostResolver_Dev_0_1>()->Create( - instance.pp_instance())); - } -} - -HostResolver_Dev::HostResolver_Dev(PassRef, PP_Resource resource) - : Resource(PASS_REF, resource) { -} - -HostResolver_Dev::HostResolver_Dev(const HostResolver_Dev& other) - : Resource(other) { -} - -HostResolver_Dev::~HostResolver_Dev() { -} - -HostResolver_Dev& HostResolver_Dev::operator=(const HostResolver_Dev& other) { - Resource::operator=(other); - return *this; -} - -// static -bool HostResolver_Dev::IsAvailable() { - return has_interface<PPB_HostResolver_Dev_0_1>(); -} - -int32_t HostResolver_Dev::Resolve(const char* host, - uint16_t port, - const PP_HostResolver_Hint_Dev& hint, - const CompletionCallback& callback) { - if (has_interface<PPB_HostResolver_Dev_0_1>()) { - return get_interface<PPB_HostResolver_Dev_0_1>()->Resolve( - pp_resource(), host, port, &hint, callback.pp_completion_callback()); - } - - return callback.MayForce(PP_ERROR_NOINTERFACE); -} - -Var HostResolver_Dev::GetCanonicalName() const { - if (has_interface<PPB_HostResolver_Dev_0_1>()) { - return Var(PASS_REF, - get_interface<PPB_HostResolver_Dev_0_1>()->GetCanonicalName( - pp_resource())); - } - - return Var(); -} - -uint32_t HostResolver_Dev::GetNetAddressCount() const { - if (has_interface<PPB_HostResolver_Dev_0_1>()) { - return get_interface<PPB_HostResolver_Dev_0_1>()->GetNetAddressCount( - pp_resource()); - } - - return 0; -} - -NetAddress HostResolver_Dev::GetNetAddress(uint32_t index) const { - if (has_interface<PPB_HostResolver_Dev_0_1>()) { - return NetAddress( - PASS_REF, - get_interface<PPB_HostResolver_Dev_0_1>()->GetNetAddress( - pp_resource(), index)); - } - - return NetAddress(); -} - -} // namespace pp diff --git a/ppapi/cpp/host_resolver.cc b/ppapi/cpp/host_resolver.cc new file mode 100644 index 0000000..656c743 --- /dev/null +++ b/ppapi/cpp/host_resolver.cc @@ -0,0 +1,93 @@ +// Copyright 2013 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. + +#include "ppapi/cpp/host_resolver.h" + +#include "ppapi/c/pp_errors.h" +#include "ppapi/cpp/completion_callback.h" +#include "ppapi/cpp/instance_handle.h" +#include "ppapi/cpp/module_impl.h" + +namespace pp { + +namespace { + +template <> const char* interface_name<PPB_HostResolver_1_0>() { + return PPB_HOSTRESOLVER_INTERFACE_1_0; +} + +} // namespace + +HostResolver::HostResolver() { +} + +HostResolver::HostResolver(const InstanceHandle& instance) { + if (has_interface<PPB_HostResolver_1_0>()) { + PassRefFromConstructor(get_interface<PPB_HostResolver_1_0>()->Create( + instance.pp_instance())); + } +} + +HostResolver::HostResolver(PassRef, PP_Resource resource) + : Resource(PASS_REF, resource) { +} + +HostResolver::HostResolver(const HostResolver& other) : Resource(other) { +} + +HostResolver::~HostResolver() { +} + +HostResolver& HostResolver::operator=(const HostResolver& other) { + Resource::operator=(other); + return *this; +} + +// static +bool HostResolver::IsAvailable() { + return has_interface<PPB_HostResolver_1_0>(); +} + +int32_t HostResolver::Resolve(const char* host, + uint16_t port, + const PP_HostResolver_Hint& hint, + const CompletionCallback& callback) { + if (has_interface<PPB_HostResolver_1_0>()) { + return get_interface<PPB_HostResolver_1_0>()->Resolve( + pp_resource(), host, port, &hint, callback.pp_completion_callback()); + } + + return callback.MayForce(PP_ERROR_NOINTERFACE); +} + +Var HostResolver::GetCanonicalName() const { + if (has_interface<PPB_HostResolver_1_0>()) { + return Var(PASS_REF, + get_interface<PPB_HostResolver_1_0>()->GetCanonicalName( + pp_resource())); + } + + return Var(); +} + +uint32_t HostResolver::GetNetAddressCount() const { + if (has_interface<PPB_HostResolver_1_0>()) { + return get_interface<PPB_HostResolver_1_0>()->GetNetAddressCount( + pp_resource()); + } + + return 0; +} + +NetAddress HostResolver::GetNetAddress(uint32_t index) const { + if (has_interface<PPB_HostResolver_1_0>()) { + return NetAddress(PASS_REF, + get_interface<PPB_HostResolver_1_0>()->GetNetAddress( + pp_resource(), index)); + } + + return NetAddress(); +} + +} // namespace pp diff --git a/ppapi/cpp/dev/host_resolver_dev.h b/ppapi/cpp/host_resolver.h index b0c9327..075ba6d 100644 --- a/ppapi/cpp/dev/host_resolver_dev.h +++ b/ppapi/cpp/host_resolver.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PPAPI_CPP_DEV_HOST_RESOLVER_DEV_H_ -#define PPAPI_CPP_DEV_HOST_RESOLVER_DEV_H_ +#ifndef PPAPI_CPP_HOST_RESOLVER_H_ +#define PPAPI_CPP_HOST_RESOLVER_H_ #include "ppapi/c/pp_stdint.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" #include "ppapi/cpp/resource.h" @@ -17,47 +17,47 @@ namespace pp { class CompletionCallback; class InstanceHandle; -/// The <code>HostResolver_Dev</code> class supports host name resolution. +/// The <code>HostResolver</code> class supports host name resolution. /// /// Permissions: In order to run <code>Resolve()</code>, apps permission /// <code>socket</code> with subrule <code>resolve-host</code> is required. /// For more details about network communication permissions, please see: /// http://developer.chrome.com/apps/app_network.html -class HostResolver_Dev : public Resource { +class HostResolver : public Resource { public: - /// Default constructor for creating an is_null() - /// <code>HostResolver_Dev</code> object. - HostResolver_Dev(); + /// Default constructor for creating an is_null() <code>HostResolver</code> + /// object. + HostResolver(); - /// A constructor used to create a <code>HostResolver_Dev</code> object. + /// A constructor used to create a <code>HostResolver</code> object. /// /// @param[in] instance The instance with which this resource will be /// associated. - explicit HostResolver_Dev(const InstanceHandle& instance); + explicit HostResolver(const InstanceHandle& instance); /// A constructor used when you have received a <code>PP_Resource</code> as a /// return value that has had 1 ref added for you. /// - /// @param[in] resource A <code>PPB_HostResolver_Dev</code> resource. - HostResolver_Dev(PassRef, PP_Resource resource); + /// @param[in] resource A <code>PPB_HostResolver</code> resource. + HostResolver(PassRef, PP_Resource resource); - /// The copy constructor for <code>HostResolver_Dev</code>. + /// The copy constructor for <code>HostResolver</code>. /// - /// @param[in] other A reference to another <code>HostResolver_Dev</code>. - HostResolver_Dev(const HostResolver_Dev& other); + /// @param[in] other A reference to another <code>HostResolver</code>. + HostResolver(const HostResolver& other); /// The destructor. - virtual ~HostResolver_Dev(); + virtual ~HostResolver(); - /// The assignment operator for <code>HostResolver_Dev</code>. + /// The assignment operator for <code>HostResolver</code>. /// - /// @param[in] other A reference to another <code>HostResolver_Dev</code>. + /// @param[in] other A reference to another <code>HostResolver</code>. /// - /// @return A reference to this <code>HostResolver_Dev</code> object. - HostResolver_Dev& operator=(const HostResolver_Dev& other); + /// @return A reference to this <code>HostResolver</code> object. + HostResolver& operator=(const HostResolver& other); /// Static function for determining whether the browser supports the - /// <code>PPB_HostResolver_Dev</code> interface. + /// <code>PPB_HostResolver</code> interface. /// /// @return true if the interface is available, false otherwise. static bool IsAvailable(); @@ -69,7 +69,7 @@ class HostResolver_Dev : public Resource { /// @param[in] host The host name (or IP address literal) to resolve. /// @param[in] port The port number to be set in the resulting network /// addresses. - /// @param[in] hint A <code>PP_HostResolver_Hint_Dev</code> structure + /// @param[in] hint A <code>PP_HostResolver_Hint</code> structure /// providing hints for host resolution. /// @param[in] callback A <code>CompletionCallback</code> to be called upon /// completion. @@ -80,13 +80,13 @@ class HostResolver_Dev : public Resource { /// returned if the host name couldn't be resolved. int32_t Resolve(const char* host, uint16_t port, - const PP_HostResolver_Hint_Dev& hint, + const PP_HostResolver_Hint& hint, const CompletionCallback& callback); /// Gets the canonical name of the host. /// /// @return A string <code>Var</code> on success, which is an empty string - /// if <code>PP_HOSTRESOLVER_FLAGS_CANONNAME</code> is not set in the hint + /// if <code>PP_HOSTRESOLVER_FLAG_CANONNAME</code> is not set in the hint /// flags when calling <code>Resolve()</code>; an undefined <code>Var</code> /// if there is a pending <code>Resolve()</code> call or the previous /// <code>Resolve()</code> call failed. @@ -112,4 +112,4 @@ class HostResolver_Dev : public Resource { } // namespace pp -#endif // PPAPI_CPP_DEV_HOST_RESOLVER_DEV_H_ +#endif // PPAPI_CPP_HOST_RESOLVER_H_ diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c index 54bf064..155fb37 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c @@ -16,7 +16,6 @@ #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" @@ -56,6 +55,7 @@ #include "ppapi/c/ppb_gamepad.h" #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/c/ppb_image_data.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_instance.h" @@ -142,6 +142,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileSystem_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Graphics2D_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Graphics2D_1_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Graphics3D_1_0; +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseInputEvent_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseInputEvent_1_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0; @@ -169,7 +170,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Font_Dev_0_6; -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7; @@ -669,6 +669,40 @@ static int32_t Pnacl_M15_PPB_Graphics3D_SwapBuffers(PP_Resource context, struct /* End wrapper methods for PPB_Graphics3D_1_0 */ +/* Begin wrapper methods for PPB_HostResolver_1_0 */ + +static PP_Resource Pnacl_M29_PPB_HostResolver_Create(PP_Instance instance) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + return iface->Create(instance); +} + +static PP_Bool Pnacl_M29_PPB_HostResolver_IsHostResolver(PP_Resource resource) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + return iface->IsHostResolver(resource); +} + +static int32_t Pnacl_M29_PPB_HostResolver_Resolve(PP_Resource host_resolver, const char* host, uint16_t port, const struct PP_HostResolver_Hint* hint, struct PP_CompletionCallback* callback) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + return iface->Resolve(host_resolver, host, port, hint, *callback); +} + +static void Pnacl_M29_PPB_HostResolver_GetCanonicalName(struct PP_Var* _struct_result, PP_Resource host_resolver) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + *_struct_result = iface->GetCanonicalName(host_resolver); +} + +static uint32_t Pnacl_M29_PPB_HostResolver_GetNetAddressCount(PP_Resource host_resolver) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + return iface->GetNetAddressCount(host_resolver); +} + +static PP_Resource Pnacl_M29_PPB_HostResolver_GetNetAddress(PP_Resource host_resolver, uint32_t index) { + const struct PPB_HostResolver_1_0 *iface = Pnacl_WrapperInfo_PPB_HostResolver_1_0.real_iface; + return iface->GetNetAddress(host_resolver, index); +} + +/* End wrapper methods for PPB_HostResolver_1_0 */ + /* Not generating wrapper methods for PPB_ImageData_1_0 */ /* Not generating wrapper methods for PPB_InputEvent_1_0 */ @@ -1582,40 +1616,6 @@ static int32_t Pnacl_M14_PPB_Font_Dev_PixelOffsetForCharacter(PP_Resource font, /* Not generating wrapper methods for PPB_Graphics2D_Dev_0_1 */ -/* Begin wrapper methods for PPB_HostResolver_Dev_0_1 */ - -static PP_Resource Pnacl_M29_PPB_HostResolver_Dev_Create(PP_Instance instance) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - return iface->Create(instance); -} - -static PP_Bool Pnacl_M29_PPB_HostResolver_Dev_IsHostResolver(PP_Resource resource) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - return iface->IsHostResolver(resource); -} - -static int32_t Pnacl_M29_PPB_HostResolver_Dev_Resolve(PP_Resource host_resolver, const char* host, uint16_t port, const struct PP_HostResolver_Hint_Dev* hint, struct PP_CompletionCallback* callback) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - return iface->Resolve(host_resolver, host, port, hint, *callback); -} - -static void Pnacl_M29_PPB_HostResolver_Dev_GetCanonicalName(struct PP_Var* _struct_result, PP_Resource host_resolver) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - *_struct_result = iface->GetCanonicalName(host_resolver); -} - -static uint32_t Pnacl_M29_PPB_HostResolver_Dev_GetNetAddressCount(PP_Resource host_resolver) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - return iface->GetNetAddressCount(host_resolver); -} - -static PP_Resource Pnacl_M29_PPB_HostResolver_Dev_GetNetAddress(PP_Resource host_resolver, uint32_t index) { - const struct PPB_HostResolver_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1.real_iface; - return iface->GetNetAddress(host_resolver, index); -} - -/* End wrapper methods for PPB_HostResolver_Dev_0_1 */ - /* Begin wrapper methods for PPB_IMEInputEvent_Dev_0_1 */ static PP_Bool Pnacl_M16_PPB_IMEInputEvent_Dev_IsIMEInputEvent(PP_Resource resource) { @@ -3877,6 +3877,15 @@ struct PPB_Graphics3D_1_0 Pnacl_Wrappers_PPB_Graphics3D_1_0 = { .SwapBuffers = (int32_t (*)(PP_Resource context, struct PP_CompletionCallback callback))&Pnacl_M15_PPB_Graphics3D_SwapBuffers }; +struct PPB_HostResolver_1_0 Pnacl_Wrappers_PPB_HostResolver_1_0 = { + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_HostResolver_Create, + .IsHostResolver = (PP_Bool (*)(PP_Resource resource))&Pnacl_M29_PPB_HostResolver_IsHostResolver, + .Resolve = (int32_t (*)(PP_Resource host_resolver, const char* host, uint16_t port, const struct PP_HostResolver_Hint* hint, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_HostResolver_Resolve, + .GetCanonicalName = (struct PP_Var (*)(PP_Resource host_resolver))&Pnacl_M29_PPB_HostResolver_GetCanonicalName, + .GetNetAddressCount = (uint32_t (*)(PP_Resource host_resolver))&Pnacl_M29_PPB_HostResolver_GetNetAddressCount, + .GetNetAddress = (PP_Resource (*)(PP_Resource host_resolver, uint32_t index))&Pnacl_M29_PPB_HostResolver_GetNetAddress +}; + /* Not generating wrapper interface for PPB_ImageData_1_0 */ /* Not generating wrapper interface for PPB_InputEvent_1_0 */ @@ -4157,15 +4166,6 @@ struct PPB_Font_Dev_0_6 Pnacl_Wrappers_PPB_Font_Dev_0_6 = { /* Not generating wrapper interface for PPB_Graphics2D_Dev_0_1 */ -struct PPB_HostResolver_Dev_0_1 Pnacl_Wrappers_PPB_HostResolver_Dev_0_1 = { - .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_HostResolver_Dev_Create, - .IsHostResolver = (PP_Bool (*)(PP_Resource resource))&Pnacl_M29_PPB_HostResolver_Dev_IsHostResolver, - .Resolve = (int32_t (*)(PP_Resource host_resolver, const char* host, uint16_t port, const struct PP_HostResolver_Hint_Dev* hint, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_HostResolver_Dev_Resolve, - .GetCanonicalName = (struct PP_Var (*)(PP_Resource host_resolver))&Pnacl_M29_PPB_HostResolver_Dev_GetCanonicalName, - .GetNetAddressCount = (uint32_t (*)(PP_Resource host_resolver))&Pnacl_M29_PPB_HostResolver_Dev_GetNetAddressCount, - .GetNetAddress = (PP_Resource (*)(PP_Resource host_resolver, uint32_t index))&Pnacl_M29_PPB_HostResolver_Dev_GetNetAddress -}; - struct PPB_IMEInputEvent_Dev_0_1 Pnacl_Wrappers_PPB_IMEInputEvent_Dev_0_1 = { .IsIMEInputEvent = (PP_Bool (*)(PP_Resource resource))&Pnacl_M16_PPB_IMEInputEvent_Dev_IsIMEInputEvent, .GetText = (struct PP_Var (*)(PP_Resource ime_event))&Pnacl_M16_PPB_IMEInputEvent_Dev_GetText, @@ -4818,6 +4818,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Graphics3D_1_0 = { .real_iface = NULL }; +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_1_0 = { + .iface_macro = PPB_HOSTRESOLVER_INTERFACE_1_0, + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_HostResolver_1_0, + .real_iface = NULL +}; + static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseInputEvent_1_0 = { .iface_macro = PPB_MOUSE_INPUT_EVENT_INTERFACE_1_0, .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_MouseInputEvent_1_0, @@ -4980,12 +4986,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Font_Dev_0_6 = { .real_iface = NULL }; -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1 = { - .iface_macro = PPB_HOSTRESOLVER_DEV_INTERFACE_0_1, - .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_HostResolver_Dev_0_1, - .real_iface = NULL -}; - static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1 = { .iface_macro = PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_IMEInputEvent_Dev_0_1, @@ -5309,6 +5309,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { &Pnacl_WrapperInfo_PPB_Graphics2D_1_0, &Pnacl_WrapperInfo_PPB_Graphics2D_1_1, &Pnacl_WrapperInfo_PPB_Graphics3D_1_0, + &Pnacl_WrapperInfo_PPB_HostResolver_1_0, &Pnacl_WrapperInfo_PPB_MouseInputEvent_1_0, &Pnacl_WrapperInfo_PPB_MouseInputEvent_1_1, &Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0, @@ -5335,7 +5336,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { &Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5, &Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6, &Pnacl_WrapperInfo_PPB_Font_Dev_0_6, - &Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1, &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1, &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2, &Pnacl_WrapperInfo_PPB_Printing_Dev_0_7, diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 34dd7a7..fb2683d 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -196,7 +196,7 @@ 'thunk/ppb_graphics_3d_api.h', 'thunk/ppb_graphics_3d_thunk.cc', 'thunk/ppb_host_resolver_api.h', - 'thunk/ppb_host_resolver_dev_thunk.cc', + 'thunk/ppb_host_resolver_thunk.cc', 'thunk/ppb_host_resolver_private_api.h', 'thunk/ppb_host_resolver_private_thunk.cc', 'thunk/ppb_image_data_api.h', diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index e0ec023..54834e9 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -34,6 +34,7 @@ 'c/ppb_gamepad.h', 'c/ppb_graphics_2d.h', 'c/ppb_graphics_3d.h', + 'c/ppb_host_resolver.h', 'c/ppb_image_data.h', 'c/ppb_input_event.h', 'c/ppb_instance.h', @@ -72,7 +73,6 @@ 'c/dev/ppb_file_chooser_dev.h', 'c/dev/ppb_find_dev.h', 'c/dev/ppb_font_dev.h', - 'c/dev/ppb_host_resolver_dev.h', 'c/dev/ppb_ime_input_event_dev.h', 'c/dev/ppb_memory_dev.h', 'c/dev/ppb_printing_dev.h', @@ -169,6 +169,8 @@ 'cpp/graphics_3d.h', 'cpp/graphics_3d_client.cc', 'cpp/graphics_3d_client.h', + 'cpp/host_resolver.cc', + 'cpp/host_resolver.h', 'cpp/image_data.cc', 'cpp/image_data.h', 'cpp/input_event.cc', @@ -239,8 +241,6 @@ 'cpp/dev/font_dev.h', 'cpp/dev/graphics_2d_dev.cc', 'cpp/dev/graphics_2d_dev.h', - 'cpp/dev/host_resolver_dev.cc', - 'cpp/dev/host_resolver_dev.h', 'cpp/dev/ime_input_event_dev.cc', 'cpp/dev/ime_input_event_dev.h', 'cpp/dev/memory_dev.cc', diff --git a/ppapi/proxy/host_resolver_resource.cc b/ppapi/proxy/host_resolver_resource.cc index b26da5f..c21d482 100644 --- a/ppapi/proxy/host_resolver_resource.cc +++ b/ppapi/proxy/host_resolver_resource.cc @@ -15,7 +15,7 @@ namespace proxy { namespace { PP_HostResolver_Private_Hint ConvertToHostResolverPrivateHint( - const PP_HostResolver_Hint_Dev& hint) { + const PP_HostResolver_Hint& hint) { PP_HostResolver_Private_Hint private_hint; switch (hint.family) { case PP_NETADDRESS_FAMILY_UNSPECIFIED: @@ -33,7 +33,7 @@ PP_HostResolver_Private_Hint ConvertToHostResolverPrivateHint( } private_hint.flags = 0; - if (hint.flags & PP_HOSTRESOLVER_FLAGS_CANONNAME) + if (hint.flags & PP_HOSTRESOLVER_FLAG_CANONNAME) private_hint.flags |= PP_HOST_RESOLVER_FLAGS_CANONNAME; return private_hint; @@ -55,7 +55,7 @@ thunk::PPB_HostResolver_API* HostResolverResource::AsPPB_HostResolver_API() { int32_t HostResolverResource::Resolve(const char* host, uint16_t port, - const PP_HostResolver_Hint_Dev* hint, + const PP_HostResolver_Hint* hint, scoped_refptr<TrackedCallback> callback) { if (!hint) return PP_ERROR_BADARGUMENT; diff --git a/ppapi/proxy/host_resolver_resource.h b/ppapi/proxy/host_resolver_resource.h index b39722b..055dfb8 100644 --- a/ppapi/proxy/host_resolver_resource.h +++ b/ppapi/proxy/host_resolver_resource.h @@ -27,7 +27,7 @@ class PPAPI_PROXY_EXPORT HostResolverResource // thunk::PPB_HostResolver_API implementation. virtual int32_t Resolve(const char* host, uint16_t port, - const PP_HostResolver_Hint_Dev* hint, + const PP_HostResolver_Hint* hint, scoped_refptr<TrackedCallback> callback) OVERRIDE; virtual PP_Var GetCanonicalName() OVERRIDE; virtual uint32_t GetNetAddressCount() OVERRIDE; diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 838b153..dacc1d5 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -15,7 +15,6 @@ #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" @@ -41,6 +40,7 @@ #include "ppapi/c/ppb_file_system.h" #include "ppapi/c/ppb_fullscreen.h" #include "ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/c/ppb_image_data.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_instance.h" diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h index 0bc5ebe..3a0572d 100644 --- a/ppapi/tests/all_c_includes.h +++ b/ppapi/tests/all_c_includes.h @@ -20,7 +20,6 @@ #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_printing_dev.h" @@ -77,6 +76,7 @@ #include "ppapi/c/ppb_gamepad.h" #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/c/ppb_image_data.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_instance.h" diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h index df96fba..9a4f65c 100644 --- a/ppapi/tests/all_cpp_includes.h +++ b/ppapi/tests/all_cpp_includes.h @@ -18,7 +18,6 @@ #include "ppapi/cpp/dev/find_dev.h" #include "ppapi/cpp/dev/font_dev.h" #include "ppapi/cpp/dev/graphics_2d_dev.h" -#include "ppapi/cpp/dev/host_resolver_dev.h" #include "ppapi/cpp/dev/ime_input_event_dev.h" #include "ppapi/cpp/dev/memory_dev.h" #include "ppapi/cpp/dev/printing_dev.h" @@ -43,6 +42,7 @@ #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/graphics_3d.h" #include "ppapi/cpp/graphics_3d_client.h" +#include "ppapi/cpp/host_resolver.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/logging.h" diff --git a/ppapi/tests/test_host_resolver.cc b/ppapi/tests/test_host_resolver.cc index ddfb388..2bb5012 100644 --- a/ppapi/tests/test_host_resolver.cc +++ b/ppapi/tests/test_host_resolver.cc @@ -4,7 +4,7 @@ #include "ppapi/tests/test_host_resolver.h" -#include "ppapi/cpp/dev/host_resolver_dev.h" +#include "ppapi/cpp/host_resolver.h" #include "ppapi/cpp/net_address.h" #include "ppapi/cpp/tcp_socket.h" #include "ppapi/cpp/var.h" @@ -18,7 +18,7 @@ TestHostResolver::TestHostResolver(TestingInstance* instance) } bool TestHostResolver::Init() { - bool host_resolver_is_available = pp::HostResolver_Dev::IsAvailable(); + bool host_resolver_is_available = pp::HostResolver::IsAvailable(); if (!host_resolver_is_available) instance_->AppendError("PPB_HostResolver interface not available"); @@ -98,10 +98,10 @@ std::string TestHostResolver::CheckHTTPResponse(pp::TCPSocket* socket, } std::string TestHostResolver::SyncResolve( - pp::HostResolver_Dev* host_resolver, + pp::HostResolver* host_resolver, const std::string& host, uint16_t port, - const PP_HostResolver_Hint_Dev& hint) { + const PP_HostResolver_Hint& hint) { TestCompletionCallback callback(instance_->pp_instance(), callback_type()); callback.WaitForResult( host_resolver->Resolve(host.c_str(), port, hint, callback.GetCallback())); @@ -111,8 +111,8 @@ std::string TestHostResolver::SyncResolve( } std::string TestHostResolver::ParameterizedTestResolve( - const PP_HostResolver_Hint_Dev& hint) { - pp::HostResolver_Dev host_resolver(instance_); + const PP_HostResolver_Hint& hint) { + pp::HostResolver host_resolver(instance_); ASSERT_SUBTEST_SUCCESS(SyncResolve(&host_resolver, host_, port_, hint)); @@ -146,7 +146,7 @@ std::string TestHostResolver::ParameterizedTestResolve( } std::string TestHostResolver::TestEmpty() { - pp::HostResolver_Dev host_resolver(instance_); + pp::HostResolver host_resolver(instance_); ASSERT_EQ(0, host_resolver.GetNetAddressCount()); pp::NetAddress address = host_resolver.GetNetAddress(0); ASSERT_EQ(0, address.pp_resource()); @@ -155,15 +155,15 @@ std::string TestHostResolver::TestEmpty() { } std::string TestHostResolver::TestResolve() { - PP_HostResolver_Hint_Dev hint; + PP_HostResolver_Hint hint; hint.family = PP_NETADDRESS_FAMILY_UNSPECIFIED; - hint.flags = PP_HOSTRESOLVER_FLAGS_CANONNAME; + hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; return ParameterizedTestResolve(hint); } std::string TestHostResolver::TestResolveIPv4() { - PP_HostResolver_Hint_Dev hint; + PP_HostResolver_Hint hint; hint.family = PP_NETADDRESS_FAMILY_IPV4; - hint.flags = PP_HOSTRESOLVER_FLAGS_CANONNAME; + hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; return ParameterizedTestResolve(hint); } diff --git a/ppapi/tests/test_host_resolver.h b/ppapi/tests/test_host_resolver.h index 6cdeaee..5587c20 100644 --- a/ppapi/tests/test_host_resolver.h +++ b/ppapi/tests/test_host_resolver.h @@ -7,11 +7,11 @@ #include <string> -#include "ppapi/c/dev/ppb_host_resolver_dev.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/tests/test_case.h" namespace pp { -class HostResolver_Dev; +class HostResolver; class NetAddress; class TCPSocket; } // namespace pp @@ -38,11 +38,11 @@ class TestHostResolver : public TestCase { std::string CheckHTTPResponse(pp::TCPSocket* socket, const std::string& request, const std::string& response); - std::string SyncResolve(pp::HostResolver_Dev* host_resolver, + std::string SyncResolve(pp::HostResolver* host_resolver, const std::string& host, uint16_t port, - const PP_HostResolver_Hint_Dev& hint); - std::string ParameterizedTestResolve(const PP_HostResolver_Hint_Dev& hint); + const PP_HostResolver_Hint& hint); + std::string ParameterizedTestResolve(const PP_HostResolver_Hint& hint); std::string TestEmpty(); std::string TestResolve(); diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index d440dfb..23a6039 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -23,8 +23,6 @@ PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_5, PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_6, PPB_FileChooser_Dev_0_6) UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3) -PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_DEV_INTERFACE_0_1, - PPB_HostResolver_Dev_0_1) PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, PPB_IMEInputEvent_Dev_0_2) PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_1, diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h index f7159c7..84d7688 100644 --- a/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/ppapi/thunk/interfaces_ppb_public_stable.h @@ -58,6 +58,7 @@ PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0) PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_1, PPB_FileIO_1_1) PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0) PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_1, PPB_Graphics2D_1_1) +PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_INTERFACE_1_0, PPB_HostResolver_1_0) PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0) PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0, PPB_KeyboardInputEvent_1_0) diff --git a/ppapi/thunk/ppb_host_resolver_api.h b/ppapi/thunk/ppb_host_resolver_api.h index 0c4c8ef1..f2acde2 100644 --- a/ppapi/thunk/ppb_host_resolver_api.h +++ b/ppapi/thunk/ppb_host_resolver_api.h @@ -6,7 +6,7 @@ #define PPAPI_THUNK_PPB_HOST_RESOLVER_API_H_ #include "base/memory/ref_counted.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/thunk/ppapi_thunk_export.h" namespace ppapi { @@ -21,7 +21,7 @@ class PPAPI_THUNK_EXPORT PPB_HostResolver_API { virtual int32_t Resolve(const char* host, uint16_t port, - const PP_HostResolver_Hint_Dev* hint, + const PP_HostResolver_Hint* hint, scoped_refptr<TrackedCallback> callback) = 0; virtual PP_Var GetCanonicalName() = 0; virtual uint32_t GetNetAddressCount() = 0; diff --git a/ppapi/thunk/ppb_host_resolver_dev_thunk.cc b/ppapi/thunk/ppb_host_resolver_thunk.cc index 332478b..03b8d01 100644 --- a/ppapi/thunk/ppb_host_resolver_dev_thunk.cc +++ b/ppapi/thunk/ppb_host_resolver_thunk.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From dev/ppb_host_resolver_dev.idl modified Sun Jun 09 11:17:35 2013. +// From ppb_host_resolver.idl modified Thu Jun 20 15:36:07 2013. -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_host_resolver_api.h" @@ -20,7 +20,7 @@ namespace thunk { namespace { PP_Resource Create(PP_Instance instance) { - VLOG(4) << "PPB_HostResolver_Dev::Create()"; + VLOG(4) << "PPB_HostResolver::Create()"; EnterResourceCreation enter(instance); if (enter.failed()) return 0; @@ -28,7 +28,7 @@ PP_Resource Create(PP_Instance instance) { } PP_Bool IsHostResolver(PP_Resource resource) { - VLOG(4) << "PPB_HostResolver_Dev::IsHostResolver()"; + VLOG(4) << "PPB_HostResolver::IsHostResolver()"; EnterResource<PPB_HostResolver_API> enter(resource, false); return PP_FromBool(enter.succeeded()); } @@ -36,9 +36,9 @@ PP_Bool IsHostResolver(PP_Resource resource) { int32_t Resolve(PP_Resource host_resolver, const char* host, uint16_t port, - const struct PP_HostResolver_Hint_Dev* hint, + const struct PP_HostResolver_Hint* hint, struct PP_CompletionCallback callback) { - VLOG(4) << "PPB_HostResolver_Dev::Resolve()"; + VLOG(4) << "PPB_HostResolver::Resolve()"; EnterResource<PPB_HostResolver_API> enter(host_resolver, callback, true); if (enter.failed()) return enter.retval(); @@ -49,7 +49,7 @@ int32_t Resolve(PP_Resource host_resolver, } struct PP_Var GetCanonicalName(PP_Resource host_resolver) { - VLOG(4) << "PPB_HostResolver_Dev::GetCanonicalName()"; + VLOG(4) << "PPB_HostResolver::GetCanonicalName()"; EnterResource<PPB_HostResolver_API> enter(host_resolver, true); if (enter.failed()) return PP_MakeUndefined(); @@ -57,7 +57,7 @@ struct PP_Var GetCanonicalName(PP_Resource host_resolver) { } uint32_t GetNetAddressCount(PP_Resource host_resolver) { - VLOG(4) << "PPB_HostResolver_Dev::GetNetAddressCount()"; + VLOG(4) << "PPB_HostResolver::GetNetAddressCount()"; EnterResource<PPB_HostResolver_API> enter(host_resolver, true); if (enter.failed()) return 0; @@ -65,14 +65,14 @@ uint32_t GetNetAddressCount(PP_Resource host_resolver) { } PP_Resource GetNetAddress(PP_Resource host_resolver, uint32_t index) { - VLOG(4) << "PPB_HostResolver_Dev::GetNetAddress()"; + VLOG(4) << "PPB_HostResolver::GetNetAddress()"; EnterResource<PPB_HostResolver_API> enter(host_resolver, true); if (enter.failed()) return 0; return enter.object()->GetNetAddress(index); } -const PPB_HostResolver_Dev_0_1 g_ppb_hostresolver_dev_thunk_0_1 = { +const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = { &Create, &IsHostResolver, &Resolve, @@ -83,8 +83,8 @@ const PPB_HostResolver_Dev_0_1 g_ppb_hostresolver_dev_thunk_0_1 = { } // namespace -const PPB_HostResolver_Dev_0_1* GetPPB_HostResolver_Dev_0_1_Thunk() { - return &g_ppb_hostresolver_dev_thunk_0_1; +const PPB_HostResolver_1_0* GetPPB_HostResolver_1_0_Thunk() { + return &g_ppb_hostresolver_thunk_1_0; } } // namespace thunk diff --git a/webkit/common/plugins/ppapi/ppapi_utils.cc b/webkit/common/plugins/ppapi/ppapi_utils.cc index b511e73..eef420c 100644 --- a/webkit/common/plugins/ppapi/ppapi_utils.cc +++ b/webkit/common/plugins/ppapi/ppapi_utils.cc @@ -16,7 +16,6 @@ #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" @@ -48,6 +47,7 @@ #include "ppapi/c/ppb_gamepad.h" #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/c/ppb_image_data.h" #include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_instance.h" diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index c98209e..ac04ad9 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -24,7 +24,6 @@ #include "ppapi/c/dev/ppb_font_dev.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" -#include "ppapi/c/dev/ppb_host_resolver_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_opengles2ext_dev.h" #include "ppapi/c/dev/ppb_printing_dev.h" @@ -56,6 +55,7 @@ #include "ppapi/c/ppb_fullscreen.h" #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/c/ppb_graphics_3d.h" +#include "ppapi/c/ppb_host_resolver.h" #include "ppapi/c/ppb_image_data.h" #include "ppapi/c/ppb_instance.h" #include "ppapi/c/ppb_messaging.h" |