diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 21:08:15 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 21:08:15 +0000 |
| commit | 354ee476e6168d9cc351a5763e98ec9a6999fa8e (patch) | |
| tree | 262b062593ebb9f63cac3f2046ae1da77e853795 | |
| parent | 1b583b2ed078c7102216d19c0627cb30a81c78b2 (diff) | |
| download | chromium_src-354ee476e6168d9cc351a5763e98ec9a6999fa8e.zip chromium_src-354ee476e6168d9cc351a5763e98ec9a6999fa8e.tar.gz chromium_src-354ee476e6168d9cc351a5763e98ec9a6999fa8e.tar.bz2 | |
Add DISALLOW_COPY_AND_ASSIGN() to PlatformFont* classes.
BUG=none
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/10915009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154267 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/platform_font_mac.h | 4 | ||||
| -rw-r--r-- | ui/gfx/platform_font_pango.h | 8 | ||||
| -rw-r--r-- | ui/gfx/platform_font_win.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h index 0f6fd8e..42bbd9a 100644 --- a/ui/gfx/platform_font_mac.h +++ b/ui/gfx/platform_font_mac.h @@ -45,10 +45,12 @@ class PlatformFontMac : public PlatformFont { int font_size_; int style_; - // Cached metrics, generated at construction + // Cached metrics, generated at construction. int height_; int ascent_; int average_width_; + + DISALLOW_COPY_AND_ASSIGN(PlatformFontMac); }; } // namespace gfx diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h index 77d64ba..cb93bf4 100644 --- a/ui/gfx/platform_font_pango.h +++ b/ui/gfx/platform_font_pango.h @@ -32,7 +32,7 @@ class UI_EXPORT PlatformFontPango : public PlatformFont { // Position as an offset from the height of the drawn text, used to draw // an underline. This is a negative number, so the underline would be - // drawn at y + height + underline_position; + // drawn at y + height + underline_position. double underline_position() const; // The thickness to draw the underline. double underline_thickness() const; @@ -69,7 +69,7 @@ class UI_EXPORT PlatformFontPango : public PlatformFont { // Potentially slow call to get pango metrics (average width, underline info). void InitPangoMetrics(); - // Setup a Skia context to use the current typeface + // Setup a Skia context to use the current typeface. void PaintSetup(SkPaint* paint) const; // Make |this| a copy of |other|. @@ -90,7 +90,7 @@ class UI_EXPORT PlatformFontPango : public PlatformFont { int font_size_pixels_; int style_; - // Cached metrics, generated at construction + // Cached metrics, generated at construction. int height_pixels_; int ascent_pixels_; @@ -103,6 +103,8 @@ class UI_EXPORT PlatformFontPango : public PlatformFont { // The default font, used for the default constructor. static Font* default_font_; + + DISALLOW_COPY_AND_ASSIGN(PlatformFontPango); }; } // namespace gfx diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h index 6ed5b56..be8d77b 100644 --- a/ui/gfx/platform_font_win.h +++ b/ui/gfx/platform_font_win.h @@ -148,6 +148,8 @@ class UI_EXPORT PlatformFontWin : public PlatformFont { // Indirect reference to the HFontRef, which references the underlying HFONT. scoped_refptr<HFontRef> font_ref_; + + DISALLOW_COPY_AND_ASSIGN(PlatformFontWin); }; } // namespace gfx |