I'm trying to get the fix in here: https://codereview.chromium.org/1924183003/

Sorry for the trouble.

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/1cb00e42bff455e23f6883bf09680438fa631224

commit 1cb00e42bff455e23f6883bf09680438fa631224
Author: kkinnunen <kkinnunen@nvidia.com>
Date: Tue May 03 06:16:42 2016

Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget

This is a regression from "Refactor to separate backend object lifecycle
and GpuResource budget decision".

GrGLRenderTarget::CreateWrapped creates only render targets that wrap
the FBO.
GrGLRenderTargetTexture::CreateWrapped creates render targets that
wrap the texture.

Use the latter as the implementation for
SkSurface::MakeFromBackendTextureAsRenderTarget.

BUG= 608238 

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003

Committed: https://skia.googlesource.com/skia/+/fe635fd76bbc375d527d1884af23cc617ca364ee

Review-Url: https://codereview.chromium.org/1924183003

[modify] https://crrev.com/1cb00e42bff455e23f6883bf09680438fa631224/include/core/SkSurface.h
[modify] https://crrev.com/1cb00e42bff455e23f6883bf09680438fa631224/src/gpu/gl/GrGLGpu.cpp
[modify] https://crrev.com/1cb00e42bff455e23f6883bf09680438fa631224/tests/SurfaceTest.cpp

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/db1adf59890dfd50212ac217eaa2d04e70c0d37c

commit db1adf59890dfd50212ac217eaa2d04e70c0d37c
Author: jvanverth <jvanverth@google.com>
Date: Tue May 03 12:37:45 2016

