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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 10540033: Add ENABLE_PRINTING and disable it on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: In gyps Created 8 years, 6 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
« printing/printing.gyp ('K') | « printing/printing.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 429dd03d4c65297cf1180a606232516017f62711..0507316dd2bab2382eb095e185fc0e0c2a1aa14c 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1172,7 +1172,7 @@ bool PluginInstance::PrintPage(int page_number, WebKit::WebCanvas* canvas) {
DCHECK(plugin_print_interface_);
PP_PrintPageNumberRange_Dev page_range;
page_range.first_page_number = page_range.last_page_number = page_number;
-#if defined(USE_SKIA)
+#if defined(USE_SKIA) && defined(ENABLE_PRINTING)
Lei Zhang 2012/06/08 19:08:41 Why not just make PrintPage() simply return false
Xianzhu 2012/06/08 22:50:43 Done.
Lei Zhang 2012/06/08 23:24:52 This is fine, but you can also turn the other prin
Xianzhu 2012/06/09 00:51:30 Now added ifdef in PrintPDFOutput() which also use
// The canvas only has a metafile on it for print preview.
bool save_for_later =
(printing::MetafileSkiaWrapper::GetMetafileFromCanvas(*canvas) != NULL);
@@ -1184,7 +1184,7 @@ bool PluginInstance::PrintPage(int page_number, WebKit::WebCanvas* canvas) {
canvas_ = canvas;
return true;
} else
-#endif // USE_SKIA
+#endif // USE_SKIA && ENABLE_PRINTING
{
return PrintPageHelper(&page_range, 1, canvas);
}
« printing/printing.gyp ('K') | « printing/printing.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698