diff options
| author | avi <avi@chromium.org> | 2015-12-07 08:11:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 16:13:09 +0000 |
| commit | 50e3df675d58385e566645effb6ccfd3c8562443 (patch) | |
| tree | 6519f875491e57f5795bd68fc3249303a3a33d98 /content/ppapi_plugin | |
| parent | b2d3d602cd213055bb54117152926c9989e3938f (diff) | |
| download | chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.zip chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.gz chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.bz2 | |
Revert of Enforce marking "override" for functions overriding Blink. (patchset #19 id:360001 of https://codereview.chromium.org/1370923002/ )
Reason for revert:
Missed one.
Original issue's description:
> Enforce marking "override" for functions overriding Blink.
>
> BUG=535367
> TEST=it all stays working
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
> TBR=ben@chromium.org
>
> Committed: https://crrev.com/32ff552858e014d454ce8b181f5aca1dfcf8f8fd
> Cr-Commit-Position: refs/heads/master@{#363482}
TBR=thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=535367
Review URL: https://codereview.chromium.org/1504913002
Cr-Commit-Position: refs/heads/master@{#363492}
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_blink_platform_impl.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/ppapi_plugin/ppapi_blink_platform_impl.cc b/content/ppapi_plugin/ppapi_blink_platform_impl.cc index de977b2..ddfdc78 100644 --- a/content/ppapi_plugin/ppapi_blink_platform_impl.cc +++ b/content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -45,10 +45,9 @@ class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport { bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID) override; #elif defined(OS_POSIX) SandboxSupport(); - void getFallbackFontForCharacter( - WebUChar32 character, - const char* preferred_locale, - blink::WebFallbackFont* fallbackFont) override; + void getFallbackFontForCharacter(WebUChar32 character, + const char* preferred_locale, + blink::WebFallbackFont* fallbackFont); void getRenderStyleForStrike(const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out) override; |