Merge m-c to inbound a=merge

MozReview-Commit-ID: BemR756HJnR
2017-02-15 16:33:03 -08:00
parent 32aa0d6eed b91739bde1
commit 0e7757aeda
318 changed files with 28790 additions and 23532 deletions
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -1104,10 +1104,9 @@ _getvalue(NPP aNPP,
        case NPNVxDisplay: {
            if (aNPP) {
                return InstCast(aNPP)->NPN_GetValue(aVariable, aValue);
-            } 
-            else {
-                *(void **)aValue = xt_client_get_display();
-            }          
+            }
+            *(void
+              **)aValue = xt_client_get_display();
            return NPERR_NO_ERROR;
        }
        case NPNVxtAppContext: