Revert r2250 from chrome_m27 branch

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 2250
+#define BUILD_REVISION 2042
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Context.cpp

 //
-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2012 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.
 //
@@ -2436,45 +2436,46 @@ void Context::applyTextures(SamplerType type)
             TextureType textureType = programBinary->getSamplerTextureType(type, samplerIndex);
 
             Texture *texture = getSamplerTexture(textureUnit, textureType);
-            
-            if (!texture->isSamplerComplete())
-            {
-                texture = getIncompleteTexture(textureType);
-            }
-
             unsigned int texSerial = texture->getTextureSerial();
 
             if (appliedTextureSerial[samplerIndex] != texSerial || texture->hasDirtyParameters() || texture->hasDirtyImages())
             {
                 IDirect3DBaseTexture9 *d3dTexture = texture->getTexture();
 
-                if (appliedTextureSerial[samplerIndex] != texSerial || texture->hasDirtyParameters())
+                if (d3dTexture)
                 {
-                    GLenum wrapS = texture->getWrapS();
-                    GLenum wrapT = texture->getWrapT();
-                    GLenum minFilter = texture->getMinFilter();
-                    GLenum magFilter = texture->getMagFilter();
-                    float maxAnisotropy = texture->getMaxAnisotropy();
-
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSU, es2dx::ConvertTextureWrap(wrapS));
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSV, es2dx::ConvertTextureWrap(wrapT));
-
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAGFILTER, es2dx::ConvertMagFilter(magFilter, maxAnisotropy));
-                    D3DTEXTUREFILTERTYPE d3dMinFilter, d3dMipFilter;
-                    es2dx::ConvertMinFilter(minFilter, &d3dMinFilter, &d3dMipFilter, maxAnisotropy);
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_MINFILTER, d3dMinFilter);
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_MIPFILTER, d3dMipFilter);
-                    mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXMIPLEVEL, texture->getLodOffset());
-
-                    if (supportsTextureFilterAnisotropy())
+                    if (appliedTextureSerial[samplerIndex] != texSerial || texture->hasDirtyParameters())
                     {
-                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXANISOTROPY, (DWORD)maxAnisotropy);
+                        GLenum wrapS = texture->getWrapS();
+                        GLenum wrapT = texture->getWrapT();
+                        GLenum minFilter = texture->getMinFilter();
+                        GLenum magFilter = texture->getMagFilter();
+                        float maxAnisotropy = texture->getMaxAnisotropy();
+
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSU, es2dx::ConvertTextureWrap(wrapS));
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSV, es2dx::ConvertTextureWrap(wrapT));
+
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAGFILTER, es2dx::ConvertMagFilter(magFilter, maxAnisotropy));
+                        D3DTEXTUREFILTERTYPE d3dMinFilter, d3dMipFilter;
+                        es2dx::ConvertMinFilter(minFilter, &d3dMinFilter, &d3dMipFilter, maxAnisotropy);
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MINFILTER, d3dMinFilter);
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MIPFILTER, d3dMipFilter);
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXMIPLEVEL, texture->getLodOffset());
+
+                        if (supportsTextureFilterAnisotropy())
+                        {
+                            mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXANISOTROPY, (DWORD)maxAnisotropy);
+                        }
                     }
-                }
 
-                if (appliedTextureSerial[samplerIndex] != texSerial || texture->hasDirtyImages())
+                    if (appliedTextureSerial[samplerIndex] != texSerial || texture->hasDirtyImages())
+                    {
+                        mDevice->SetTexture(d3dSampler, d3dTexture);
+                    }
+                }
+                else
                 {
-                    mDevice->SetTexture(d3dSampler, d3dTexture);
+                    mDevice->SetTexture(d3dSampler, getIncompleteTexture(textureType)->getTexture());
                 }
 
                 appliedTextureSerial[samplerIndex] = texSerial;

src/libGLESv2/Texture.cpp

@@ -1535,6 +1535,11 @@ bool Texture::subImageCompressed(GLint xoffset, GLint yoffset, GLsizei width, GL
 
 IDirect3DBaseTexture9 *Texture::getTexture()
 {
+    if (!isSamplerComplete())
+    {
+        return NULL;
+    }
+
     // ensure the underlying texture is created
     if (getStorage(false) == NULL)
     {