Add ENABLE_PRINTING and disable it on Android.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2012 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.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 1154 matching lines @@
   canvas_ = NULL;
   ranges_.clear();
 #endif  // USE_SKIA
   return num_pages;
 }
 
 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 if ENABLE_PRINTING is not set?
Similarly PrintBegin() can return 0, PrintEnd() can just return, and
PrintPageHelper() can be #ifdef'd out.

[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 printing methods in this file into
dummy methods when printing is disabled. You can do it now or in a separate CL
later.

[Xianzhu, 2012/06/09 00:51:30]

Now added ifdef in PrintPDFOutput() which also uses printing:: symbols. Didn't
change that before because it won't break build without enable_printing.

   // The canvas only has a metafile on it for print preview.
   bool save_for_later =
       (printing::MetafileSkiaWrapper::GetMetafileFromCanvas(*canvas) != NULL);
 #if defined(OS_MACOSX) || defined(OS_WIN)
   save_for_later = save_for_later && skia::IsPreviewMetafile(*canvas);
 #endif
   if (save_for_later) {
     ranges_.push_back(page_range);
     canvas_ = canvas;
     return true;
   } else
-#endif  // USE_SKIA
+#endif  // USE_SKIA && ENABLE_PRINTING
   {
     return PrintPageHelper(&page_range, 1, canvas);
   }
 }
 
 bool PluginInstance::PrintPageHelper(PP_PrintPageNumberRange_Dev* page_ranges,
                                      int num_ranges,
                                      WebKit::WebCanvas* canvas) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
@@ skipping 939 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit