Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2516)

Unified Diff: printing/printed_document.cc

Issue 6516022: Linux: Refactor printing to be more like Windows/Mac.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac build Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: printing/printed_document.cc
===================================================================
--- printing/printed_document.cc (revision 75320)
+++ printing/printed_document.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -109,11 +109,19 @@
PageNumber page(immutable_.settings_, mutable_.page_count_);
if (page == PageNumber::npos())
return false;
+
for (; page != PageNumber::npos(); ++page) {
+ bool metafile_must_be_valid =
+#if defined(OS_WIN) || defined(OS_MAC)
+ true;
+#elif defined(OS_POSIX)
+ (page.ToInt() == 0);
+#endif
PrintedPages::const_iterator itr = mutable_.pages_.find(page.ToInt());
- if (itr == mutable_.pages_.end() || !itr->second.get() ||
- !itr->second->native_metafile())
+ if (itr == mutable_.pages_.end() || !itr->second.get())
return false;
+ if (metafile_must_be_valid && !itr->second->native_metafile())
+ return false;
}
return true;
}

Powered by Google App Engine
This is Rietveld 408576698