| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include <string> | 52 #include <string> |
| 53 #include <vector> | 53 #include <vector> |
| 54 #include "base/scoped_ptr.h" | 54 #include "base/scoped_ptr.h" |
| 55 #include "base/cross/std_hash.h" | 55 #include "base/cross/std_hash.h" |
| 56 #include "core/cross/display_mode.h" | 56 #include "core/cross/display_mode.h" |
| 57 #include "core/cross/display_window.h" | 57 #include "core/cross/display_window.h" |
| 58 #include "core/cross/object_base.h" | 58 #include "core/cross/object_base.h" |
| 59 #include "core/cross/service_locator.h" | 59 #include "core/cross/service_locator.h" |
| 60 #include "core/cross/evaluation_counter.h" | 60 #include "core/cross/evaluation_counter.h" |
| 61 #include "core/cross/class_manager.h" | 61 #include "core/cross/class_manager.h" |
| 62 #include "core/cross/client_info.h" |
| 62 #include "core/cross/features.h" | 63 #include "core/cross/features.h" |
| 63 #include "core/cross/object_manager.h" | 64 #include "core/cross/object_manager.h" |
| 64 #include "core/cross/error.h" | 65 #include "core/cross/error.h" |
| 65 #include "core/cross/profiler.h" | 66 #include "core/cross/profiler.h" |
| 66 #include "plugin/cross/np_v8_bridge.h" | 67 #include "plugin/cross/np_v8_bridge.h" |
| 67 #include "client_glue.h" | 68 #include "client_glue.h" |
| 68 #include "third_party/nixysa/files/static_glue/npapi/common.h" | 69 #include "third_party/nixysa/files/static_glue/npapi/common.h" |
| 69 | 70 |
| 70 namespace o3d { | 71 namespace o3d { |
| 71 class Client; | 72 class Client; |
| 72 class Renderer; | 73 class Renderer; |
| 73 } | 74 } |
| 74 | 75 |
| 75 namespace glue { | 76 namespace glue { |
| 76 class StreamManager; | 77 class StreamManager; |
| 77 | 78 |
| 78 namespace _o3d { | 79 namespace _o3d { |
| 79 using o3d::Id; | 80 using o3d::Id; |
| 80 using o3d::ObjectBase; | 81 using o3d::ObjectBase; |
| 81 using o3d::Client; | 82 using o3d::Client; |
| 82 using o3d::ClassManager; | 83 using o3d::ClassManager; |
| 84 using o3d::ClientInfoManager; |
| 83 using o3d::EvaluationCounter; | 85 using o3d::EvaluationCounter; |
| 84 using o3d::Features; | 86 using o3d::Features; |
| 85 using o3d::EvaluationCounter; | 87 using o3d::EvaluationCounter; |
| 86 using o3d::ObjectManager; | 88 using o3d::ObjectManager; |
| 87 using o3d::Profiler; | 89 using o3d::Profiler; |
| 88 using o3d::Renderer; | 90 using o3d::Renderer; |
| 89 using o3d::ServiceLocator; | 91 using o3d::ServiceLocator; |
| 90 | 92 |
| 91 class NPAPIObject: public NPObject { | 93 class NPAPIObject: public NPObject { |
| 92 NPP npp_; | 94 NPP npp_; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 117 typedef o3d::base::hash_map<Id, NPAPIObject *> ClientObjectMap; | 119 typedef o3d::base::hash_map<Id, NPAPIObject *> ClientObjectMap; |
| 118 typedef o3d::base::hash_map<const ObjectBase::Class *, NPClass *> | 120 typedef o3d::base::hash_map<const ObjectBase::Class *, NPClass *> |
| 119 ClientToNPClassMap; | 121 ClientToNPClassMap; |
| 120 typedef o3d::base::hash_map<NPClass *, const ObjectBase::Class *> | 122 typedef o3d::base::hash_map<NPClass *, const ObjectBase::Class *> |
| 121 NPToClientClassMap; | 123 NPToClientClassMap; |
| 122 | 124 |
| 123 NPP npp_; | 125 NPP npp_; |
| 124 ServiceLocator service_locator_; | 126 ServiceLocator service_locator_; |
| 125 EvaluationCounter evaluation_counter_; | 127 EvaluationCounter evaluation_counter_; |
| 126 ClassManager class_manager_; | 128 ClassManager class_manager_; |
| 129 ClientInfoManager client_info_manager_; |
| 127 ObjectManager object_manager_; | 130 ObjectManager object_manager_; |
| 128 Profiler profiler_; | 131 Profiler profiler_; |
| 129 bool fullscreen_; // Are we rendered fullscreen or in the plugin region? | 132 bool fullscreen_; // Are we rendered fullscreen or in the plugin region? |
| 130 Renderer *renderer_; | 133 Renderer *renderer_; |
| 131 Client *client_; | 134 Client *client_; |
| 132 Features* features_; | 135 Features* features_; |
| 133 ClientObjectMap object_map_; | 136 ClientObjectMap object_map_; |
| 134 ClientToNPClassMap client_to_np_class_map_; | 137 ClientToNPClassMap client_to_np_class_map_; |
| 135 NPToClientClassMap np_to_client_class_map_; | 138 NPToClientClassMap np_to_client_class_map_; |
| 136 NPObject *globals_npobject_; | 139 NPObject *globals_npobject_; |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 static bool fullscreen_class_registered_; | 439 static bool fullscreen_class_registered_; |
| 437 bool painted_once_; | 440 bool painted_once_; |
| 438 #endif // OS_WIN | 441 #endif // OS_WIN |
| 439 }; | 442 }; |
| 440 | 443 |
| 441 } // namespace o3d | 444 } // namespace o3d |
| 442 } // namespace glue | 445 } // namespace glue |
| 443 | 446 |
| 444 | 447 |
| 445 #endif // O3D_PLUGIN_CROSS_O3D_GLUE_H_ | 448 #endif // O3D_PLUGIN_CROSS_O3D_GLUE_H_ |
| OLD | NEW |