diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 20:37:24 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 20:37:24 +0000 |
commit | a3403e7cbc8f8f876a0e19eef05378ad5b5d370a (patch) | |
tree | bcf3fe9eb7851157536b4357189e383d65a4ee91 /ppapi/cpp | |
parent | 719b36f60b1731c3260825ef281d10b252d96b65 (diff) | |
download | chromium_src-a3403e7cbc8f8f876a0e19eef05378ad5b5d370a.zip chromium_src-a3403e7cbc8f8f876a0e19eef05378ad5b5d370a.tar.gz chromium_src-a3403e7cbc8f8f876a0e19eef05378ad5b5d370a.tar.bz2 |
Implement operator= for FontDev (it currently gives errors if you try to use
it). De-inline the constructor.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/5962005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
-rw-r--r-- | ppapi/cpp/dev/font_dev.cc | 7 | ||||
-rw-r--r-- | ppapi/cpp/dev/font_dev.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ppapi/cpp/dev/font_dev.cc b/ppapi/cpp/dev/font_dev.cc index 0bf9cbd..6394b81 100644 --- a/ppapi/cpp/dev/font_dev.cc +++ b/ppapi/cpp/dev/font_dev.cc @@ -97,6 +97,9 @@ TextRun_Dev& TextRun_Dev::operator=(const TextRun_Dev& other) { // Font ------------------------------------------------------------------------ +Font_Dev::Font_Dev() : Resource() { +} + Font_Dev::Font_Dev(PP_Resource resource) : Resource(resource) { } @@ -110,6 +113,10 @@ Font_Dev::Font_Dev(const FontDescription_Dev& description) { Font_Dev::Font_Dev(const Font_Dev& other) : Resource(other) { } +Font_Dev& Font_Dev::operator=(const Font_Dev& other) { + Resource::operator=(other); + return *this; +} bool Font_Dev::Describe(FontDescription_Dev* description, PP_FontMetrics_Dev* metrics) const { diff --git a/ppapi/cpp/dev/font_dev.h b/ppapi/cpp/dev/font_dev.h index cbe4b23..137258c 100644 --- a/ppapi/cpp/dev/font_dev.h +++ b/ppapi/cpp/dev/font_dev.h @@ -102,7 +102,7 @@ class TextRun_Dev { class Font_Dev : public Resource { public: // Creates an is_null() Font object. - Font_Dev() {} + Font_Dev(); explicit Font_Dev(PP_Resource resource); explicit Font_Dev(const FontDescription_Dev& description); |