Unix ifdefs patch for ui/ and webkit/

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

[Lei Zhang, 2011/05/24 00:11:32]

Can you leave ppapi_plugin_instance.* alone for now? There's already another CL
in review that will change the behavior here.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 356 matching lines @@
   bool checked_for_plugin_messaging_interface_;
 
   // This is only valid between a successful PrintBegin call and a PrintEnd
   // call.
   PP_PrintSettings_Dev current_print_settings_;
 #if defined(OS_MACOSX)
   // On the Mac, when we draw the bitmap to the PDFContext, it seems necessary
   // to keep the pixels valid until CGContextEndPage is called. We use this
   // variable to hold on to the pixels.
   scoped_refptr<PPB_ImageData_Impl> last_printed_page_;
-#elif defined(OS_LINUX)
-  // On Linux, all pages need to be written to a PDF file in one shot. However,
+#elif defined(OS_POSIX)
+  // On Unix, all pages need to be written to a PDF file in one shot. However,
   // when users print only a subset of all the pages, it is impossible to know
   // if a call to PrintPage() is the last call. Thus in PrintPage(), just store
   // the page number in |ranges_|.
   // The hack is in PrintEnd(), where a valid |canvas_| is preserved in
   // PrintWebViewHelper::PrintPages. This makes it possible to generate the
   // entire PDF given the variables below:
   //
   // The most recently used WebCanvas, guaranteed to be valid.
   WebKit::WebCanvas* canvas_;
   // An array of page ranges.
   std::vector<PP_PrintPageNumberRange_Dev> ranges_;
-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_POSIX)
 
   // The plugin print interface.  This nested struct adds functions needed for
   // backwards compatibility.
   struct PPP_Printing_Dev_Combined : public PPP_Printing_Dev {
     // Conversion constructor for the most current interface.  Sets all old
     // functions to NULL, so we know not to try to use them.
     PPP_Printing_Dev_Combined(const PPP_Printing_Dev& base_if)
         : PPP_Printing_Dev(base_if),
           QuerySupportedFormats_0_3(NULL),
           Begin_0_3(NULL) {}
@@ skipping 52 matching lines @@
   typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;
   NPObjectToObjectVarMap np_object_to_object_var_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_