Move native window check to the DisplayImpl.

src/libANGLE/Display.cpp

@@ -673,6 +673,11 @@ const char *Display::getExtensionString(egl::Display *display)
     }
 }
 
+bool Display::isValidNativeWindow(EGLNativeWindowType window) const
+{
+    return mImplementation->isValidNativeWindow(window);
+}
+
 bool Display::supportsPlatformD3D()
 {
 #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)

src/libANGLE/Display.h

@@ -63,6 +63,7 @@ class Display
     bool isValidContext(gl::Context *context);
     bool isValidSurface(egl::Surface *surface);
     bool hasExistingWindowSurface(EGLNativeWindowType window);
+    bool isValidNativeWindow(EGLNativeWindowType window) const;
 
     rx::Renderer *getRenderer() { return mRenderer; };
 

src/libANGLE/renderer/DisplayImpl.h

@@ -39,6 +39,8 @@ class DisplayImpl
                                                 EGLenum textureFormat, EGLenum textureTarget) = 0;
     virtual egl::Error restoreLostDevice() = 0;
 
+    virtual bool isValidNativeWindow(EGLNativeWindowType window) const = 0;
+
     typedef std::set<egl::Surface*> SurfaceSet;
     const SurfaceSet &getSurfaceSet() const { return mSurfaceSet; }
     SurfaceSet &getSurfaceSet() { return mSurfaceSet; }

src/libANGLE/renderer/d3d/DisplayD3D.cpp

@@ -65,4 +65,9 @@ egl::Error DisplayD3D::restoreLostDevice()
     return egl::Error(EGL_SUCCESS);
 }
 
+bool DisplayD3D::isValidNativeWindow(EGLNativeWindowType window) const
+{
+    return (IsWindow(window) == TRUE);
+}
+
 }

src/libANGLE/renderer/d3d/DisplayD3D.h

@@ -27,6 +27,8 @@ class DisplayD3D : public DisplayImpl
                                         EGLenum textureFormat, EGLenum textureTarget) override;
     egl::Error restoreLostDevice() override;
 
+    bool isValidNativeWindow(EGLNativeWindowType window) const override;
+
   private:
     DISALLOW_COPY_AND_ASSIGN(DisplayD3D);
 

src/libANGLE/renderer/d3d/d3d11/NativeWindow.h

@@ -70,7 +70,6 @@ class NativeWindow
 
 };
 
-bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
 }
 
 #endif // LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_

src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp

@@ -12,10 +12,6 @@
 
 namespace rx
 {
-bool IsValidEGLNativeWindowType(EGLNativeWindowType window)
-{
-    return (IsWindow(window) == TRUE);
-}
 
 NativeWindow::NativeWindow(EGLNativeWindowType window) : mWindow(window)
 {

src/libEGL/libEGL.cpp

@@ -16,7 +16,6 @@
 #include "libANGLE/Display.h"
 #include "libANGLE/Texture.h"
 #include "libANGLE/Surface.h"
-#include "libANGLE/renderer/SwapChain.h"
 
 #include "common/debug.h"
 #include "common/version.h"
@@ -410,7 +409,7 @@ EGLSurface __stdcall eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EG
         return EGL_NO_SURFACE;
     }
 
-    if (!rx::IsValidEGLNativeWindowType(win))
+    if (!display->isValidNativeWindow(win))
     {
         recordError(egl::Error(EGL_BAD_NATIVE_WINDOW));
         return EGL_NO_SURFACE;