| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ | 26 #ifndef WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ |
| 27 #define WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ | 27 #define WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ |
| 28 | 28 |
| 29 #include "base/basictypes.h" | 29 #include "base/basictypes.h" |
| 30 #include "base/scoped_ptr.h" | 30 #include "base/scoped_ptr.h" |
| 31 #include "webkit/glue/plugins/nphostapi.h" | 31 #include "third_party/npapi/bindings/nphostapi.h" |
| 32 #if !defined(INDEPENDENT_PLUGIN) | 32 #if !defined(INDEPENDENT_PLUGIN) |
| 33 #include "gpu/pgl/pgl.h" | 33 #include "gpu/pgl/pgl.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 extern NPNetscapeFuncs* browser; | 36 extern NPNetscapeFuncs* browser; |
| 37 | 37 |
| 38 class PluginObject { | 38 class PluginObject { |
| 39 public: | 39 public: |
| 40 explicit PluginObject(NPP npp); | 40 explicit PluginObject(NPP npp); |
| 41 ~PluginObject(); | 41 ~PluginObject(); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 71 | 71 |
| 72 | 72 |
| 73 int width_; | 73 int width_; |
| 74 int height_; | 74 int height_; |
| 75 | 75 |
| 76 DISALLOW_COPY_AND_ASSIGN(PluginObject); | 76 DISALLOW_COPY_AND_ASSIGN(PluginObject); |
| 77 }; | 77 }; |
| 78 | 78 |
| 79 | 79 |
| 80 #endif // WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ | 80 #endif // WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_ |
| OLD | NEW |