//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//

#include "libEGL/AttributeMap.h"

namespace egl
{

AttributeMap::AttributeMap()
{
}

AttributeMap::AttributeMap(const EGLint *attributes)
{
    for (const EGLint *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib += 2)
    {
        insert(curAttrib[0], curAttrib[1]);
    }
}

void AttributeMap::insert(EGLint key, EGLint value)
{
    mAttributes[key] = value;
}

bool AttributeMap::contains(EGLint key) const
{
    return (mAttributes.find(key) != mAttributes.end());
}

EGLint AttributeMap::get(EGLint key, EGLint defaultValue) const
{
    std::map<EGLint, EGLint>::const_iterator iter = mAttributes.find(key);
    return (mAttributes.find(key) != mAttributes.end()) ? iter->second : defaultValue;
}

}

//
// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//

#include "libEGL/AttributeMap.h"

namespace egl
{

AttributeMap::AttributeMap()
{
}

AttributeMap::AttributeMap(const EGLint *attributes)
{
    for (const EGLint *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib++)
    {
        insert(curAttrib[0], curAttrib[1]);
    }
}

void AttributeMap::insert(EGLint key, EGLint value)
{
    mAttributes[key] = value;
}

bool AttributeMap::contains(EGLint key) const
{
    return (mAttributes.find(key) != mAttributes.end());
}

EGLint AttributeMap::get(EGLint key, EGLint defaultValue) const
{
    std::map<EGLint, EGLint>::const_iterator iter = mAttributes.find(key);
    return (mAttributes.find(key) != mAttributes.end()) ? iter->second : defaultValue;
}

}

--- 
+++ 
@@ -15,7 +15,7 @@
 
 AttributeMap::AttributeMap(const EGLint *attributes)
 {
-    for (const EGLint *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib++)
+    for (const EGLint *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib += 2)
     {
         insert(curAttrib[0], curAttrib[1]);
     }
Fix an incorrect iteration over EGL attributes.

BUG=angle:490

Change-Id: If7a86ee0a5226f2b45e26bbadf4a84f8f605d1c2
Reviewed-on: https://chromium-review.googlesource.com/227231
Reviewed-by: Jamie Madill <7e492b4f1c8458024932de3ba475cbf015424c30@chromium.org>
Tested-by: Geoff Lang <b6fc25fe0362055230985c05cbfa8adb741ccc0f@chromium.org>
