Skip to content

Commit

Permalink
[ppapi] Remove PPB_TrueTypeFont resource.
Browse files Browse the repository at this point in the history
- UMA shows this interface has no usage.

This is a manual reland of:
https://chromium-review.googlesource.com/c/chromium/src/+/1546762

That was reverted due to failures on the deterministic build. Let's see if that has been fixed.

Change-Id: I4f7409dd0cb76245539d63d61e411bb35c9d1514
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446369
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Bill Budge <bbudge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814202}
  • Loading branch information
Bill Budge authored and Commit Bot committed Oct 6, 2020
1 parent f8fe0f5 commit e100fa8
Show file tree
Hide file tree
Showing 54 changed files with 6 additions and 3,419 deletions.
1 change: 0 additions & 1 deletion chrome/common/ppapi_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "ppapi/c/dev/ppb_printing_dev.h"
#include "ppapi/c/dev/ppb_text_input_dev.h"
#include "ppapi/c/dev/ppb_trace_event_dev.h"
#include "ppapi/c/dev/ppb_truetype_font_dev.h"
#include "ppapi/c/dev/ppb_url_util_dev.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/c/dev/ppb_video_capture_dev.h"
Expand Down
8 changes: 0 additions & 8 deletions chrome/test/ppapi/ppapi_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2215,14 +2215,6 @@ TEST_PPAPI_NACL(MouseCursor)

TEST_PPAPI_NACL(NetworkProxy)

// TODO(crbug.com/619765): get working on CrOS build.
#if defined(OS_CHROMEOS)
#define MAYBE_TrueTypeFont DISABLED_TrueTypeFont
#else
#define MAYBE_TrueTypeFont TrueTypeFont
#endif
TEST_PPAPI_NACL(MAYBE_TrueTypeFont)

// TODO(crbug.com/602875), TODO(crbug.com/602876) Flaky on Win and CrOS.
#if defined(OS_CHROMEOS) || defined(OS_WIN)
#define MAYBE_VideoDecoder DISABLED_VideoDecoder
Expand Down
25 changes: 0 additions & 25 deletions content/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2350,17 +2350,6 @@ source_set("browser") {
"renderer_host/pepper/pepper_tcp_server_socket_message_filter.h",
"renderer_host/pepper/pepper_tcp_socket_message_filter.cc",
"renderer_host/pepper/pepper_tcp_socket_message_filter.h",
"renderer_host/pepper/pepper_truetype_font.h",
"renderer_host/pepper/pepper_truetype_font_host.cc",
"renderer_host/pepper/pepper_truetype_font_host.h",
"renderer_host/pepper/pepper_truetype_font_linux.cc",
"renderer_host/pepper/pepper_truetype_font_list.h",
"renderer_host/pepper/pepper_truetype_font_list_host.cc",
"renderer_host/pepper/pepper_truetype_font_list_host.h",
"renderer_host/pepper/pepper_truetype_font_list_mac.mm",
"renderer_host/pepper/pepper_truetype_font_list_win.cc",
"renderer_host/pepper/pepper_truetype_font_mac.mm",
"renderer_host/pepper/pepper_truetype_font_win.cc",
"renderer_host/pepper/pepper_udp_socket_message_filter.cc",
"renderer_host/pepper/pepper_udp_socket_message_filter.h",
"renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc",
Expand All @@ -2376,20 +2365,6 @@ source_set("browser") {
"//ppapi/proxy:ipc",
"//ppapi/shared_impl",
]

# TODO(1119772): this makes both use_x11 and use_ozone builds for is_linux use
# pangocairo so that PPAPINaClNewlibTest.TrueTypeFont,
# PPAPINaClPNaClNonSfiTest.TrueTypeFont, and OutOfProcessPPAPITest.TrueTypeFont
# tests continue to run normally on Linux. This also fixes these tests for
# Ozone/Linux, but requires to use pangocairo. We probably want to continue
# using pango on Linux and switch to something else for other systems that
# use Ozone.
if (use_ozone && (!is_linux || !use_pangocairo)) {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ]
} else if (use_pangocairo) {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
}

if (is_linux || is_chromeos) {
deps += [ "//components/services/font:ppapi_fontconfig_matching" ]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include "content/browser/renderer_host/pepper/pepper_printing_host.h"
#include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h"
#include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h"
#include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h"
#include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
#include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h"
#include "ppapi/host/message_filter_host.h"
#include "ppapi/host/ppapi_host.h"
Expand Down Expand Up @@ -175,25 +173,6 @@ ContentBrowserPepperHostFactory::CreateResourceHost(
new PepperPrintingHost(host_->GetPpapiHost(), instance, resource,
std::move(manager)));
}
case PpapiHostMsg_TrueTypeFont_Create::ID: {
ppapi::proxy::SerializedTrueTypeFontDesc desc;
if (!ppapi::UnpackMessage<PpapiHostMsg_TrueTypeFont_Create>(message,
&desc)) {
NOTREACHED();
return std::unique_ptr<ppapi::host::ResourceHost>();
}
// Check that the family name is valid UTF-8 before passing it to the
// host OS.
if (!base::IsStringUTF8(desc.family))
return std::unique_ptr<ppapi::host::ResourceHost>();

return std::unique_ptr<ppapi::host::ResourceHost>(
new PepperTrueTypeFontHost(host_, instance, resource, desc));
}
case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: {
return std::unique_ptr<ppapi::host::ResourceHost>(
new PepperTrueTypeFontListHost(host_, instance, resource));
}
#if defined(OS_CHROMEOS)
case PpapiHostMsg_VpnProvider_Create::ID: {
scoped_refptr<PepperVpnProviderMessageFilter> vpn_provider(
Expand Down
57 changes: 0 additions & 57 deletions content/browser/renderer_host/pepper/pepper_truetype_font.h

This file was deleted.

158 changes: 0 additions & 158 deletions content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc

This file was deleted.

36 changes: 0 additions & 36 deletions content/browser/renderer_host/pepper/pepper_truetype_font_list.h

This file was deleted.

This file was deleted.

Loading

0 comments on commit e100fa8

Please sign in to comment.