diff options
author | Brian Salomon <bsalomon@google.com> | 2018-04-09 12:38:40 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-09 17:14:46 +0000 |
commit | a7b8e74eb61efc570bde820d55c35d676eec6597 (patch) | |
tree | b7008b0f396f7b265634f4cb15cb3fc5f9191d5a /include | |
parent | c60547316c80c208c1d2902bc8a7ec08c655831e (diff) |
Reland "Remove deprectated GrContext::MakeGL overloads that take raw ptr"
This reverts commit 87f852d1a30f040cfa0e9567b17ec236e14a0f41.
Reason for revert: Google3 updated
Original change's description:
> Revert "Remove deprectated GrContext::MakeGL overloads that take raw ptr"
>
> This reverts commit efa60a1d13fa1de00a4cba0454fdd9ad375caa72.
>
> Reason for revert: Surprise! Google3 still uses these.
>
> Original change's description:
> > Remove deprectated GrContext::MakeGL overloads that take raw ptr
> >
> > Change-Id: Iae12bf61fa1e2f5d4b13b98198cddb7482656fdf
> > Reviewed-on: https://skia-review.googlesource.com/118660
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: Ica09d80e1563924a286a4a6aa8a1f93cb5ca9c5d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/119001
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I87c12253f759a97cb4da3ff35dc1ec846513caef
Reviewed-on: https://skia-review.googlesource.com/119921
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrContext.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 21fd2e6376..e8f8acc3cf 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -63,10 +63,6 @@ public: static sk_sp<GrContext> MakeGL(const GrContextOptions&); static sk_sp<GrContext> MakeGL(); - // Deprecated - static sk_sp<GrContext> MakeGL(const GrGLInterface*); - static sk_sp<GrContext> MakeGL(const GrGLInterface*, const GrContextOptions&); - #ifdef SK_VULKAN static sk_sp<GrContext> MakeVulkan(sk_sp<const GrVkBackendContext>, const GrContextOptions&); static sk_sp<GrContext> MakeVulkan(sk_sp<const GrVkBackendContext>); |