diff options
| author |  reed <reed@chromium.org> | 2014-09-21 10:25:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-21 10:25:07 -0700 |
| commit | 29c857d0f3a1cb837f73406eeb6ba9771879b5e7 (patch) | |
| tree | 135d517cf36f82b7f6f02fd81bfef92eb8befe34 /src/gpu/GrLayerHoister.cpp | |
| parent | 3716fd067a5621bb94a6cb08d72afec8bf3aceda (diff) | |
Revert of introduce Props to surface (patchset #27 id:520001 of https://codereview.chromium.org/551463004/)
Reason for revert:
Broke call site in WebKit
Original issue's description:
> introduce Props to surface (work in progress)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3716fd067a5621bb94a6cb08d72afec8bf3aceda
R=robertphillips@google.com, bsalomon@google.com, jvanverth@google.com, bungeman@google.com, fmalita@google.com, vangelis@chromium.org, reed@google.com
TBR=bsalomon@google.com, bungeman@google.com, fmalita@google.com, jvanverth@google.com, reed@google.com, robertphillips@google.com, vangelis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/583773004
Diffstat (limited to 'src/gpu/GrLayerHoister.cpp')
| -rw-r--r-- | src/gpu/GrLayerHoister.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrLayerHoister.cpp b/src/gpu/GrLayerHoister.cpp index 165716f82d..ba431d33e9 100644 --- a/src/gpu/GrLayerHoister.cpp +++ b/src/gpu/GrLayerHoister.cpp @@ -142,7 +142,8 @@ void GrLayerHoister::DrawLayers(const SkPicture* picture, if (atlased.count() > 0) { // All the atlased layers are rendered into the same GrTexture SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTargetDirect( - atlased[0]->texture()->asRenderTarget(), NULL)); + atlased[0]->texture()->asRenderTarget(), + SkSurface::kStandard_TextRenderMode)); SkCanvas* atlasCanvas = surface->getCanvas(); @@ -195,7 +196,8 @@ void GrLayerHoister::DrawLayers(const SkPicture* picture, // Each non-atlased layer has its own GrTexture SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTargetDirect( - layer->texture()->asRenderTarget(), NULL)); + layer->texture()->asRenderTarget(), + SkSurface::kStandard_TextRenderMode)); SkCanvas* layerCanvas = surface->getCanvas(); |