summaryrefslogtreecommitdiff
path: root/chromium/ppapi/thunk
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ppapi/thunk')
-rw-r--r--chromium/ppapi/thunk/BUILD.gn4
-rw-r--r--chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h19
-rw-r--r--chromium/ppapi/thunk/interfaces_ppb_public_dev.h4
-rw-r--r--chromium/ppapi/thunk/interfaces_ppb_public_socket.h30
-rw-r--r--chromium/ppapi/thunk/interfaces_ppb_public_stable.h9
-rw-r--r--chromium/ppapi/thunk/ppb_pdf_thunk.cc4
-rw-r--r--chromium/ppapi/thunk/ppb_truetype_font_api.h38
-rw-r--r--chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc108
-rw-r--r--chromium/ppapi/thunk/ppb_truetype_font_singleton_api.h42
-rw-r--r--chromium/ppapi/thunk/resource_creation_api.h4
-rw-r--r--chromium/ppapi/thunk/thunk.h2
11 files changed, 43 insertions, 221 deletions
diff --git a/chromium/ppapi/thunk/BUILD.gn b/chromium/ppapi/thunk/BUILD.gn
index 8be4fa9d963..cfee49e91ea 100644
--- a/chromium/ppapi/thunk/BUILD.gn
+++ b/chromium/ppapi/thunk/BUILD.gn
@@ -19,6 +19,7 @@ source_set("thunk") {
"interfaces_ppb_private_no_permissions.h",
"interfaces_ppb_public_dev.h",
"interfaces_ppb_public_dev_channel.h",
+ "interfaces_ppb_public_socket.h",
"interfaces_ppb_public_stable.h",
"interfaces_preamble.h",
"ppapi_thunk_export.h",
@@ -111,9 +112,6 @@ source_set("thunk") {
"ppb_tcp_socket_private_thunk.cc",
"ppb_tcp_socket_thunk.cc",
"ppb_text_input_thunk.cc",
- "ppb_truetype_font_api.h",
- "ppb_truetype_font_dev_thunk.cc",
- "ppb_truetype_font_singleton_api.h",
"ppb_udp_socket_api.h",
"ppb_udp_socket_private_api.h",
"ppb_udp_socket_private_thunk.cc",
diff --git a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
index 50292250083..166540f1ae2 100644
--- a/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
+++ b/chromium/ppapi/thunk/interfaces_ppb_private_no_permissions.h
@@ -5,6 +5,9 @@
// Please see inteface_ppb_public_stable for the documentation on the format of
// this file.
+// no-include-guard-because-multiply-included
+// NOLINT(build/header_guard)
+
#include "ppapi/thunk/interfaces_preamble.h"
// These interfaces don't require private permissions. However, they only work
@@ -17,22 +20,6 @@ PROXIED_IFACE(PPB_CAMERADEVICE_PRIVATE_INTERFACE_0_1,
PROXIED_IFACE(PPB_HOSTRESOLVER_PRIVATE_INTERFACE_0_1,
PPB_HostResolver_Private_0_1)
-PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1,
- PPB_TCPServerSocket_Private_0_1)
-PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_2,
- PPB_TCPServerSocket_Private_0_2)
-PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3,
- PPB_TCPSocket_Private_0_3)
-PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4,
- PPB_TCPSocket_Private_0_4)
-PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_5,
- PPB_TCPSocket_Private_0_5)
-PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2,
- PPB_UDPSocket_Private_0_2)
-PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3,
- PPB_UDPSocket_Private_0_3)
-PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4,
- PPB_UDPSocket_Private_0_4)
PROXIED_IFACE(PPB_NETADDRESS_PRIVATE_INTERFACE_0_1,
PPB_NetAddress_Private_0_1)
diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_dev.h b/chromium/ppapi/thunk/interfaces_ppb_public_dev.h
index 5c69935ae01..7d452e61574 100644
--- a/chromium/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/chromium/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -5,6 +5,9 @@
// Please see inteface_ppb_public_stable for the documentation on the format of
// this file.
+// no-include-guard-because-multiply-included
+// NOLINT(build/header_guard)
+
#include "ppapi/thunk/interfaces_preamble.h"
// Map the old dev console interface to the stable one (which is the same) to
@@ -17,7 +20,6 @@ PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, PPB_IMEInputEvent_Dev_0_2)
PROXIED_IFACE(PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1)
PROXIED_IFACE(PPB_PRINTING_DEV_INTERFACE_0_7, PPB_Printing_Dev_0_7)
PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_2, PPB_TextInput_Dev_0_2)
-PROXIED_IFACE(PPB_TRUETYPEFONT_DEV_INTERFACE_0_1, PPB_TrueTypeFont_Dev_0_1)
PROXIED_IFACE(PPB_VIEW_DEV_INTERFACE_0_1, PPB_View_Dev_0_1)
#if !defined(OS_NACL)
diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_socket.h b/chromium/ppapi/thunk/interfaces_ppb_public_socket.h
new file mode 100644
index 00000000000..2558f971de1
--- /dev/null
+++ b/chromium/ppapi/thunk/interfaces_ppb_public_socket.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2019 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.
+
+// no-include-guard-because-multiply-included
+// NOLINT(build/header_guard)
+
+#include "ppapi/thunk/interfaces_preamble.h"
+
+// See interfaces_ppp_public_stable.h for documentation on these macros.
+PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_0, PPB_TCPSocket_1_0)
+PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_1, PPB_TCPSocket_1_1)
+PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_2, PPB_TCPSocket_1_2)
+PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_0, PPB_UDPSocket_1_0)
+PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_1, PPB_UDPSocket_1_1)
+PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_2, PPB_UDPSocket_1_2)
+
+// These interfaces only work for whitelisted origins.
+PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1,
+ PPB_TCPServerSocket_Private_0_1)
+PROXIED_IFACE(PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_2,
+ PPB_TCPServerSocket_Private_0_2)
+PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_3, PPB_TCPSocket_Private_0_3)
+PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_4, PPB_TCPSocket_Private_0_4)
+PROXIED_IFACE(PPB_TCPSOCKET_PRIVATE_INTERFACE_0_5, PPB_TCPSocket_Private_0_5)
+PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_2, PPB_UDPSocket_Private_0_2)
+PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_3, PPB_UDPSocket_Private_0_3)
+PROXIED_IFACE(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4, PPB_UDPSocket_Private_0_4)
+
+#include "ppapi/thunk/interfaces_postamble.h"
diff --git a/chromium/ppapi/thunk/interfaces_ppb_public_stable.h b/chromium/ppapi/thunk/interfaces_ppb_public_stable.h
index 83b3cfa2b17..4d66348be44 100644
--- a/chromium/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/chromium/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+// no-include-guard-because-multiply-included
+// NOLINT(build/header_guard)
+
#include "ppapi/thunk/interfaces_preamble.h"
// This file contains lists of interfaces. It's intended to be included by
@@ -86,14 +89,8 @@ PROXIED_IFACE(PPB_NETADDRESS_INTERFACE_1_0, PPB_NetAddress_1_0)
PROXIED_IFACE(PPB_NETWORKLIST_INTERFACE_1_0, PPB_NetworkList_1_0)
PROXIED_IFACE(PPB_NETWORKMONITOR_INTERFACE_1_0, PPB_NetworkMonitor_1_0)
PROXIED_IFACE(PPB_NETWORKPROXY_INTERFACE_1_0, PPB_NetworkProxy_1_0)
-PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_0, PPB_TCPSocket_1_0)
-PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_1, PPB_TCPSocket_1_1)
-PROXIED_IFACE(PPB_TCPSOCKET_INTERFACE_1_2, PPB_TCPSocket_1_2)
PROXIED_IFACE(PPB_TEXTINPUTCONTROLLER_INTERFACE_1_0,
PPB_TextInputController_1_0)
-PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_0, PPB_UDPSocket_1_0)
-PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_1, PPB_UDPSocket_1_1)
-PROXIED_IFACE(PPB_UDPSOCKET_INTERFACE_1_2, PPB_UDPSocket_1_2)
PROXIED_IFACE(PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0)
PROXIED_IFACE(PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo_1_0)
PROXIED_IFACE(PPB_URLRESPONSEINFO_INTERFACE_1_0, PPB_URLResponseInfo_1_0)
diff --git a/chromium/ppapi/thunk/ppb_pdf_thunk.cc b/chromium/ppapi/thunk/ppb_pdf_thunk.cc
index 0b7bcee9722..35907a388db 100644
--- a/chromium/ppapi/thunk/ppb_pdf_thunk.cc
+++ b/chromium/ppapi/thunk/ppb_pdf_thunk.cc
@@ -23,7 +23,7 @@ PP_Resource GetFontFileWithFallback(
const PP_BrowserFont_Trusted_Description* description,
PP_PrivateFontCharset charset) {
// TODO(raymes): Eventually we should replace the use of this function with
- // either PPB_Flash_Font_File or PPB_TrueType_Font directly in the PDF code.
+ // PPB_Flash_Font_File directly in the PDF code.
// For now just call into PPB_Flash_Font_File which has the exact same API.
EnterResourceCreation enter(instance);
if (enter.failed())
@@ -36,7 +36,7 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_file,
void* output,
uint32_t* output_length) {
// TODO(raymes): Eventually we should replace the use of this function with
- // either PPB_Flash_Font_File or PPB_TrueType_Font directly in the PDF code.
+ // PPB_Flash_Font_File directly in the PDF code.
// For now just call into PPB_Flash_Font_File which has the exact same API.
EnterResource<PPB_Flash_FontFile_API> enter(font_file, true);
if (enter.failed())
diff --git a/chromium/ppapi/thunk/ppb_truetype_font_api.h b/chromium/ppapi/thunk/ppb_truetype_font_api.h
deleted file mode 100644
index 6c1f74574e6..00000000000
--- a/chromium/ppapi/thunk/ppb_truetype_font_api.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 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.
-
-#ifndef PPAPI_THUNK_PPB_TRUETYPE_FONT_API_H_
-#define PPAPI_THUNK_PPB_TRUETYPE_FONT_API_H_
-
-#include <stdint.h>
-
-#include "base/memory/ref_counted.h"
-#include "ppapi/c/dev/ppb_truetype_font_dev.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-
-namespace ppapi {
-
-class TrackedCallback;
-
-namespace thunk {
-
-class PPAPI_THUNK_EXPORT PPB_TrueTypeFont_API {
- public:
- virtual ~PPB_TrueTypeFont_API() {}
-
- virtual int32_t Describe(PP_TrueTypeFontDesc_Dev* desc,
- scoped_refptr<TrackedCallback> callback) = 0;
- virtual int32_t GetTableTags(const PP_ArrayOutput& output,
- scoped_refptr<TrackedCallback> callback) = 0;
- virtual int32_t GetTable(uint32_t table,
- int32_t offset,
- int32_t max_data_length,
- const PP_ArrayOutput& output,
- scoped_refptr<TrackedCallback> callback) = 0;
-};
-
-} // namespace thunk
-} // namespace ppapi
-
-#endif // PPAPI_THUNK_PPB_TRUETYPE_FONT_API_H_
diff --git a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc b/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc
deleted file mode 100644
index a568e6498b7..00000000000
--- a/chromium/ppapi/thunk/ppb_truetype_font_dev_thunk.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 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.
-
-// From dev/ppb_truetype_font_dev.idl modified Wed Jan 27 17:10:16 2016.
-
-#include <stdint.h>
-
-#include "ppapi/c/dev/ppb_truetype_font_dev.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-#include "ppapi/thunk/ppb_truetype_font_api.h"
-#include "ppapi/thunk/ppb_truetype_font_singleton_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-int32_t GetFontFamilies(PP_Instance instance,
- struct PP_ArrayOutput output,
- struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::GetFontFamilies()";
- EnterInstanceAPI<PPB_TrueTypeFont_Singleton_API> enter(instance, callback);
- if (enter.failed())
- return enter.retval();
- return enter.SetResult(
- enter.functions()->GetFontFamilies(instance, output, enter.callback()));
-}
-
-int32_t GetFontsInFamily(PP_Instance instance,
- struct PP_Var family,
- struct PP_ArrayOutput output,
- struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::GetFontsInFamily()";
- EnterInstanceAPI<PPB_TrueTypeFont_Singleton_API> enter(instance, callback);
- if (enter.failed())
- return enter.retval();
- return enter.SetResult(enter.functions()->GetFontsInFamily(
- instance, family, output, enter.callback()));
-}
-
-PP_Resource Create(PP_Instance instance,
- const struct PP_TrueTypeFontDesc_Dev* desc) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::Create()";
- EnterResourceCreation enter(instance);
- if (enter.failed())
- return 0;
- return enter.functions()->CreateTrueTypeFont(instance, desc);
-}
-
-PP_Bool IsTrueTypeFont(PP_Resource resource) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::IsTrueTypeFont()";
- EnterResource<PPB_TrueTypeFont_API> enter(resource, false);
- return PP_FromBool(enter.succeeded());
-}
-
-int32_t Describe(PP_Resource font,
- struct PP_TrueTypeFontDesc_Dev* desc,
- struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::Describe()";
- EnterResource<PPB_TrueTypeFont_API> enter(font, callback, true);
- if (enter.failed())
- return enter.retval();
- return enter.SetResult(enter.object()->Describe(desc, enter.callback()));
-}
-
-int32_t GetTableTags(PP_Resource font,
- struct PP_ArrayOutput output,
- struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::GetTableTags()";
- EnterResource<PPB_TrueTypeFont_API> enter(font, callback, true);
- if (enter.failed())
- return enter.retval();
- return enter.SetResult(
- enter.object()->GetTableTags(output, enter.callback()));
-}
-
-int32_t GetTable(PP_Resource font,
- uint32_t table,
- int32_t offset,
- int32_t max_data_length,
- struct PP_ArrayOutput output,
- struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_TrueTypeFont_Dev::GetTable()";
- EnterResource<PPB_TrueTypeFont_API> enter(font, callback, true);
- if (enter.failed())
- return enter.retval();
- return enter.SetResult(enter.object()->GetTable(
- table, offset, max_data_length, output, enter.callback()));
-}
-
-const PPB_TrueTypeFont_Dev_0_1 g_ppb_truetypefont_dev_thunk_0_1 = {
- &GetFontFamilies, &GetFontsInFamily, &Create, &IsTrueTypeFont,
- &Describe, &GetTableTags, &GetTable};
-
-} // namespace
-
-PPAPI_THUNK_EXPORT const PPB_TrueTypeFont_Dev_0_1*
-GetPPB_TrueTypeFont_Dev_0_1_Thunk() {
- return &g_ppb_truetypefont_dev_thunk_0_1;
-}
-
-} // namespace thunk
-} // namespace ppapi
diff --git a/chromium/ppapi/thunk/ppb_truetype_font_singleton_api.h b/chromium/ppapi/thunk/ppb_truetype_font_singleton_api.h
deleted file mode 100644
index dadfd7db1df..00000000000
--- a/chromium/ppapi/thunk/ppb_truetype_font_singleton_api.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 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.
-
-#ifndef PPAPI_THUNK_PPB_TRUETYPE_FONT_SINGLETON_API_H_
-#define PPAPI_THUNK_PPB_TRUETYPE_FONT_SINGLETON_API_H_
-
-#include <stdint.h>
-
-#include "ppapi/c/pp_array_output.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_var.h"
-#include "ppapi/shared_impl/singleton_resource_id.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_TrueTypeFont_Singleton_API {
- public:
- virtual ~PPB_TrueTypeFont_Singleton_API() {}
-
- virtual int32_t GetFontFamilies(
- PP_Instance instance,
- const PP_ArrayOutput& output,
- const scoped_refptr<TrackedCallback>& callback) = 0;
-
- virtual int32_t GetFontsInFamily(
- PP_Instance instance,
- PP_Var family,
- const PP_ArrayOutput& output,
- const scoped_refptr<TrackedCallback>& callback) = 0;
-
- static const SingletonResourceID kSingletonResourceID =
- TRUETYPE_FONT_SINGLETON_ID;
-};
-
-} // namespace thunk
-} // namespace ppapi
-
-#endif // PPAPI_THUNK_PPB_TRUETYPE_FONT_SINGLETON_API_H_
diff --git a/chromium/ppapi/thunk/resource_creation_api.h b/chromium/ppapi/thunk/resource_creation_api.h
index 43f930259e5..cdde11a5a13 100644
--- a/chromium/ppapi/thunk/resource_creation_api.h
+++ b/chromium/ppapi/thunk/resource_creation_api.h
@@ -12,7 +12,6 @@
#include "gpu/command_buffer/common/command_buffer_id.h"
#include "ppapi/c/dev/pp_video_dev.h"
#include "ppapi/c/dev/ppb_file_chooser_dev.h"
-#include "ppapi/c/dev/ppb_truetype_font_dev.h"
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_resource.h"
@@ -104,9 +103,6 @@ class ResourceCreationAPI {
PP_InputEvent_Type type,
PP_TimeTicks time_stamp,
uint32_t modifiers) = 0;
- virtual PP_Resource CreateTrueTypeFont(
- PP_Instance instance,
- const PP_TrueTypeFontDesc_Dev* desc) = 0;
virtual PP_Resource CreateURLLoader(PP_Instance instance) = 0;
virtual PP_Resource CreateURLRequestInfo(
PP_Instance instance) = 0;
diff --git a/chromium/ppapi/thunk/thunk.h b/chromium/ppapi/thunk/thunk.h
index 54b3ded030d..99a24c6d708 100644
--- a/chromium/ppapi/thunk/thunk.h
+++ b/chromium/ppapi/thunk/thunk.h
@@ -24,8 +24,8 @@
#include "ppapi/thunk/interfaces_ppb_private_pdf.h"
#include "ppapi/thunk/interfaces_ppb_public_dev.h"
#include "ppapi/thunk/interfaces_ppb_public_dev_channel.h"
+#include "ppapi/thunk/interfaces_ppb_public_socket.h"
#include "ppapi/thunk/interfaces_ppb_public_stable.h"
-
#undef PROXIED_IFACE
namespace ppapi {
View Lorry Controller Status