diff options
| author | raymes <raymes@chromium.org> | 2016-03-20 16:51:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-20 23:52:39 +0000 |
| commit | 3d0c88b74fd4f06a5681abf38a8ce3670344f411 (patch) | |
| tree | 4ab8d439f127e1b88afef364070e18b44f306c25 /ppapi | |
| parent | 2ddc91285a7a4d322199fc8e003dd57bbf4de5e8 (diff) | |
| download | chromium_src-3d0c88b74fd4f06a5681abf38a8ce3670344f411.zip chromium_src-3d0c88b74fd4f06a5681abf38a8ce3670344f411.tar.gz chromium_src-3d0c88b74fd4f06a5681abf38a8ce3670344f411.tar.bz2 | |
Fix the PPB_Flash_Font_file thunk so it can be generated
A change to the PPB_Flash_Font_file thunk made it not able to be generated. This fixes it by adding a shared class which the generator expects to be there.
BUG=593205
Review URL: https://codereview.chromium.org/1797843002
Cr-Commit-Position: refs/heads/master@{#382237}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_shared.gypi | 1 | ||||
| -rw-r--r-- | ppapi/shared_impl/BUILD.gn | 1 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppb_flash_font_file_shared.h | 19 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_font_file_thunk.cc | 7 |
4 files changed, 24 insertions, 4 deletions
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 2b5f59e..5a2cc93 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -69,6 +69,7 @@ 'shared_impl/ppb_crypto_shared.cc', 'shared_impl/ppb_device_ref_shared.cc', 'shared_impl/ppb_device_ref_shared.h', + 'shared_impl/ppb_flash_font_file_shared.h', 'shared_impl/ppb_gamepad_shared.cc', 'shared_impl/ppb_gamepad_shared.h', 'shared_impl/ppb_graphics_3d_shared.cc', diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn index ff9b01a..6fbb136 100644 --- a/ppapi/shared_impl/BUILD.gn +++ b/ppapi/shared_impl/BUILD.gn @@ -63,6 +63,7 @@ component("shared_impl") { "ppb_crypto_shared.cc", "ppb_device_ref_shared.cc", "ppb_device_ref_shared.h", + "ppb_flash_font_file_shared.h", "ppb_gamepad_shared.cc", "ppb_gamepad_shared.h", "ppb_graphics_3d_shared.cc", diff --git a/ppapi/shared_impl/ppb_flash_font_file_shared.h b/ppapi/shared_impl/ppb_flash_font_file_shared.h new file mode 100644 index 0000000..85ec991 --- /dev/null +++ b/ppapi/shared_impl/ppb_flash_font_file_shared.h @@ -0,0 +1,19 @@ +// Copyright 2016 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_SHARED_IMPL_PPB_FLASH_FONT_FILE_SHARED_H_ +#define PPAPI_SHARED_IMPL_PPB_FLASH_FONT_FILE_SHARED_H_ + +#include "ppapi/c/pp_bool.h" + +namespace ppapi { + +class PPB_Flash_FontFile_Shared { + public: + static PP_Bool IsSupportedForWindows() { return PP_TRUE; } +}; + +} // namespace ppapi + +#endif // PPAPI_SHARED_IMPL_PPB_FLASH_FONT_FILE_SHARED_H_
\ No newline at end of file diff --git a/ppapi/thunk/ppb_flash_font_file_thunk.cc b/ppapi/thunk/ppb_flash_font_file_thunk.cc index ea732cd..dc7d304 100644 --- a/ppapi/thunk/ppb_flash_font_file_thunk.cc +++ b/ppapi/thunk/ppb_flash_font_file_thunk.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// From private/ppb_flash_font_file.idl modified Thu Oct 22 22:02:40 2015. - -#include <stdint.h> +// From private/ppb_flash_font_file.idl modified Wed Mar 9 12:48:51 2016. #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash_font_file.h" +#include "ppapi/shared_impl/ppb_flash_font_file_shared.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppapi_thunk_export.h" @@ -47,7 +46,7 @@ PP_Bool GetFontTable(PP_Resource font_file, PP_Bool IsSupportedForWindows(void) { VLOG(4) << "PPB_Flash_FontFile::IsSupportedForWindows()"; - return PP_TRUE; + return PPB_Flash_FontFile_Shared::IsSupportedForWindows(); } const PPB_Flash_FontFile_0_1 g_ppb_flash_fontfile_thunk_0_1 = { |