From 1e09e461d2ffcf8b07242cfe93dd7d12c4d75866 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 16 Nov 2017 22:31:30 +0000 Subject: Revert "Add method to sk_gpu_test::TestContext to automatically restore the previous context." This reverts commit 5627d65146cb92624b682389e017d488872228c7. Reason for revert: Google3 Original change's description: > Add method to sk_gpu_test::TestContext to automatically restore the previous context. > > The motivation for this is to allow a GM to create a GL context, do some some work in it, and then return to the context that was set when it was invoked. > > Change-Id: Ie8496072a10f8f3ff36a08889e593a6ca961b61a > Reviewed-on: https://skia-review.googlesource.com/70720 > Commit-Queue: Brian Salomon > Reviewed-by: Brian Osman TBR=bsalomon@google.com,brianosman@google.com Change-Id: Ifb79638c9d4500ca3be9a5be39a5ad78b20247c1 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/72981 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- src/core/SkScopeExit.h | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/core/SkScopeExit.h (limited to 'src/core') diff --git a/src/core/SkScopeExit.h b/src/core/SkScopeExit.h deleted file mode 100644 index 95804e637a..0000000000 --- a/src/core/SkScopeExit.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkScopeExit_DEFINED -#define SkScopeExit_DEFINED - -#include "SkTypes.h" - -/** SkScopeExit calls a std:::function in its destructor. */ -class SkScopeExit { -public: - SkScopeExit(std::function f) : fFn(std::move(f)) {} - SkScopeExit(SkScopeExit&& that) : fFn(std::move(that.fFn)) {} - - ~SkScopeExit() { - if (fFn) { - fFn(); - } - } - - SkScopeExit& operator=(SkScopeExit&& that) { - fFn = std::move(that.fFn); - return *this; - } - -private: - std::function fFn; - - SkScopeExit( const SkScopeExit& ) = delete; - SkScopeExit& operator=(const SkScopeExit& ) = delete; -}; - -/** - * SK_AT_SCOPE_EXIT(stmt) evaluates stmt when the current scope ends. - * - * E.g. - * { - * int x = 5; - * { - * SK_AT_SCOPE_EXIT(x--); - * SkASSERT(x == 5); - * } - * SkASSERT(x == 4); - * } - */ -#define SK_AT_SCOPE_EXIT(stmt) \ - SkScopeExit SK_MACRO_APPEND_LINE(at_scope_exit_)([&]() { stmt; }) - -#endif // SkScopeExit_DEFINED -- cgit v1.2.3