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

Side by Side Diff: content/ppapi_plugin/ppapi_blink_platform_impl.cc

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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 #include "content/ppapi_plugin/ppapi_blink_platform_impl.h" 5 #include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 27 matching lines...) Expand all
38 #if !defined(OS_ANDROID) && !defined(OS_WIN) 38 #if !defined(OS_ANDROID) && !defined(OS_WIN)
39 39
40 class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport { 40 class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport {
41 public: 41 public:
42 virtual ~SandboxSupport() {} 42 virtual ~SandboxSupport() {}
43 43
44 #if defined(OS_MACOSX) 44 #if defined(OS_MACOSX)
45 bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID) override; 45 bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID) override;
46 #elif defined(OS_POSIX) 46 #elif defined(OS_POSIX)
47 SandboxSupport(); 47 SandboxSupport();
48 void getFallbackFontForCharacter( 48 void getFallbackFontForCharacter(WebUChar32 character,
49 WebUChar32 character, 49 const char* preferred_locale,
50 const char* preferred_locale, 50 blink::WebFallbackFont* fallbackFont);
51 blink::WebFallbackFont* fallbackFont) override;
52 void getRenderStyleForStrike(const char* family, 51 void getRenderStyleForStrike(const char* family,
53 int sizeAndStyle, 52 int sizeAndStyle,
54 blink::WebFontRenderStyle* out) override; 53 blink::WebFontRenderStyle* out) override;
55 54
56 private: 55 private:
57 // WebKit likes to ask us for the correct font family to use for a set of 56 // WebKit likes to ask us for the correct font family to use for a set of
58 // unicode code points. It needs this information frequently so we cache it 57 // unicode code points. It needs this information frequently so we cache it
59 // here. 58 // here.
60 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_; 59 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
61 // For debugging crbug.com/312965 60 // For debugging crbug.com/312965
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 243 }
245 244
246 int PpapiBlinkPlatformImpl::databaseDeleteFile( 245 int PpapiBlinkPlatformImpl::databaseDeleteFile(
247 const blink::WebString& vfs_file_name, 246 const blink::WebString& vfs_file_name,
248 bool sync_dir) { 247 bool sync_dir) {
249 NOTREACHED(); 248 NOTREACHED();
250 return 0; 249 return 0;
251 } 250 }
252 251
253 } // namespace content 252 } // namespace content
OLDNEW
« no previous file with comments | « content/child/webthemeengine_impl_default.h ('k') | content/renderer/media/android/media_info_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698