equal
deleted
inserted
replaced
111 { |
111 { |
112 m_fileName = pathGetFileName(m_path); |
112 m_fileName = pathGetFileName(m_path); |
113 m_parentDirectory = m_path.left(m_path.length() - m_fileName.length() - 1); |
113 m_parentDirectory = m_path.left(m_path.length() - m_fileName.length() - 1); |
114 } |
114 } |
115 |
115 |
116 #if !PLATFORM(SYMBIAN) |
116 #if !OS(SYMBIAN) |
117 void PluginPackage::unload() |
117 void PluginPackage::unload() |
118 { |
118 { |
119 if (!m_isLoaded) |
119 if (!m_isLoaded) |
120 return; |
120 return; |
121 |
121 |
124 |
124 |
125 m_NPP_Shutdown(); |
125 m_NPP_Shutdown(); |
126 |
126 |
127 unloadWithoutShutdown(); |
127 unloadWithoutShutdown(); |
128 } |
128 } |
129 #endif //!PLATFORM(SYMBIAN) |
129 #endif // !OS(SYMBIAN) |
130 |
130 |
131 void PluginPackage::unloadWithoutShutdown() |
131 void PluginPackage::unloadWithoutShutdown() |
132 { |
132 { |
133 if (!m_isLoaded) |
133 if (!m_isLoaded) |
134 return; |
134 return; |
196 m_quirks.add(PluginQuirkFlashURLNotifyBug); |
196 m_quirks.add(PluginQuirkFlashURLNotifyBug); |
197 } |
197 } |
198 } |
198 } |
199 #endif |
199 #endif |
200 |
200 |
201 #if !PLATFORM(WIN_OS) |
201 #if !OS(WINDOWS) |
202 void PluginPackage::determineModuleVersionFromDescription() |
202 void PluginPackage::determineModuleVersionFromDescription() |
203 { |
203 { |
204 // It's a bit lame to detect the plugin version by parsing it |
204 // It's a bit lame to detect the plugin version by parsing it |
205 // from the plugin description string, but it doesn't seem that |
205 // from the plugin description string, but it doesn't seem that |
206 // version information is available in any standardized way at |
206 // version information is available in any standardized way at |
251 #if ENABLE(NETSCAPE_PLUGIN_API) |
251 #if ENABLE(NETSCAPE_PLUGIN_API) |
252 void PluginPackage::initializeBrowserFuncs() |
252 void PluginPackage::initializeBrowserFuncs() |
253 { |
253 { |
254 memset(&m_browserFuncs, 0, sizeof(m_browserFuncs)); |
254 memset(&m_browserFuncs, 0, sizeof(m_browserFuncs)); |
255 m_browserFuncs.size = sizeof(m_browserFuncs); |
255 m_browserFuncs.size = sizeof(m_browserFuncs); |
256 m_browserFuncs.version = NP_VERSION_MINOR; |
256 m_browserFuncs.version = NPVersion(); |
257 |
257 |
258 m_browserFuncs.geturl = NPN_GetURL; |
258 m_browserFuncs.geturl = NPN_GetURL; |
259 m_browserFuncs.posturl = NPN_PostURL; |
259 m_browserFuncs.posturl = NPN_PostURL; |
260 m_browserFuncs.requestread = NPN_RequestRead; |
260 m_browserFuncs.requestread = NPN_RequestRead; |
261 m_browserFuncs.newstream = NPN_NewStream; |
261 m_browserFuncs.newstream = NPN_NewStream; |
324 int PluginPackage::compareFileVersion(const PlatformModuleVersion& compareVersion) const |
324 int PluginPackage::compareFileVersion(const PlatformModuleVersion& compareVersion) const |
325 { |
325 { |
326 // return -1, 0, or 1 if plug-in version is less than, equal to, or greater than |
326 // return -1, 0, or 1 if plug-in version is less than, equal to, or greater than |
327 // the passed version |
327 // the passed version |
328 |
328 |
329 #if PLATFORM(WIN_OS) |
329 #if OS(WINDOWS) |
330 if (m_moduleVersion.mostSig != compareVersion.mostSig) |
330 if (m_moduleVersion.mostSig != compareVersion.mostSig) |
331 return m_moduleVersion.mostSig > compareVersion.mostSig ? 1 : -1; |
331 return m_moduleVersion.mostSig > compareVersion.mostSig ? 1 : -1; |
332 if (m_moduleVersion.leastSig != compareVersion.leastSig) |
332 if (m_moduleVersion.leastSig != compareVersion.leastSig) |
333 return m_moduleVersion.leastSig > compareVersion.leastSig ? 1 : -1; |
333 return m_moduleVersion.leastSig > compareVersion.leastSig ? 1 : -1; |
334 #else |
334 #else |