commit 3311d474a6353a5855c8719ab568a0cc7d20b7d0
author Jamie Madill <jmadill@chromium.org> Mon Jan 02 17:55:02 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Jan 03 14:11:04 2017 +0000
tree b80104e22fc335f0c53f2b591ed4198d71755c41
parent 1754ba0df88d747900bd59456c888c2e7461312c

Display: Add a shared state object.

This will allow us to manage the SurfaceSet in the GL layer.

BUG=angleproject:1684

Change-Id: Iab8243157710beab2667ef10275571078ce9ae8e
Reviewed-on: https://chromium-review.googlesource.com/424228
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/DisplayImpl.cpp

diff --git a/src/libANGLE/renderer/DisplayImpl.cpp b/src/libANGLE/renderer/DisplayImpl.cpp
index fc2f2c5..dccf1cd 100644
--- a/src/libANGLE/renderer/DisplayImpl.cpp
+++ b/src/libANGLE/renderer/DisplayImpl.cpp
@@ -8,26 +8,20 @@
 
 #include "libANGLE/renderer/DisplayImpl.h"
 
+#include "libANGLE/Display.h"
 #include "libANGLE/Surface.h"
 
 namespace rx
 {
 
-DisplayImpl::DisplayImpl()
-    : mExtensionsInitialized(false),
-      mCapsInitialized(false)
+DisplayImpl::DisplayImpl(const egl::DisplayState &state)
+    : mState(state), mExtensionsInitialized(false), mCapsInitialized(false)
 {
 }
 
 DisplayImpl::~DisplayImpl()
 {
-    ASSERT(mSurfaceSet.empty());
-}
-
-void DisplayImpl::destroySurface(egl::Surface *surface)
-{
-    mSurfaceSet.erase(surface);
-    surface->onDestroy();
+    ASSERT(mState.surfaceSet.empty());
 }
 
 const egl::DisplayExtensions &DisplayImpl::getExtensions() const