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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 namespace o3d { | 67 namespace o3d { |
68 #else | 68 #else |
69 extern "C" { | 69 extern "C" { |
70 #endif | 70 #endif |
71 | 71 |
72 NPError EXPORT_SYMBOL OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) { | 72 NPError EXPORT_SYMBOL OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) { |
73 CommandLine::Init(0, NULL); | 73 CommandLine::Init(0, NULL); |
74 InitLogging(kLogFile, | 74 InitLogging(kLogFile, |
75 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 75 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
76 logging::DONT_LOCK_LOG_FILE, | 76 logging::DONT_LOCK_LOG_FILE, |
77 logging::APPEND_TO_OLD_LOG_FILE); | 77 logging::APPEND_TO_OLD_LOG_FILE, |
| 78 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); |
78 | 79 |
79 NPError retval = InitializeNPNApi(browserFuncs); | 80 NPError retval = InitializeNPNApi(browserFuncs); |
80 if (retval != NPERR_NO_ERROR) return retval; | 81 if (retval != NPERR_NO_ERROR) return retval; |
81 | 82 |
82 g_browser = new gpu_plugin::NPBrowser(browserFuncs); | 83 g_browser = new gpu_plugin::NPBrowser(browserFuncs); |
83 | 84 |
84 return NPERR_NO_ERROR; | 85 return NPERR_NO_ERROR; |
85 } | 86 } |
86 | 87 |
87 NPError EXPORT_SYMBOL OSCALL NP_Shutdown(void) { | 88 NPError EXPORT_SYMBOL OSCALL NP_Shutdown(void) { |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 // TODO: Where should this really live? It's platform-specific, but in | 202 // TODO: Where should this really live? It's platform-specific, but in |
202 // PluginObject, which mainly lives in cross/o3d_glue.h+cc. | 203 // PluginObject, which mainly lives in cross/o3d_glue.h+cc. |
203 bool PluginObject::RequestFullscreenDisplay() { | 204 bool PluginObject::RequestFullscreenDisplay() { |
204 return false; | 205 return false; |
205 } | 206 } |
206 | 207 |
207 void PluginObject::CancelFullscreenDisplay() { | 208 void PluginObject::CancelFullscreenDisplay() { |
208 } | 209 } |
209 } // namespace _o3d | 210 } // namespace _o3d |
210 } // namespace glue | 211 } // namespace glue |
OLD | NEW |