From f0cbfb33c6e1a7ecce7d70fb0b40c861ff73941f Mon Sep 17 00:00:00 2001
From: "sylvestre.ledru" <sylvestre.ledru@gmail.com>
Date: Thu, 1 Sep 2016 08:17:02 -0700
Subject: [PATCH] Remove a duplicate declaration

Merge branch 'master' of github.com:google/skia

Remove a useless declaration

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288603002

Review-Url: https://codereview.chromium.org/2288603002
---
 src/gpu/gl/GrGLCaps.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index b6e9f22fa5..511b46928a 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -1283,7 +1283,7 @@ bool GrGLCaps::getExternalFormat(GrPixelConfig surfaceConfig, GrPixelConfig memo
                                  ExternalFormatUsage usage, GrGLenum* externalFormat,
                                  GrGLenum* externalType) const {
     SkASSERT(externalFormat && externalType);
-    if (GrPixelConfigIsCompressed(memoryConfig) || GrPixelConfigIsCompressed(memoryConfig)) {
+    if (GrPixelConfigIsCompressed(memoryConfig)) {
         return false;
     }