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

Side by Side Diff: Source/web/WebFontImpl.h

Issue 135753002: Update web classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebFileChooserCompletionImpl.h ('k') | Source/web/WebFrameImpl.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 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 20 matching lines...) Expand all
31 #ifndef WebFontImpl_h 31 #ifndef WebFontImpl_h
32 #define WebFontImpl_h 32 #define WebFontImpl_h
33 33
34 #include "WebFont.h" 34 #include "WebFont.h"
35 #include "platform/fonts/Font.h" 35 #include "platform/fonts/Font.h"
36 36
37 namespace WebCore { class FontDescription; } 37 namespace WebCore { class FontDescription; }
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class WebFontImpl : public WebFont { 41 class WebFontImpl FINAL : public WebFont {
42 public: 42 public:
43 WebFontImpl(const WebCore::FontDescription&, float letterSpacing, float word Spacing); 43 WebFontImpl(const WebCore::FontDescription&, float letterSpacing, float word Spacing);
44 44
45 virtual WebFontDescription fontDescription() const; 45 virtual WebFontDescription fontDescription() const OVERRIDE;
46 46
47 virtual int ascent() const; 47 virtual int ascent() const OVERRIDE;
48 virtual int descent() const; 48 virtual int descent() const OVERRIDE;
49 virtual int height() const; 49 virtual int height() const OVERRIDE;
50 virtual int lineSpacing() const; 50 virtual int lineSpacing() const OVERRIDE;
51 virtual float xHeight() const; 51 virtual float xHeight() const OVERRIDE;
52 52
53 virtual void drawText(WebCanvas*, const WebTextRun&, const WebFloatPoint& le ftBaseline, WebColor, 53 virtual void drawText(WebCanvas*, const WebTextRun&, const WebFloatPoint& le ftBaseline, WebColor,
54 const WebRect& clip, bool canvasIsOpaque, int from = 0 , int to = -1) const; 54 const WebRect& clip, bool canvasIsOpaque, int from = 0, int to = -1) con st OVERRIDE;
55 virtual int calculateWidth(const WebTextRun&) const; 55 virtual int calculateWidth(const WebTextRun&) const OVERRIDE;
56 virtual int offsetForPosition(const WebTextRun&, float position) const; 56 virtual int offsetForPosition(const WebTextRun&, float position) const OVERR IDE;
57 virtual WebFloatRect selectionRectForText(const WebTextRun&, const WebFloatP oint& leftBaseline, 57 virtual WebFloatRect selectionRectForText(const WebTextRun&, const WebFloatP oint& leftBaseline,
58 int height, int from = 0, int to = -1) const; 58 int height, int from = 0, int to = -1) const OVERRIDE;
59 59
60 private: 60 private:
61 WebCore::Font m_font; 61 WebCore::Font m_font;
62 }; 62 };
63 63
64 } // namespace blink 64 } // namespace blink
65 65
66 #endif 66 #endif
OLDNEW
« no previous file with comments | « Source/web/WebFileChooserCompletionImpl.h ('k') | Source/web/WebFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698