diff options
author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 05:29:07 +0000 |
---|---|---|
committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 05:29:07 +0000 |
commit | 38bba4f8e2f93dd789c3483a3f0c153ca5809793 (patch) | |
tree | 18ec7bd6d8cf84dd7492b1f986f210621a79db00 /printing/printed_document.cc | |
parent | 31548a10135c11ff689074896237d2b7a404959c (diff) | |
download | chromium_src-38bba4f8e2f93dd789c3483a3f0c153ca5809793.zip chromium_src-38bba4f8e2f93dd789c3483a3f0c153ca5809793.tar.gz chromium_src-38bba4f8e2f93dd789c3483a3f0c153ca5809793.tar.bz2 |
Changes made to the printing logic to allow plugins to participate in the browser's print workflow. These changes mainly involve allowing the plugin to specify
whether it wants the browser to use overlays and also changes to the EMF code on Windows to decompress JPEGs/PNGs in the metafile.
The related webkit change is https://bugs.webkit.org/show_bug.cgi?id=35550
BUG=None
TEST=Test printing with new Pepper plugins that support custom printing.
Review URL: http://codereview.chromium.org/745001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printed_document.cc')
-rw-r--r-- | printing/printed_document.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 5f5f53c..7857859 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -180,6 +180,9 @@ void PrintedDocument::PrintHeaderFooter(gfx::NativeDrawingContext context, PageOverlays::VerticalPosition y, const gfx::Font& font) const { const PrintSettings& settings = immutable_.settings_; + if (!settings.use_overlays) { + return; + } const std::wstring& line = settings.overlays.GetOverlay(x, y); if (line.empty()) { return; |