diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-26 00:28:36 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-26 00:28:36 +0000 |
| commit | 67c5be79a53904e4ab5a6617bf9cbad9f7f5de6f (patch) | |
| tree | d3d8e5c52a081276c4e7e5a44f77cc8d49a70c21 /printing/image.cc | |
| parent | 70ce2ea6a9312b849f9909b26d52c147e6033e38 (diff) | |
| download | chromium_src-67c5be79a53904e4ab5a6617bf9cbad9f7f5de6f.zip chromium_src-67c5be79a53904e4ab5a6617bf9cbad9f7f5de6f.tar.gz chromium_src-67c5be79a53904e4ab5a6617bf9cbad9f7f5de6f.tar.bz2 | |
Adding CreateFromData to NativeMetafileFactory
Also making Create method calling Init on the metafile before returning it.
Usually clients of the NativeMetafileFactory call Create and the Init or
InitFromData on the object to initialize it. Now the returned object will
already be initialized.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/6696076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/image.cc')
| -rw-r--r-- | printing/image.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/printing/image.cc b/printing/image.cc index 2f5d7e3..87a6f7e 100644 --- a/printing/image.cc +++ b/printing/image.cc @@ -147,8 +147,10 @@ bool Image::LoadPng(const std::string& compressed) { bool Image::LoadMetafile(const std::string& data) { DCHECK(!data.empty()); scoped_ptr<NativeMetafile> metafile( - printing::NativeMetafileFactory::Create()); - metafile->InitFromData(data.data(), data.size()); + printing::NativeMetafileFactory::CreateFromData(data.data(), + data.size())); + if(!metafile.get()) + return false; return LoadMetafile(*metafile); } |