- Check for a NULL PluginObject at all NPAPI entry points. This fixes a crash in Chrome where ...

plugin/cross/plugin_logging.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 
 
 // This file defines the logging object which performs the metric aggregation
 // and uploading. This class takes care of the initialization of the logging
 // object and determining if the user has opted in or out to having logs sent
 // back. Furthermore, there are some helper functions to make testing easier.
 
 #ifndef O3D_PLUGIN_CROSS_PLUGIN_LOGGING_H_
 #define O3D_PLUGIN_CROSS_PLUGIN_LOGGING_H_
 
+#include "statsreport/metrics.h"
 #include "statsreport/common/highres_timer.h"
 #include "base/scoped_ptr.h"
 #include "base/basictypes.h"
 
 namespace o3d {
 
 class PluginLogging {
  public:
   PluginLogging();
   virtual ~PluginLogging() {}
@@ skipping 97 matching lines @@
   scoped_ptr<HighresTimer> timer_;
   uint64 running_time_;
   uint64 prev_uptime_seconds_;
   uint64 prev_cputime_seconds_;
   DISALLOW_COPY_AND_ASSIGN(PluginLogging);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_PLUGIN_CROSS_PLUGIN_LOGGING_H_