Bug 803471 - Part 5b - Change OmxDecode to use GonkNativeWindowClient. r=cdouble, a=leo+

content/media/omx/OmxDecoder.cpp

@@ -19,6 +19,7 @@
 #include "prlog.h"
 
 #include "GonkNativeWindow.h"
+#include "GonkNativeWindowClient.h"
 #include "OmxDecoder.h"
 
 #ifdef PR_LOGGING
@@ -226,6 +227,7 @@ bool OmxDecoder::Init() {
   int64_t totalDurationUs = 0;
 
   mNativeWindow = new GonkNativeWindow();
+  mNativeWindowClient = new GonkNativeWindowClient(mNativeWindow);
 
   // OMXClient::connect() always returns OK and abort's fatally if
   // it can't connect.
@@ -249,7 +251,7 @@ bool OmxDecoder::Init() {
                                    videoTrack,
                                    nullptr,
                                    flags,
-                                   mNativeWindow);
+                                   mNativeWindowClient);
     if (videoSource == nullptr) {
       NS_WARNING("Couldn't create OMX video source");
       return false;

content/media/omx/OmxDecoder.h

@@ -3,6 +3,7 @@
 #include <utils/RefBase.h>
 
 #include "GonkNativeWindow.h"
+#include "GonkNativeWindowClient.h"
 #include "GonkIOSurfaceImage.h"
 #include "MPAPI.h"
 #include "MediaResource.h"
@@ -79,6 +80,7 @@ class OmxDecoder : public RefBase {
   nsBuiltinDecoder *mDecoder;
   MediaResource *mResource;
   sp<GonkNativeWindow> mNativeWindow;
+  sp<GonkNativeWindowClient> mNativeWindowClient;
   sp<MediaSource> mVideoTrack;
   sp<MediaSource> mVideoSource;
   sp<MediaSource> mAudioTrack;