fbd0e42fb9
make a final pass to make sure we are not leaking memory. After that, I want to clean up the build system, and the samples. M build.xml - Call make export in mozilla directory - Fix clean target M mozilla/Makefile.in - Added export target M classes/org/mozilla/pluglet/PlugletLoader.java - avoid ambiguity by casting + CodeSource codesource = new CodeSource(url,(java.security.cert.Certificate []) null); M examples/MediaPlayer/JMPlayer.java - remove debug printfs M mozilla/npAPInsIInputStreamShim.cpp M mozilla/npAPInsIInputStreamShim.h - remove debug printfs - fix buffer allocation, refactor into its own method. - Use NPN_Mem* methods for memory allocation. - isolate lock access to private methods. Avoids locking when we already own the lock, which would cause an assertion. M mozilla/nppluglet.cpp - in dtor, check for null mScriptablePeer ivar before accessing it. M mozilla/nsScriptablePeer.cpp - whitespace M src/Pluglet.cpp - get the plugletEngine from do_GetService(). M src/PlugletEngine.cpp M src/PlugletFactory.cpp M src/PlugletLoader.cpp - remove debug printfs M test/test.java - added test finalize. build.xml classes/org/mozilla/pluglet/PlugletLoader.java examples/MediaPlayer/JMPlayer.java mozilla/Makefile.in mozilla/npAPInsIInputStreamShim.cpp mozilla/npAPInsIInputStreamShim.h mozilla/nppluglet.cpp mozilla/nsScriptablePeer.cpp src/Pluglet.cpp src/PlugletEngine.cpp src/PlugletFactory.cpp src/PlugletLoader.cpp test/test.java git-svn-id: svn://10.0.0.236/trunk@214609 18797224-902f-48f8-a5cc-f745e15eee43
135 lines
4.0 KiB
C++
135 lines
4.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* ***** BEGIN LICENSE BLOCK *****
|
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public License Version
|
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
* the License. You may obtain a copy of the License at
|
|
* http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
* for the specific language governing rights and limitations under the
|
|
* License.
|
|
*
|
|
* The Original Code is mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is
|
|
* Netscape Communications Corporation.
|
|
* Portions created by the Initial Developer are Copyright (C) 1998
|
|
* the Initial Developer. All Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
*
|
|
* Alternatively, the contents of this file may be used under the terms of
|
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
* of those above. If you wish to allow use of your version of this file only
|
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
* use your version of this file under the terms of the MPL, indicate your
|
|
* decision by deleting the provisions above and replace them with the notice
|
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
* the provisions above, a recipient may use your version of this file under
|
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
*
|
|
* ***** END LICENSE BLOCK ***** */
|
|
|
|
// ==============================
|
|
// ! Scriptability related code !
|
|
// ==============================
|
|
|
|
/////////////////////////////////////////////////////
|
|
//
|
|
// This file implements the nsScriptablePeer object
|
|
// The native methods of this class are supposed to
|
|
// be callable from JavaScript
|
|
//
|
|
#include "nppluglet.h"
|
|
|
|
static NS_DEFINE_IID(kISimplePluginIID, NS_ISIMPLEPLUGIN_IID);
|
|
static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
|
|
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
|
|
|
nsScriptablePeer::nsScriptablePeer(nsPluginInstance* aPlugin)
|
|
{
|
|
mPlugin = aPlugin;
|
|
mRefCnt = 0;
|
|
}
|
|
|
|
nsScriptablePeer::~nsScriptablePeer()
|
|
{
|
|
}
|
|
|
|
// AddRef, Release and QueryInterface are common methods and must
|
|
// be implemented for any interface
|
|
NS_IMETHODIMP_(nsrefcnt) nsScriptablePeer::AddRef()
|
|
{
|
|
++mRefCnt;
|
|
return mRefCnt;
|
|
}
|
|
|
|
NS_IMETHODIMP_(nsrefcnt) nsScriptablePeer::Release()
|
|
{
|
|
--mRefCnt;
|
|
if (mRefCnt == 0) {
|
|
delete this;
|
|
return 0;
|
|
}
|
|
return mRefCnt;
|
|
}
|
|
|
|
// here nsScriptablePeer should return three interfaces it can be asked for by their iid's
|
|
// static casts are necessary to ensure that correct pointer is returned
|
|
NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
|
{
|
|
if(!aInstancePtr)
|
|
return NS_ERROR_NULL_POINTER;
|
|
|
|
if(aIID.Equals(kISimplePluginIID)) {
|
|
*aInstancePtr = NS_STATIC_CAST(nsISimplePlugin*, this);
|
|
AddRef();
|
|
return NS_OK;
|
|
}
|
|
|
|
if(aIID.Equals(kIClassInfoIID)) {
|
|
*aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
|
|
AddRef();
|
|
return NS_OK;
|
|
}
|
|
|
|
if(aIID.Equals(kISupportsIID)) {
|
|
*aInstancePtr = NS_STATIC_CAST(nsISupports*,(NS_STATIC_CAST(nsISimplePlugin*, this)));
|
|
AddRef();
|
|
return NS_OK;
|
|
}
|
|
|
|
return NS_NOINTERFACE;
|
|
}
|
|
|
|
void nsScriptablePeer::SetInstance(nsPluginInstance* plugin)
|
|
{
|
|
mPlugin = plugin;
|
|
}
|
|
|
|
//
|
|
// the following method will be callable from JavaScript
|
|
//
|
|
//NS_IMETHODIMP nsScriptablePeer::GetVersion(char * *aVersion)
|
|
//{
|
|
// if (mPlugin)
|
|
// mPlugin->getVersion(aVersion);
|
|
// return NS_OK;
|
|
//}
|
|
|
|
NS_IMETHODIMP nsScriptablePeer::HasPlugletForMimeType(const char *aMimeType, PRBool *isSupported)
|
|
{
|
|
nsresult rv = NS_ERROR_FAILURE;
|
|
if (mPlugin) {
|
|
rv = mPlugin->HasPlugletForMimeType(aMimeType, isSupported);
|
|
}
|
|
return rv;
|
|
|
|
}
|
|
|