Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: ppapi/proxy/flash_font_file_resource.h

Issue 1097393007: Update {virtual,override} to follow C++11 style in ppapi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off one file into separate review. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ppapi/proxy/flash_file_resource.h ('k') | ppapi/proxy/flash_fullscreen_resource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_ 5 #ifndef PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_
6 #define PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_ 6 #define PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 11 matching lines...) Expand all
22 namespace proxy { 22 namespace proxy {
23 23
24 // TODO(yzshen): write unittest and browser test. 24 // TODO(yzshen): write unittest and browser test.
25 class FlashFontFileResource : public PluginResource, 25 class FlashFontFileResource : public PluginResource,
26 public thunk::PPB_Flash_FontFile_API { 26 public thunk::PPB_Flash_FontFile_API {
27 public: 27 public:
28 FlashFontFileResource(Connection connection, 28 FlashFontFileResource(Connection connection,
29 PP_Instance instance, 29 PP_Instance instance,
30 const PP_BrowserFont_Trusted_Description* description, 30 const PP_BrowserFont_Trusted_Description* description,
31 PP_PrivateFontCharset charset); 31 PP_PrivateFontCharset charset);
32 virtual ~FlashFontFileResource(); 32 ~FlashFontFileResource() override;
33 33
34 // Resource overrides. 34 // Resource overrides.
35 virtual thunk::PPB_Flash_FontFile_API* AsPPB_Flash_FontFile_API() override; 35 thunk::PPB_Flash_FontFile_API* AsPPB_Flash_FontFile_API() override;
36 36
37 // PPB_Flash_FontFile_API. 37 // PPB_Flash_FontFile_API.
38 virtual PP_Bool GetFontTable(uint32_t table, 38 PP_Bool GetFontTable(uint32_t table,
39 void* output, 39 void* output,
40 uint32_t* output_length) override; 40 uint32_t* output_length) override;
41 41
42 private: 42 private:
43 // Sees if we have a cache of the font table and returns a pointer to it. 43 // Sees if we have a cache of the font table and returns a pointer to it.
44 // Returns NULL if we don't have it. 44 // Returns NULL if we don't have it.
45 std::string* GetFontTable(uint32_t table) const; 45 std::string* GetFontTable(uint32_t table) const;
46 46
47 std::string* AddFontTable(uint32_t table, const std::string& contents); 47 std::string* AddFontTable(uint32_t table, const std::string& contents);
48 48
49 typedef std::map<uint32_t, linked_ptr<std::string> > FontTableMap; 49 typedef std::map<uint32_t, linked_ptr<std::string> > FontTableMap;
50 FontTableMap font_tables_; 50 FontTableMap font_tables_;
51 51
52 SerializedFontDescription description_; 52 SerializedFontDescription description_;
53 PP_PrivateFontCharset charset_; 53 PP_PrivateFontCharset charset_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(FlashFontFileResource); 55 DISALLOW_COPY_AND_ASSIGN(FlashFontFileResource);
56 }; 56 };
57 57
58 } // namespace proxy 58 } // namespace proxy
59 } // namespace ppapi 59 } // namespace ppapi
60 60
61 #endif // PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_ 61 #endif // PPAPI_PROXY_FLASH_FONT_FILE_RESOURCE_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/flash_file_resource.h ('k') | ppapi/proxy/flash_fullscreen_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698