Move getSwapBehavior call to be after SurfaceImpl initialize

Otherwise, end2end tests crash on Nexus 5X, since the underlying EGL surface doesn't exist at the time of getSwapBehavior call. BUG=angleproject:1362 TEST=angle_end2end_tests on Nexus 5X Change-Id: I550e46ee82592b9d1ea49a3c968d7ffad3ab06f7 Reviewed-on: https://chromium-review.googlesource.com/349430Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Move getSwapBehavior call to be after SurfaceImpl initialize
ae0c126a · Yuly Novikov · Commit Bot · 7c5d2364 · ae0c126a
Commit ae0c126a authored Jun 02, 2016 by Yuly Novikov Committed by Commit Bot Jun 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Surface.cpp src/libANGLE/Surface.cpp +3 -2

No files found.
--- a/src/libANGLE/Surface.cpp
+++ b/src/libANGLE/Surface.cpp
@@ -86,11 +86,12 @@ Surface::~Surface()

 Error Surface::initialize()
 {
+    ANGLE_TRY(mImplementation->initialize());
+
    // Initialized here since impl is nullptr in the constructor.
+    // Must happen after implementation initialize for Android.
    mSwapBehavior = mImplementation->getSwapBehavior();

-    ANGLE_TRY(mImplementation->initialize());
-
    // Must happen after implementation initialize for OSX.
    mState.defaultFramebuffer = createDefaultFramebuffer();
    ASSERT(mState.defaultFramebuffer != nullptr);