Revert of Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRender… (patchset #9 id:150001 of https://codereview.chromium.org/1924183003/ )

Reason for revert:
Appears to be breaking the roll.

Original issue's description:
> Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget
>
> This is a regression from "Refactor to separate backend object lifecycle
> and GpuResource budget decision".
>
> GrGLRenderTarget::CreateWrapped creates only render targets that wrap
> the FBO.
> GrGLRenderTargetTexture::CreateWrapped creates render targets that
> wrap the texture.
>
> Use the latter as the implementation for
> SkSurface::MakeFromBackendTextureAsRenderTarget.
>
>
> BUG= 608238 
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003
>
> Committed: https://skia.googlesource.com/skia/+/fe635fd76bbc375d527d1884af23cc617ca364ee
>
> Committed: https://skia.googlesource.com/skia/+/1cb00e42bff455e23f6883bf09680438fa631224

TBR=bsalomon@google.com,kkinnunen@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 608238 

Review-Url: https://codereview.chromium.org/1943843002

[modify] https://crrev.com/db1adf59890dfd50212ac217eaa2d04e70c0d37c/include/core/SkSurface.h
[modify] https://crrev.com/db1adf59890dfd50212ac217eaa2d04e70c0d37c/src/gpu/gl/GrGLGpu.cpp
[modify] https://crrev.com/db1adf59890dfd50212ac217eaa2d04e70c0d37c/tests/SurfaceTest.cpp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9f0d5903c700dbc5430adefa3c46f857c059a480

commit 9f0d5903c700dbc5430adefa3c46f857c059a480
Author: skia-deps-roller <skia-deps-roller@chromium.org>
Date: Tue May 03 15:18:33 2016

Roll src/third_party/skia/ cf975447a..89d09a1f7 (5 commits).

https://chromium.googlesource.com/skia.git/+log/cf975447a857..89d09a1f7028

$ git log cf975447a..89d09a1f7 --date=short --no-merges --format='%ad %ae %s'
2016-05-03 robertphillips Revert of Add Gr*Proxy classes (patchset #9 id:160001 of https://codereview.chromium.org/1937553002/ )
2016-05-03 brianosman Remove SkBitmapHeap and SkBitmapHeapReader. They're unused.
2016-05-03 jvanverth Revert of Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRender… (patchset #9 id:150001 of https://codereview.chromium.org/1924183003/ )
2016-05-03 robertphillips Add Gr*Proxy classes
2016-05-02 kkinnunen Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget

BUG= 608238 , 608238 

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jvanverth@google.com

Review-Url: https://codereview.chromium.org/1947513002
Cr-Commit-Position: refs/heads/master@{#391238}

[modify] https://crrev.com/9f0d5903c700dbc5430adefa3c46f857c059a480/DEPS

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/0736f3386820f19c0fe90b5dda2094e253780071

commit 0736f3386820f19c0fe90b5dda2094e253780071
Author: ericrk <ericrk@chromium.org>
Date: Wed May 04 00:14:07 2016

Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget

This is a regression from "Refactor to separate backend object lifecycle
and GpuResource budget decision".

GrGLRenderer::canAttemptStencilAttachment was incorrectly returning false
for all wrapped render targets. This function should return false only if
the FBO is wrapped (unowned). If the FBO is owned by Skia, we can attach
stencils.

BUG= 608238 

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003

Review-Url: https://codereview.chromium.org/1941353003

[modify] https://crrev.com/0736f3386820f19c0fe90b5dda2094e253780071/src/gpu/gl/GrGLRenderTarget.cpp
[modify] https://crrev.com/0736f3386820f19c0fe90b5dda2094e253780071/tests/SurfaceTest.cpp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1be97e6afd3c4fffa56aad27fa11f4db6c3ec9fb

commit 1be97e6afd3c4fffa56aad27fa11f4db6c3ec9fb
Author: skia-deps-roller <skia-deps-roller@chromium.org>
Date: Wed May 04 03:29:22 2016

Roll src/third_party/skia/ 02125d10d..0736f3386 (2 commits).

https://chromium.googlesource.com/skia.git/+log/02125d10d5d0..0736f3386820

$ git log 02125d10d..0736f3386 --date=short --no-merges --format='%ad %ae %s'
2016-05-03 ericrk Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget
2016-05-03 halcanary Start building HarfBuzz+Skia example

BUG= 608238 

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jvanverth@google.com

Review-Url: https://codereview.chromium.org/1950843002
Cr-Commit-Position: refs/heads/master@{#391436}

[modify] https://crrev.com/1be97e6afd3c4fffa56aad27fa11f4db6c3ec9fb/DEPS

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/31f25a037d7e3ee9de8f26e8cdd5c1f88da0f765

commit 31f25a037d7e3ee9de8f26e8cdd5c1f88da0f765
Author: jvanverth <jvanverth@google.com>
Date: Wed May 04 17:08:12 2016

Revert of Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRend… (patchset #1 id:60001 of https://codereview.chromium.org/1941353003/ )

Reason for revert:
Breaking the ANGLE bots. Message is:

Caught exception 3221225477 EXCEPTION_ACCESS_VIOLATION

8.59m elapsed, 1 active, 82 queued, 315MB RAM, 1442MB peak
	unit test  SurfaceAttachStencil_Gpu
step returned non-zero exit code: -1073741819

Original issue's description:
> Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget
>
> This is a regression from "Refactor to separate backend object lifecycle
> and GpuResource budget decision".
>
> GrGLRenderer::canAttemptStencilAttachment was incorrectly returning false
> for all wrapped render targets. This function should return false only if
> the FBO is wrapped (unowned). If the FBO is owned by Skia, we can attach
> stencils.
>
> BUG= 608238 
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003
>
> Committed: https://skia.googlesource.com/skia/+/0736f3386820f19c0fe90b5dda2094e253780071

TBR=bsalomon@google.com,kkinnunen@nvidia.com,ericrk@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 608238 

Review-Url: https://codereview.chromium.org/1947143002

[modify] https://crrev.com/31f25a037d7e3ee9de8f26e8cdd5c1f88da0f765/src/gpu/gl/GrGLRenderTarget.cpp
[modify] https://crrev.com/31f25a037d7e3ee9de8f26e8cdd5c1f88da0f765/tests/SurfaceTest.cpp

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/c4025189d31efcb0d54bf14b7712b38725f86c13

commit c4025189d31efcb0d54bf14b7712b38725f86c13
Author: ericrk <ericrk@chromium.org>
Date: Wed May 04 19:01:58 2016

Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget

This is a regression from "Refactor to separate backend object lifecycle
and GpuResource budget decision".

GrGLRenderer::canAttemptStencilAttachment was incorrectly returning false
for all wrapped render targets. This function should return false only if
the FBO is wrapped (unowned). If the FBO is owned by Skia, we can attach
stencils.

BUG= 608238 

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003

Review-Url: https://codereview.chromium.org/1941353003

[modify] https://crrev.com/c4025189d31efcb0d54bf14b7712b38725f86c13/src/gpu/gl/GrGLRenderTarget.cpp
[modify] https://crrev.com/c4025189d31efcb0d54bf14b7712b38725f86c13/tests/SurfaceTest.cpp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2904b4c1645199880bf01151be7b75d8d13e5249

commit 2904b4c1645199880bf01151be7b75d8d13e5249
Author: skia-deps-roller <skia-deps-roller@chromium.org>
Date: Wed May 04 19:26:19 2016

Roll src/third_party/skia/ 419ca64f0..fad98562d (7 commits).

https://chromium.googlesource.com/skia.git/+log/419ca64f0f80..fad98562d8f9

$ git log 419ca64f0..fad98562d --date=short --no-merges --format='%ad %ae %s'
2016-05-04 brianosman Prototype code that turns any/every flattenable into JSON
2016-05-04 benjaminwagner Fix ASAN errors.
2016-05-04 jvanverth Revert of Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRend… (patchset #1 id:60001 of https://codereview.chromium.org/1941353003/ )
2016-05-04 halcanary tools/using_skia_and_harfbuzz: minor cleanup
2016-05-04 bsalomon Add some more testing around hairline GrShapes GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1949903002
2016-05-04 halcanary experimental/tools/coreGraphicsPdf2png: fix
2016-05-04 bsalomon Expand GrStyle's interface.

BUG= 608238 

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jvanverth@google.com

Review-Url: https://codereview.chromium.org/1951963002
Cr-Commit-Position: refs/heads/master@{#391600}

[modify] https://crrev.com/2904b4c1645199880bf01151be7b75d8d13e5249/DEPS

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/38130b01b5e144839902d138fe6fce4e761e174d

commit 38130b01b5e144839902d138fe6fce4e761e174d
Author: skia-deps-roller <skia-deps-roller@chromium.org>
Date: Wed May 04 20:41:24 2016

Roll src/third_party/skia/ fad98562d..c4025189d (3 commits).

https://chromium.googlesource.com/skia.git/+log/fad98562d8f9..c4025189d31e

$ git log fad98562d..c4025189d --date=short --no-merges --format='%ad %ae %s'
2016-05-04 ericrk Allow stencils to be attached to render targets created via SkSurface::MakeFromBackendTextureAsRenderTarget
2016-05-04 mtklein Modernize SkMutex and SkSemaphore.
2016-05-04 robertphillips Disable Ganesh layer hoister in a more revertable form

BUG= 608238 

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jvanverth@google.com

Review-Url: https://codereview.chromium.org/1946393002
Cr-Commit-Position: refs/heads/master@{#391628}

[modify] https://crrev.com/38130b01b5e144839902d138fe6fce4e761e174d/DEPS

This is fixed, closing.