diff options
| author | vitalybuka <vitalybuka@chromium.org> | 2014-08-28 20:11:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 03:13:23 +0000 |
| commit | fdd3212ca1a30226a09f5505a4331afcc0d0e8d2 (patch) | |
| tree | f204fd9b038add6c166310b07c95ad1b95368f8c /printing | |
| parent | 50687650f80e74d4135f7002c1c1b30f94892b28 (diff) | |
| download | chromium_src-fdd3212ca1a30226a09f5505a4331afcc0d0e8d2.zip chromium_src-fdd3212ca1a30226a09f5505a4331afcc0d0e8d2.tar.gz chromium_src-fdd3212ca1a30226a09f5505a4331afcc0d0e8d2.tar.bz2 | |
Removed NativeMetafile and PreviewMetafile typedef as it's always PdfMetafileSkia.
BUG=170859
TBR=sgurun, yzshen
Review URL: https://codereview.chromium.org/516833002
Cr-Commit-Position: refs/heads/master@{#292561}
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/BUILD.gn | 1 | ||||
| -rw-r--r-- | printing/image.cc | 4 | ||||
| -rw-r--r-- | printing/metafile_impl.h | 18 | ||||
| -rw-r--r-- | printing/printing.gyp | 1 | ||||
| -rw-r--r-- | printing/printing_context_win.cc | 4 |
5 files changed, 4 insertions, 24 deletions
diff --git a/printing/BUILD.gn b/printing/BUILD.gn index 720382d..6e6678d 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -29,7 +29,6 @@ component("printing") { "image_mac.cc", "image_win.cc", "metafile.h", - "metafile_impl.h", "metafile_skia_wrapper.cc", "metafile_skia_wrapper.h", "page_number.cc", diff --git a/printing/image.cc b/printing/image.cc index bae89f8a..423bc84 100644 --- a/printing/image.cc +++ b/printing/image.cc @@ -11,7 +11,7 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "printing/metafile.h" -#include "printing/metafile_impl.h" +#include "printing/pdf_metafile_skia.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/codec/png_codec.h" @@ -150,7 +150,7 @@ bool Image::LoadPng(const std::string& compressed) { bool Image::LoadMetafile(const std::string& data) { DCHECK(!data.empty()); - NativeMetafile metafile; + PdfMetafileSkia metafile; if (!metafile.InitFromData(data.data(), base::checked_cast<uint32>(data.size()))) return false; diff --git a/printing/metafile_impl.h b/printing/metafile_impl.h deleted file mode 100644 index 92bec72..0000000 --- a/printing/metafile_impl.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PRINTING_METAFILE_IMPL_H_ -#define PRINTING_METAFILE_IMPL_H_ - -#include "printing/pdf_metafile_skia.h" - -namespace printing { - -// TODO(vitalybuka) Remove following typedefs and replace with PdfMetafileSkia. -typedef PdfMetafileSkia NativeMetafile; -typedef PdfMetafileSkia PreviewMetafile; - -} // namespace printing - -#endif // PRINTING_METAFILE_IMPL_H_ diff --git a/printing/printing.gyp b/printing/printing.gyp index c9106f4..81ffe34 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -44,7 +44,6 @@ 'image_mac.cc', 'image_win.cc', 'metafile.h', - 'metafile_impl.h', 'metafile_skia_wrapper.cc', 'metafile_skia_wrapper.h', 'page_number.cc', diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 4d7ea92..3e4e6e9 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -284,7 +284,7 @@ PrintingContext::Result PrintingContextWin::NewPage() { DCHECK(context_); DCHECK(in_print_job_); - // Intentional No-op. NativeMetafile::SafePlayback takes care of calling + // Intentional No-op. PdfMetafileSkia::SafePlayback takes care of calling // ::StartPage(). return OK; @@ -295,7 +295,7 @@ PrintingContext::Result PrintingContextWin::PageDone() { return CANCEL; DCHECK(in_print_job_); - // Intentional No-op. NativeMetafile::SafePlayback takes care of calling + // Intentional No-op. PdfMetafileSkia::SafePlayback takes care of calling // ::EndPage(). return OK; |