commit 326f1d702b779ec17d1d1de3a899c4af7e45fb67
author Robert Phillips <robertphillips@google.com> Thu Oct 01 09:43:29 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 02 12:59:54 2020 +0000
tree c964bedd5929bb067080fdeeb016bdc1b14c917d
parent 2d403f203b00fbefe4c7c63cef4b02b355467fa2

Accumulated non-substantive changes

Change-Id: I0c6f48da9acefcdd954c9b1b54501ef48465e537
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310980
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index b7dd5b9..2a9c4da 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -28,6 +28,7 @@
 #include "src/core/SkUtils.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
+#include "src/gpu/GrImageContextPriv.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrResourceCache.h"
 #include "src/gpu/GrTexture.h"
@@ -411,7 +412,7 @@
                 if (!texImage) {
                     auto imageContext = as_IB(image)->context();
                     // We expect to fail if image comes from a different context
-                    if (!image->isTextureBacked() || imageContext == dContext) {
+                    if (!image->isTextureBacked() || imageContext->priv().matches(dContext)) {
                         ERRORF(reporter, "makeTextureImage failed.");
                     }
                     continue;