changeset in /hg/icedtea6: - misc. minor fixes and cleanup
Deepak Bhole
dbhole at redhat.com
Fri Oct 17 01:03:10 PDT 2008
changeset add7ca8b2072 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=add7ca8b2072
description:
- misc. minor fixes and cleanup
diffstat:
4 files changed, 18 insertions(+), 77 deletions(-)
IcedTeaPlugin.cc | 68 ---------------------
configure.ac | 4 -
plugin/icedtea/sun/applet/PluginAppletViewer.java | 16 ++--
rt/net/sourceforge/jnlp/NetxPanel.java | 7 +-
diffs (190 lines):
diff -r 2262032cc2ae -r add7ca8b2072 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Thu Oct 16 23:37:17 2008 -0400
+++ b/IcedTeaPlugin.cc Fri Oct 17 01:22:45 2008 -0400
@@ -389,15 +389,12 @@ char const* TYPES[10] = { "Object",
ResultContainer *resultC = new ResultContainer(); \
factory->result_map.Put(reference, resultC); \
PLUGIN_DEBUG_3ARG ("ResultMap %p created for reference %d found = %d\n", resultC, reference, factory->result_map.Get(reference, NULL)); \
- ResultContainer *searched; \
- factory->result_map.Get(reference, &searched); \
- PLUGIN_DEBUG_1ARG ("Searched returned %d\n", searched->returnIdentifier); \
} \
else \
{ \
ResultContainer *resultC; \
- factory->result_map.Get(reference, &resultC); \
- resultC->Clear(); \
+ factory->result_map.Get(reference, &resultC); \
+ resultC->Clear(); \
}
#define MESSAGE_ADD_SRC(src) \
@@ -929,8 +926,6 @@ public:
// FIXME: make private?
JNIEnv* proxyEnv;
nsISecureEnv* secureEnv;
-
- // FIXME: Use something portable here
nsDataHashtable<nsUint32HashKey,ResultContainer*> result_map;
void GetMember ();
@@ -1420,65 +1415,6 @@ GetURLRunnable::Run ()
return owner->GetURL ((const char*) url, (const char*) target,
nsnull, 0, nsnull, 0);
-}
-
-
-class IcedTeaSecurityContext : public nsISecurityContext
-{
-
- NS_DECL_ISUPPORTS
-
-public:
-
- IcedTeaSecurityContext();
-
- NS_IMETHOD Implies(const char* target, const char* action, PRBool *bAllowedAccess);
-
- NS_IMETHOD GetOrigin(char* buf, int len);
-
- NS_IMETHOD GetCertificateID(char* buf, int len);
-
- ~IcedTeaSecurityContext(void);
-
-private:
- PRBool universalJavaCapabilityEnabled;
- PRBool universalBrowserReadCapabilityEnabled;
-};
-
-NS_IMPL_ISUPPORTS1 (IcedTeaSecurityContext, nsISecurityContext)
-
-IcedTeaSecurityContext::IcedTeaSecurityContext ()
-: universalJavaCapabilityEnabled(PR_FALSE),
- universalBrowserReadCapabilityEnabled(PR_FALSE)
-{
- // nothing to do
-}
-
-IcedTeaSecurityContext::~IcedTeaSecurityContext ()
-{
-}
-
-NS_METHOD
-IcedTeaSecurityContext::Implies(const char* target, const char* action, PRBool *bAllowedAccess)
-{
- PLUGIN_DEBUG_2ARG ("%s implies %s ?\n", target, action);
- *bAllowedAccess = PR_TRUE;
- return NS_OK;
-}
-
-NS_METHOD
-IcedTeaSecurityContext::GetOrigin(char* buf, int len)
-{
- PLUGIN_DEBUG_0ARG ("Origin requested\n");
- strncpy(buf, "http://www.redhat.com", len);
- return NS_OK;
-}
-
-NS_METHOD
-IcedTeaSecurityContext::GetCertificateID(char* buf, int len)
-{
- PLUGIN_DEBUG_0ARG ("CertificateID requested\n");
- return NS_OK;
}
NS_IMPL_ISUPPORTS6 (IcedTeaPluginFactory, nsIFactory, nsIPlugin, nsIJVMManager,
diff -r 2262032cc2ae -r add7ca8b2072 configure.ac
--- a/configure.ac Thu Oct 16 23:37:17 2008 -0400
+++ b/configure.ac Fri Oct 17 01:22:45 2008 -0400
@@ -384,13 +384,13 @@ fi
dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
-if test "x${enable_liveconnect}" = "xyes"
+if test "x${enable_plugin}" = "xyes"
then
PKG_CHECK_MODULES(XULRUNNER, \
nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
PKG_CHECK_MODULES(GTK, gtk+-2.0)
else
- if test "x${enable_plugin}" = "xyes"
+ if test "x${enable_gcjwebplugin}" = "xyes"
then
PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, \
[MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
diff -r 2262032cc2ae -r add7ca8b2072 plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Thu Oct 16 23:37:17 2008 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Fri Oct 17 01:22:45 2008 -0400
@@ -1413,20 +1413,20 @@ import sun.misc.Ref;
}
if (atts.get("width") == null) {
- atts.put("width", "1");
+ atts.put("width", "100");
atts.put("widthPercentage", 100);
} else if (((String) atts.get("width")).endsWith("%")) {
String w = (String) atts.get("width");
- atts.put("width", "1");
+ atts.put("width", "100");
atts.put("widthPercentage", Integer.parseInt((w.substring(0, w.length() -1))));
}
if (atts.get("height") == null) {
- atts.put("height", "1");
+ atts.put("height", "100");
atts.put("heightPercentage", 100);
} else if (((String) atts.get("height")).endsWith("%")) {
String h = (String) atts.get("height");
- atts.put("height", "1");
+ atts.put("height", "100");
atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1)));
}
}
@@ -1449,7 +1449,7 @@ import sun.misc.Ref;
}
if (atts.get("width") == null) {
- atts.put("width", "1");
+ atts.put("width", "100");
atts.put("widthPercentage", 100);
} else if (((String) atts.get("width")).endsWith("%")) {
String w = (String) atts.get("width");
@@ -1462,7 +1462,7 @@ import sun.misc.Ref;
atts.put("heightPercentage", 100);
} else if (((String) atts.get("height")).endsWith("%")) {
String h = (String) atts.get("height");
- atts.put("height", "1");
+ atts.put("height", "100");
atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1)));
}
}
@@ -1483,11 +1483,11 @@ import sun.misc.Ref;
}
if (atts.get("width") == null) {
- atts.put("width", "1");
+ atts.put("width", "100");
atts.put("widthPercentage", 100);
} else if (((String) atts.get("width")).endsWith("%")) {
String w = (String) atts.get("width");
- atts.put("width", "1");
+ atts.put("width", "100");
atts.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1)));
}
diff -r 2262032cc2ae -r add7ca8b2072 rt/net/sourceforge/jnlp/NetxPanel.java
--- a/rt/net/sourceforge/jnlp/NetxPanel.java Thu Oct 16 23:37:17 2008 -0400
+++ b/rt/net/sourceforge/jnlp/NetxPanel.java Fri Oct 17 01:22:45 2008 -0400
@@ -114,5 +114,10 @@ public class NetxPanel extends AppletVie
handler = new Thread(this);
handler.start();
}
+
+ public void updateSizeInAtts(int height, int width) {
+ this.atts.put("height", Integer.toString(height));
+ this.atts.put("width", Integer.toString(width));
+ }
+}
-}
More information about the distro-pkg-dev
mailing list