From 2fe8373bb1d56f531f8a2e03a3087b0aa73e199c Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 1 Mar 2017 21:54:04 +0000 Subject: Revert "Revert "Move GrTextureProvider to src"" This reverts commit 13d7f5d7c2872ed4298330758e173ae605578cb2. Reason for revert: Fixed client code. Re-landing. Original change's description: > Revert "Move GrTextureProvider to src" > > This reverts commit 24429c68c56683252e3fc2a79d9b660eaf96ec0c. > > Reason for revert: Breaking a roll > > Original change's description: > > Move GrTextureProvider to src > > > > With this hidden, we can make further simplification. Just want to test > > this change against our external clients first, to make sure we're okay > > to proceed. > > > > BUG=skia: > > > > Change-Id: I47f8c8f2912201c2890bc2f9a9d68aa92649a2d4 > > Reviewed-on: https://skia-review.googlesource.com/9072 > > Commit-Queue: Brian Osman > > Reviewed-by: Brian Salomon > > > > TBR=bsalomon@google.com,brianosman@google.com,benjaminwagner@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Change-Id: I43cc135731245c29e24bbecf06ee46c562955c03 > Reviewed-on: https://skia-review.googlesource.com/9123 > Reviewed-by: Brian Osman > Commit-Queue: Brian Osman > TBR=bsalomon@google.com,benjaminwagner@google.com,reviews@skia.org,brianosman@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: Ibcb2ea34654315327c46ea8e4de5bf14376d9bdf Reviewed-on: https://skia-review.googlesource.com/9127 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- tests/ProxyConversionTest.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/ProxyConversionTest.cpp') diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 16cea8a674..4504a65b4f 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -11,6 +11,7 @@ #if SK_SUPPORT_GPU #include "GrSurfaceProxy.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "GrRenderTargetProxy.h" -- cgit v1.2.3