commit c77085d2e0a3ff7e908a7164ac6224ea10686739
author Greg Daniel <egdaniel@google.com> Wed Nov 01 16:38:48 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 02 13:11:31 2017 +0000
tree ca804bb45e7e257e324cd31a1e2215b93ad0ba07
parent d1b2eec0d0f95977b52669025cb25038618c0335

Remove content area from GrTextureAdjuster.

Bug: skia:
Change-Id: I77854ee22303afe5787bf3094bca2db1a3dcf5ef
Reviewed-on: https://skia-review.googlesource.com/66149
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrTextureMaker.cpp

diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index e234180..b3a16f5 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -73,7 +73,7 @@
         return nullptr;
     }
 
-    result = CopyOnGpu(fContext, std::move(result), nullptr, copyParams, willBeMipped);
+    result = CopyOnGpu(fContext, std::move(result), copyParams, willBeMipped);
 
     if (!result) {
         return nullptr;
@@ -133,8 +133,7 @@
     SkRect domain;
     DomainMode domainMode =
         DetermineDomainMode(constraintRect, filterConstraint, coordsLimitedToConstraintRect,
-                            proxy.get(),
-                            nullptr, fmForDetermineDomain, &domain);
+                            proxy.get(), fmForDetermineDomain, &domain);
     SkASSERT(kTightCopy_DomainMode != domainMode);
     GrPixelConfig config = proxy->config();
     auto fp = CreateFragmentProcessorForDomainAndFilter(std::move(proxy), adjustedMatrix,
@@ -151,5 +150,5 @@
         return nullptr;
     }
 
-    return CopyOnGpu(fContext, std::move(original), nullptr, copyParams, willBeMipped);
+    return CopyOnGpu(fContext, std::move(original), copyParams, willBeMipped);
 }