Backed out changeset 49be7aaa199c (bug 1449736) for mochitest failure at layout/generic/test/test_plugin_focus.html on a CLOSED TREE
authorDaniel Varga <dvarga@mozilla.com>
Thu, 10 Jan 2019 22:56:40 +0200
changeset 510440 75be9882c2aea62baa2c00dd0d2ba15532300fc6
parent 510439 8d953c25fdef67aac8b006988f072a1594516938
child 510441 d39ee6115c27dac09267acfbcdc0bf6782913f3a
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1449736
milestone66.0a1
backs out49be7aaa199c0be85ec2667c650d4627cfec84c1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 49be7aaa199c (bug 1449736) for mochitest failure at layout/generic/test/test_plugin_focus.html on a CLOSED TREE
dom/plugins/ipc/PluginInstanceChild.cpp
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -263,38 +263,38 @@ NPError PluginInstanceChild::DoNPP_New()
 
 int PluginInstanceChild::GetQuirks() {
   return PluginModuleChild::GetChrome()->GetQuirks();
 }
 
 NPError PluginInstanceChild::InternalGetNPObjectForValue(NPNVariable aValue,
                                                          NPObject** aObject) {
   PluginScriptableObjectChild* actor = nullptr;
-  NPError result = NPERR_GENERIC_ERROR;
+  NPError result = NPERR_NO_ERROR;
 
   switch (aValue) {
     case NPNVWindowNPObject:
       if (!(actor = mCachedWindowActor)) {
         PPluginScriptableObjectChild* actorProtocol;
-        if (CallNPN_GetValue_NPNVWindowNPObject(&actorProtocol, &result) &&
-            (result == NPERR_NO_ERROR)) {
+        CallNPN_GetValue_NPNVWindowNPObject(&actorProtocol, &result);
+        if (result == NPERR_NO_ERROR) {
           actor = mCachedWindowActor =
               static_cast<PluginScriptableObjectChild*>(actorProtocol);
           NS_ASSERTION(actor, "Null actor!");
           PluginModuleChild::sBrowserFuncs.retainobject(
               actor->GetObject(false));
         }
       }
       break;
 
     case NPNVPluginElementNPObject:
       if (!(actor = mCachedElementActor)) {
         PPluginScriptableObjectChild* actorProtocol;
-        if (CallNPN_GetValue_NPNVPluginElementNPObject(&actorProtocol, &result) &&
-            (result == NPERR_NO_ERROR)) {
+        CallNPN_GetValue_NPNVPluginElementNPObject(&actorProtocol, &result);
+        if (result == NPERR_NO_ERROR) {
           actor = mCachedElementActor =
               static_cast<PluginScriptableObjectChild*>(actorProtocol);
           NS_ASSERTION(actor, "Null actor!");
           PluginModuleChild::sBrowserFuncs.retainobject(
               actor->GetObject(false));
         }
       }
       break;