Bug 1041261, part 2 - Changes to dom/plugins for symbol jsids. r=jst.

--HG--
extra : rebase_source : 4bcf6e59efcdecdb1d490c8a4c782b43ad70c7eb

dom/plugins/base/nsJSNPRuntime.cpp

@@ -1538,6 +1538,9 @@ static bool
 NPObjWrapper_NewResolve(JSContext *cx, JS::Handle<JSObject*> obj, JS::Handle<jsid> id,
                         JS::MutableHandle<JSObject*> objp)
 {
+  if (JSID_IS_SYMBOL(id))
+    return true;
+
   NPObject *npobj = GetNPObject(cx, obj);
 
   if (!npobj || !npobj->_class || !npobj->_class->hasProperty ||

dom/plugins/ipc/PluginIdentifierParent.cpp

@@ -31,7 +31,7 @@ PluginIdentifierParent::RecvRetain()
   // Intern the jsid if necessary.
   AutoSafeJSContext cx;
   JS::Rooted<jsid> id(cx, NPIdentifierToJSId(mIdentifier));
-  if (JSID_IS_INT(id)) {
+  if (!JSID_IS_STRING(id)) {
     return true;
   }