aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/gpu/GrContextFactory.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-06 18:21:25 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-06 18:21:37 +0000
commitc867a89b012c07e7e5cb719a31ed90e61f4a4901 (patch)
treec024d294fbe22508c65c686ad3771691d4ca5e1e /tools/gpu/GrContextFactory.cpp
parent3276f9a4ffc0ea8aa2b6dc222b89ef794678123b (diff)
Revert "Make mock GrContext unit testable."
This reverts commit 993e7e25217df05d63c3354c817e8bd18ea3738b. Reason for revert: Seeing if this fixes the NexusPlayer bots Original change's description: > Make mock GrContext unit testable. > > Bug: skia: > Change-Id: I959122f1f2c390832ab1033bcdbdd2ca6cfc0419 > Reviewed-on: https://skia-review.googlesource.com/20699 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: I25ed9329962d930fe38108f779ff7083e0e4847e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/21731 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/gpu/GrContextFactory.cpp')
-rw-r--r--tools/gpu/GrContextFactory.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index d614b0643e..23ffad155f 100644
--- a/tools/gpu/GrContextFactory.cpp
+++ b/tools/gpu/GrContextFactory.cpp
@@ -22,7 +22,6 @@
#endif
#include "gl/null/NullGLTestContext.h"
#include "gl/GrGLGpu.h"
-#include "mock/MockTestContext.h"
#include "GrCaps.h"
#if defined(SK_BUILD_FOR_WIN32) && defined(SK_ENABLE_DISCRETE_GPU)
@@ -221,19 +220,6 @@ ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOv
break;
}
#endif
- case kMock_GrBackend: {
- TestContext* sharedContext = masterContext ? masterContext->fTestContext : nullptr;
- SkASSERT(kMock_ContextType == type);
- if (ContextOverrides::kRequireNVPRSupport & overrides) {
- return ContextInfo();
- }
- testCtx.reset(CreateMockTestContext(sharedContext));
- if (!testCtx) {
- return ContextInfo();
- }
- backendContext = testCtx->backendContext();
- break;
- }
default:
return ContextInfo();
}