aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Stephen White <senorblanco@chromium.org>2018-05-26 16:38:31 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-26 16:58:43 +0000
commit95ef524734d522295b72106b185e9b4ee0463b87 (patch)
tree39e9b55a4887f5171be628387c511054227bc526 /include
parente2343a1d0997ca715275a9fb2079b8514c6f8c19 (diff)
Revert "Turn off domain in GrTextureOp when src rect contains entire proxy"
This reverts commit 869433fa113d1573d5d91fcafdca413b247ce1b0. Reason for revert: possibly preventing Chromium roll (layout tests) Original change's description: > Turn off domain in GrTextureOp when src rect contains entire proxy > > Move check for turning off domain when nearest/no-aa to GrRenderTargetContext. > > Change-Id: I3c071b5f73fb3134218453204f30c3020c9dad9a > Reviewed-on: https://skia-review.googlesource.com/130143 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I8afc3c05b504ccde7d44e973d707f4cba1dc51b1 Reviewed-on: https://skia-review.googlesource.com/130302 Reviewed-by: Stephen White <senorblanco@chromium.org> Commit-Queue: Stephen White <senorblanco@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/private/GrSurfaceProxy.h23
1 files changed, 8 insertions, 15 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h
index 9499edfde3..1c18492cbd 100644
--- a/include/private/GrSurfaceProxy.h
+++ b/include/private/GrSurfaceProxy.h
@@ -239,21 +239,6 @@ public:
}
int worstCaseWidth() const;
int worstCaseHeight() const;
- /**
- * Helper that gets the width and height of the surface as a bounding rectangle.
- */
- SkRect getBoundsRect() const {
- SkASSERT(LazyState::kFully != this->lazyInstantiationState());
- return SkRect::MakeIWH(this->width(), this->height());
- }
- /**
- * Helper that gets the worst case width and height of the surface as a bounding rectangle.
- */
- SkRect getWorstCaseBoundsRect() const {
- SkASSERT(LazyState::kFully != this->lazyInstantiationState());
- return SkRect::MakeIWH(this->worstCaseWidth(), this->worstCaseHeight());
- }
-
GrSurfaceOrigin origin() const {
SkASSERT(kTopLeft_GrSurfaceOrigin == fOrigin || kBottomLeft_GrSurfaceOrigin == fOrigin);
return fOrigin;
@@ -318,6 +303,14 @@ public:
void deInstantiate();
/**
+ * Helper that gets the width and height of the surface as a bounding rectangle.
+ */
+ SkRect getBoundsRect() const {
+ SkASSERT(LazyState::kFully != this->lazyInstantiationState());
+ return SkRect::MakeIWH(this->width(), this->height());
+ }
+
+ /**
* @return the texture proxy associated with the surface proxy, may be NULL.
*/
virtual GrTextureProxy* asTextureProxy() { return nullptr; }