diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 22:10:05 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 22:10:05 +0000 |
| commit | 4dfb8f00b69ec3dde0660c4790a469df5596a3ab (patch) | |
| tree | defc06b4fc11ced9c365bf502c5475bee4b3620a /ppapi/proxy | |
| parent | 28cc10a26ffaaf8ff7f4f2e05ab6d03926951167 (diff) | |
| download | chromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.zip chromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.tar.gz chromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.tar.bz2 | |
Added RTF support to pepper API.
BUG=120435
TEST=out/Release/browser_tests --gtest_filter=*PPAPITest.*Clipboard*
Review URL: http://codereview.chromium.org/9921018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/ppb_flash_clipboard_proxy.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.cc b/ppapi/proxy/ppb_flash_clipboard_proxy.cc index 268a8e4..73b987e 100644 --- a/ppapi/proxy/ppb_flash_clipboard_proxy.cc +++ b/ppapi/proxy/ppb_flash_clipboard_proxy.cc @@ -29,7 +29,8 @@ bool IsValidClipboardType(PP_Flash_Clipboard_Type clipboard_type) { bool IsValidClipboardFormat(PP_Flash_Clipboard_Format format) { // Purposely excludes |PP_FLASH_CLIPBOARD_FORMAT_INVALID|. return format == PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT || - format == PP_FLASH_CLIPBOARD_FORMAT_HTML; + format == PP_FLASH_CLIPBOARD_FORMAT_HTML || + format == PP_FLASH_CLIPBOARD_FORMAT_RTF; } } // namespace @@ -86,6 +87,11 @@ int32_t PPB_Flash_Clipboard_Proxy::WriteData( if (!IsValidClipboardType(clipboard_type)) return PP_ERROR_BADARGUMENT; + for (size_t i = 0; i < data_item_count; ++i) { + if (!IsValidClipboardFormat(formats[i])) + return PP_ERROR_BADARGUMENT; + } + std::vector<int> formats_vector(formats, formats + data_item_count); std::vector<SerializedVar> data_items_vector; |