/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 15 10:38:40 PDT 2010
changeset 9bcb3b430941 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9bcb3b430941
author: Omair Majid <omajid at redhat.com>
date: Mon Jun 14 14:55:08 2010 -0400
PR icedtea/480: (NPPlugin with NoScript extension).
2010-06-14 Omair Majid <omajid at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI
call instead of evaluate, to get page URL.
changeset 4b85fc5edffb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b85fc5edffb
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 15 17:09:31 2010 +0100
PR icedtea/488: Question mark changing into underscore in URL.
2010-06-14 Omair Majid <omajid at redhat.com>
PR icedtea/488
* plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to
incorrect assumption that 'A' > 'a'.
changeset c4a1546cbcbd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c4a1546cbcbd
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jun 14 15:03:55 2010 -0400
Fix bug causing 100% CPU usage (rhbz# 592553).
2010-06-14 Deepak Bhole <dbhole at redhat.com>
*
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug
causing 100% CPU usage (rhbz# 592553).
changeset 4fed9f38e501 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4fed9f38e501
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 15 18:34:45 2010 +0100
Don't generate a random pointer from a pthread_t in the debug
output.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
Don't print out the return value of pthread_self
which is a pthread_t. pthread_t is an opaque type and we
don't know what it actually is (it varies from system to
system; recent versions of Linux use an unsigned long int).
* plugin/icedteanp/IcedTeaPluginUtils.h:
(PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t.
(PLUGIN_DEBUG_1ARG(str,arg1)): Likewise.
(PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise.
(PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise.
(PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise.
(PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise.
diffstat:
5 files changed, 58 insertions(+), 28 deletions(-)
ChangeLog | 32 ++++++++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 30 ++++-----
plugin/icedteanp/IcedTeaPluginUtils.h | 16 ++---
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 -
plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 -
diffs (200 lines):
diff -r 09f5a7f1fb25 -r 4fed9f38e501 ChangeLog
--- a/ChangeLog Tue Jun 15 18:21:49 2010 +0100
+++ b/ChangeLog Tue Jun 15 18:34:45 2010 +0100
@@ -1,3 +1,35 @@ 2010-06-15 Andrew John Hughes <ahughes
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ Don't print out the return value of pthread_self
+ which is a pthread_t. pthread_t is an opaque type
+ and we don't know what it actually is (it varies
+ from system to system; recent versions of Linux
+ use an unsigned long int).
+ * plugin/icedteanp/IcedTeaPluginUtils.h:
+ (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t.
+ (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise.
+ (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise.
+ (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise.
+ (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise.
+ (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise.
+
+2010-06-14 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug
+ causing 100% CPU usage (rhbz# 592553).
+
+2010-06-14 Omair Majid <omajid at redhat.com>
+
+ PR icedtea/488
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to
+ incorrect assumption that 'A' > 'a'.
+
+2010-06-14 Omair Majid <omajid at redhat.com>
+
+ PR icedtea/480
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead
+ of evaluate, to get page URL.
+
2010-06-15 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jun 15 18:21:49 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jun 15 18:34:45 2010 +0100
@@ -1021,30 +1021,26 @@ plugin_get_documentbase (NPP instance)
// Additionally, since it is insecure, we cannot use it for making
// security decisions.
NPObject* window;
- NPString script = NPString();
- std::string script_str = std::string();
- NPVariant* location = new NPVariant();
- std::string location_str = std::string();
+ browser_functions.getvalue(instance, NPNVWindowNPObject, &window);
- browser_functions.getvalue(instance, NPNVWindowNPObject, &window);
- script_str += "window.location.href";
-#if MOZILLA_VERSION_COLLAPSED < 1090200
- script.utf8characters = script_str.c_str();
- script.utf8length = script_str.size();
-#else
- script.UTF8Characters = script_str.c_str();
- script.UTF8Length = script_str.size();
-#endif
- browser_functions.evaluate(instance, window, &script, location);
+ NPVariant location;
+ NPIdentifier location_id = browser_functions.getstringidentifier("location");
+ browser_functions.getproperty(instance, window, location_id, &location);
+
+ NPVariant href;
+ NPIdentifier href_id = browser_functions.getstringidentifier("href");
+ browser_functions.getproperty(instance, NPVARIANT_TO_OBJECT(location),
+ href_id, &href);
// Strip everything after the last "/"
#if MOZILLA_VERSION_COLLAPSED < 1090200
- gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).utf8characters, "/", -1);
+ gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1);
#else
- gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).UTF8Characters, "/", -1);
+ gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1);
#endif
guint parts_sz = g_strv_length (parts);
+ std::string location_str;
for (int i=0; i < parts_sz - 1; i++)
{
location_str += parts[i];
@@ -1054,6 +1050,8 @@ plugin_get_documentbase (NPP instance)
documentbase_copy = g_strdup (location_str.c_str());
// Release references.
+ browser_functions.releasevariantvalue(&href);
+ browser_functions.releasevariantvalue(&location);
cleanup_done:
PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n");
PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy);
diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:21:49 2010 +0100
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:34:45 2010 +0100
@@ -71,7 +71,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str); \
} \
} while (0)
@@ -81,7 +81,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str, arg1); \
} \
} while (0)
@@ -91,7 +91,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str, arg1, arg2); \
} \
} while (0)
@@ -101,7 +101,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str, arg1, arg2, arg3); \
} \
} while (0)
@@ -111,7 +111,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str, arg1, arg2, arg3, arg4); \
} \
} while (0)
@@ -121,7 +121,7 @@ exception statement from your version. *
{ \
if (plugin_debug) \
{ \
- fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \
+ fprintf(stderr, "ICEDTEA NP PLUGIN: "); \
fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5); \
} \
} while (0)
@@ -137,8 +137,8 @@ exception statement from your version. *
}
#define HEX_TO_INT(c) \
- ((*c >= 'A') ? *c - 'A' + 10 : \
- (*c >= 'a') ? *c - 'a' + 10 : \
+ ((*c >= 'a') ? *c - 'a' + 10 : \
+ (*c >= 'A') ? *c - 'A' + 10 : \
*c - '0')
#define IS_VALID_HEX(c) \
diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java
--- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Jun 15 18:21:49 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Jun 15 18:34:45 2010 +0100
@@ -164,11 +164,11 @@ class PluginMessageConsumer {
registerPriorityWait("instance " + instanceNum + " handle");
registerPriorityWait("instance " + instanceNum + " width");
- } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) {
+ } else if (msgParts[2].equals("handle")) {
Integer instanceNum = new Integer(msgParts[1]);
// If this instance is not in init, return false immediately.
- // Handle/Width messages should NEVER go before tag messages
+ // Handle messages should NEVER go before tag messages
if (!isInInit(instanceNum))
return false;
}
diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java
--- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Jun 15 18:21:49 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Jun 15 18:34:45 2010 +0100
@@ -72,7 +72,7 @@ class PluginMessageHandlerWorker extends
if (message != null) {
- PluginDebug.debug("Consumer thread " + id + " consuming " + message);
+ PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message);
// ideally, whoever returns things object should mark it
// busy first, but just in case..
@@ -90,7 +90,7 @@ class PluginMessageHandlerWorker extends
this.message = null;
- PluginDebug.debug("Consumption completed by consumer thread " + id);
+ PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id);
// mark ourselves free again
free();
More information about the distro-pkg-dev
mailing list