Merge 97429

Source/WebCore/bindings/v8/NPObjectWrapper.h

 /*
  * Copyright (C) 2011 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #define NPObjectWrapper_h
 
 #include "npruntime_impl.h"
 
 namespace WebCore {
 
 // This class wraps a NPObject and provides functionality for the wrapped
 // object to be cleared out when this object is destroyed. This is to ensure
 // that callers trying to access the underlying object don't crash while
 // invoking methods on the NPObject.
-class NPObjectWrapper : public NPObject {
+class NPObjectWrapper {
 public:
     // Creates an instance of the NPObjectWrapper class and wraps the object
     // passed in.
     static NPObject* create(NPObject* object);
 
     // This method should be called to invalidate the underlying NPObject pointer.
     void clear();
 
     // Returns a pointer to NPObjectWrapper if the object passed in was wrapped by us.
     static NPObjectWrapper* getWrapper(NPObject* obj);
@@ skipping 26 matching lines @@
 
     static NPClass m_npClassWrapper;
     // Weak NPObject poointer.
     NPObject* m_wrappedNPObject;
 };
 
 } // namespace WebCore
 
 #endif // NPObjectWrapper_h