AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,084 Commits 1 Branch 0 Tags 544 MiB
57b4615974
Commit Graph

22084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brianosman
57b4615974 Remove unused encodedString API on SkWriteBuffer/SkReadBuffer 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1936103002

Review-Url: https://codereview.chromium.org/1936103002
 2016-05-02 07:09:25 -07:00
egdaniel
778555cfda Unify DescriptorPools for vulkan uniform descriptor sets 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927943002

Review-Url: https://codereview.chromium.org/1927943002
 2016-05-02 06:50:36 -07:00
djsollen
aad1f8f70b Disable yet another GCC warning in Release_Developer mode. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1934293002

Review-Url: https://codereview.chromium.org/1934293002
 2016-05-02 06:06:02 -07:00
liyuqian
2275017e45 Add CMake path to gradle 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1921553009

Review-Url: https://codereview.chromium.org/1921553009
 2016-05-02 05:33:20 -07:00
aleksandar.stojiljkovic
9516775857 Enable generating SkImage with the same uniqueID in SkImageGenerator subclass 
Enable reusing uniqueID when instantiating SkImageGenerator subclasses enables
using uniqueID in client code to cache generated bitmaps with no need to keep
the reference to SkImageGenerator.

This is a bug fix for out of memory cause in chromium and 100% CPU usage
described in issue 165750#13:
- cache uses SkImage::uniqueID() to cache decoded bitmaps.
- every animation loop creates new SkImage instances.
- after decoding, bitmap copies are added to cache, filling it up with
duplicates of previous loops frames.

BUG=165750

Blink patch that depends on this:
https://codereview.chromium.org/1925533003/
"High CPU and increased memory usage fix for high-res (GIF, WEBP...) animations."

Review-Url: https://codereview.chromium.org/1928403002
 2016-05-02 01:43:38 -07:00
benjaminwagner
83906aedb9 Patch in internal cl/121138374. 
TBR=mtklein
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1939483002

Review-Url: https://codereview.chromium.org/1939483002
 2016-05-01 15:02:25 -07:00
reed
7563a5a983 remove SK_SUPPORT_LEGACY_IMAGEFILTER_CTM flag 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1938823002

Review-Url: https://codereview.chromium.org/1938823002
 2016-05-01 15:00:20 -07:00
update-skps
f077edd660 Update SKP version 
Automatic commit by the RecreateSKPs bot.

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

Review-Url: https://codereview.chromium.org/1938813002
 2016-05-01 00:29:08 -07:00
bsalomon
cf942c4ef7 Fix gcc warnings in Vulkan backend 
BUG=skia:
TBR=jvanverth@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1935903002

Review-Url: https://codereview.chromium.org/1935903002
 2016-04-29 18:30:06 -07:00
bungeman
572f879b61 Fix race in SkTypeface_FreeType::onCountGlyphs. 
Found by TSAN. This makes the operation slightly slower, but it is
not on any user's hot path.

BUG=skia:5238

Review-Url: https://codereview.chromium.org/1940613002
 2016-04-29 15:05:02 -07:00
mtklein
4d9ff62fa2 Remove SkWriter32::contiguousArray(). 
This method requires SkWriter32 have a contiguous array.
It does, and I plan to keep it that way (last time we checked
it's faster), but this turns that feature back into an
implementation detail.

This feature is only used by another unused feature, deep copies of
ops arrays in SkPictureData.  Kill that, kill this.

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

Depends on https://codereview.chromium.org/1936563002/

Only deleting API
TBR=reed@google.com

Review-Url: https://codereview.chromium.org/1932223003
 2016-04-29 14:45:36 -07:00
robertphillips
221196dac9 Fix old debugger 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1935623002

Review-Url: https://codereview.chromium.org/1935623002
 2016-04-29 14:02:18 -07:00
borenet
43bf511ead Delete ChromeOS code 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926163002

Review-Url: https://codereview.chromium.org/1926163002
 2016-04-29 14:01:34 -07:00
mtklein
e86e51fe7e Add reminders that these classes have constexpr default constructors. 
We can do this now that we can write "constexpr".

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

Review-Url: https://codereview.chromium.org/1936653002
 2016-04-29 13:58:18 -07:00
mtklein
b4c899d48d remove SkWriteBuffer::getWriter32(). 
SkWriteBuffer exposes its lower-level implementation SkWriter32 through
this one call.  It's not currently used in any interesting way:
   - write_encoded_bitmap() uses it to manually re-create writeDataAsByteArray();
   - unit tests use it incidentally as a quick way to read the serialized bytes.

This should be SkWriteBuffer no longer necessarily needs to have an SkWriter32.

Landing this will let us then remove SkWriter32::contiguousArray().

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

TBR=reed@google.com
Just deleting API

Review-Url: https://codereview.chromium.org/1936563002
 2016-04-29 13:58:09 -07:00
jvanverth
900bd4a046 Add mipmap loading to Vulkan. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1925303002

Review-Url: https://codereview.chromium.org/1925303002
 2016-04-29 13:53:12 -07:00
djsollen
2f12463158 Fix warnings that were exposed when running with SK_DEBUG enable on an optimized release build. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1917223006

Review-Url: https://codereview.chromium.org/1917223006
 2016-04-29 13:53:05 -07:00
bsalomon
5ee89a6faf Unbreak vulkan after stencil constant name changes 
TBR=egdaniel@google.com,jvanverth@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930323003

NOTREECHECKS=true

Review-Url: https://codereview.chromium.org/1930323003
 2016-04-29 12:03:52 -07:00
benjaminwagner
817fed3cb7 Revert of Make stencils be attachable to render targets created via SkSurface::MakeFromBackendTextureAsRender… (patchset #5 id:80001 of https://codereview.chromium.org/1924183003/ ) 
Reason for revert:
Breaking the DEPS roll.

Also seems to be causing failure in DM on some Windows bots:
c:\0\build\slave\workdir\build\skia\tests\surfacetest.cpp:963	kShapeColor == bitmap.getColor(kW / 2, kH / 2)

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.
>
> The test contains disabled code. The
> MakeFromBackendTextureAsRenderTarget does not copy the existing texture
> contents to the FBO render buffer.
> 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

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

Review-Url: https://codereview.chromium.org/1931293003
 2016-04-29 11:17:08 -07:00
msarett
a2ffa98323 Revert of Introduce SkGammas type to represent ICC gamma curves (patchset #7 id:40002 of https://codereview.chromium.org/1928123002/ ) 
Reason for revert:
Breaks TSAN
https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN/builds/6387/steps/dm/logs/stdio

Original issue's description:
> Introduce SkGammas type to represent ICC gamma curves
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1928123002
>
> Committed: https://skia.googlesource.com/skia/+/7b2c6dd8c918209cb92e1338905d511c68da3eb2

TBR=scroggo@google.com,reed@google.com,brianosman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/1933863002
 2016-04-29 11:12:22 -07:00
msarett
7b2c6dd8c9 Introduce SkGammas type to represent ICC gamma curves 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1928123002

Review-Url: https://codereview.chromium.org/1928123002
 2016-04-29 10:01:26 -07:00
liyuqian
b138fdc65f Fix Vulkan Build in Android 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1935523002

Review-Url: https://codereview.chromium.org/1935523002
 2016-04-29 10:00:26 -07:00
jvanverth
fb5916486f Don't mark mipmaps dirty if uploading > 1 levels 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933293002

Review-Url: https://codereview.chromium.org/1933293002
 2016-04-29 09:50:25 -07:00
msarett
69deca8d1e Add ColorCodecSrc for testing/comparison on color corrected decodes 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933753002

Review-Url: https://codereview.chromium.org/1933753002
 2016-04-29 09:38:40 -07:00
mtklein
1b5dd88454 remove SkWriteBuffer::reserve() 
We're not using it for anything that we can't do using the clearer writeFoo()/readFoo() methods.

The deletions in SkPictureFlat.{h,cpp} and BitmapHeapTest.cpp clean up dead code.
This code has not been used for a long time.  I happened to notice it because it
was another caller of reserve() (in a terrifyingly hacking/interesting way that
I bet we'll find I authored...)

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

Deleting APIs unused publicly.
TBR=reed@google.com

Review-Url: https://codereview.chromium.org/1930103003
 2016-04-29 08:46:41 -07:00
bsalomon
3de75da6d2 Use constexpr constructors of GrStencilSettings rather than hacky macro system. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933053002

Review-Url: https://codereview.chromium.org/1933053002
 2016-04-29 08:44:16 -07:00
bungeman
b4d46f03db Remove skstd::is_function. 
The VC++ STL with 2015u2 now provides a complete std::is_function.
Also, Skia is no longer using skstd::is_function.

Review-Url: https://codereview.chromium.org/1929343002
 2016-04-29 08:27:14 -07:00
djsollen
affacce4c6 Require Android SDK copy of CMake to build Vulkan on Android. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930423002

Review-Url: https://codereview.chromium.org/1930423002
 2016-04-29 08:09:43 -07:00
jvanverth
cfeb85fa6a Revert of Adjust tolerance to fix bezier glitches issue (patchset #1 id:1 of https://codereview.chromium.org/1926063002/ ) 
Reason for revert:
This is causing undesirable image failures in a large number of Skia GMs.

Original issue's description:
> Adjust tolerance to fix bezier glitches issue
>
> In a previous CL: https://codereview.chromium.org/1126793003, the value
> of gDegenerateToLineTol was changed from 1.0 to 0.25 which caused the
> bezier glitches.
>
> This CL changes the value to SK_ScalarRoot2Over2, with this change the
> bezier curve looks fine, and the result of the layout tests pointed out
> in this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=472847
> is also reasonable.
>
> BUG=605439
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926063002
>
> Committed: https://skia.googlesource.com/skia/+/45a6f49ef9ff276e08025d0d2ba6a821a96d3f34

TBR=robertphillips@google.com,xidachen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=605439

Review-Url: https://codereview.chromium.org/1933733002
 2016-04-29 07:38:10 -07:00
bungeman
7ae5627be2 Update running Chromium trybots on Skia CLs docs. 
NOTRY=true
DOCS_PREVIEW= https://skia.org/?cl=1930773005

Review-Url: https://codereview.chromium.org/1930773005
 2016-04-29 07:08:12 -07:00
bsalomon
5668648e87 Unify implementations of stroking radius calculationsns 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1928133002

Review-Url: https://codereview.chromium.org/1928133002
 2016-04-29 07:07:03 -07:00
robertphillips
24e9128694 Add sk_sp to SkSurface_Gpu and SkGpuDevice 
Split off of https://codereview.chromium.org/1930013002/ ((Mostly) Retract GrRenderTarget from SkGpuDevice)

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

Review-Url: https://codereview.chromium.org/1925803004
 2016-04-29 06:46:36 -07:00
djsollen
efe46d2094 Repurpose Release_Developer BUILDTYPE and remove SK_DEVELOPER. 
The Release_Developer build type is now used to build Skia with
release level optimizations but still enable SK_DEBUG. This in turn
means that SkASSERTS and SkRTConf are available in this mode.

Further we can then remove SK_DEVELOPER as a define as it is true
iff SK_DEBUG is true.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1931903002
DOCS_PREVIEW= https://skia.org/?cl=1931903002

Review-Url: https://codereview.chromium.org/1931903002
 2016-04-29 06:41:35 -07:00
kkinnunen
fe635fd76b 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.

The test contains disabled code. The
MakeFromBackendTextureAsRenderTarget does not copy the existing texture
contents to the FBO render buffer.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924183003

Review-Url: https://codereview.chromium.org/1924183003
 2016-04-29 06:41:29 -07:00
borenet
219ac2bc09 Whitespace change to test bots 
NOTREECHECKS=true
TBR=rmistry
BUG=skia:4763
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1936543002

Review-Url: https://codereview.chromium.org/1936543002
 2016-04-29 06:25:47 -07:00
xidachen
45a6f49ef9 Adjust tolerance to fix bezier glitches issue 
In a previous CL: https://codereview.chromium.org/1126793003, the value
of gDegenerateToLineTol was changed from 1.0 to 0.25 which caused the
bezier glitches.

This CL changes the value to SK_ScalarRoot2Over2, with this change the
bezier curve looks fine, and the result of the layout tests pointed out
in this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=472847
is also reasonable.

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

Review-Url: https://codereview.chromium.org/1926063002
 2016-04-28 18:25:25 -07:00
robertphillips
4df1656f0f Tighten up SkSpecialSurface factory functions 
This is split out of https://codereview.chromium.org/1930013002/ ((Mostly) Retract GrRenderTarget from SkGpuDevice)

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

Review-Url: https://codereview.chromium.org/1925313002
 2016-04-28 15:09:34 -07:00
robertphillips
175dd9b5e3 Clean up test drawContext usage 
The general idea is to provide access to SkGpuDevice's drawContext rather than its GrRenderTarget. That is usually what the testing framework actually wants.

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

Review-Url: https://codereview.chromium.org/1930623003
 2016-04-28 14:32:04 -07:00
bungeman
801b44c453 Remove skstd::is_convertible. 
We should now be able to use std::is_convertible.

TBR=reed@google.com
This doesn't change any API, just where we get a type trait from.

Review-Url: https://codereview.chromium.org/1931003002
 2016-04-28 11:18:07 -07:00
mtklein
d1adec1870 Update Win toolchain 
I believe this now correctly updates us to VS 2015 update 2.

CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Win-MSVC-x86-Debug-VS2015-Trybot

https://isolateserver.appspot.com/browse?namespace=default-gzip&digest=3c710fd7f4df8ec24fde62681536fad21be2751c

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

Review-Url: https://codereview.chromium.org/1926813007
 2016-04-28 11:02:36 -07:00
robertphillips
d4c741e3d0 Refactor drawContext/RenderTarget creation 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1914883002

Committed: https://skia.googlesource.com/skia/+/2f1c42e8448bbbadeb3df1c626faa90aa33f8907

Review-Url: https://codereview.chromium.org/1914883002
 2016-04-28 09:55:15 -07:00
msarett
23bd7e9273 Delete unused code from SkColorSpace 
IMO, a lot of this code reflects an oversimplified view of
handling color profiles.  And a lot of this code is valid
math/checks/enums that we will eventually need.

Right now, it's all unused and is adding a bit of clutter
and confusion as I try to redesign this object.  I think
it makes sense to start simpler and build this back up as
necessary.

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

Review-Url: https://codereview.chromium.org/1932743002
 2016-04-28 09:50:12 -07:00
msarett
85def2e067 Parse A2B0 tag on ICC profiles 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1925753002

Review-Url: https://codereview.chromium.org/1925753002
 2016-04-28 09:36:34 -07:00
borenet
8795962baf Stop printing warnings about ADB version 
BUG=skia:5156
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927973002

Review-Url: https://codereview.chromium.org/1927973002
 2016-04-28 09:31:38 -07:00
reed
d77ac77924 remove (now unused) SkDivBits 
needs https://codereview.chromium.org/1927823002/ to land first

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

Review-Url: https://codereview.chromium.org/1925913002
 2016-04-28 09:31:31 -07:00
bsalomon
5e410b4a68 Detect empty (r)rects in GrShape. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1929643002

Review-Url: https://codereview.chromium.org/1929643002
 2016-04-28 09:30:46 -07:00
egdaniel
dd97b8585a Fix vulkan build on linux and android 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1921963003

Review-Url: https://codereview.chromium.org/1921963003
 2016-04-28 09:30:39 -07:00
reed
28d5bdd97e Revert of Repurpose Release_Developer BUILDTYPE and remove SK_DEVELOPER. (patchset #2 id:20001 of https://codereview.chromium.org/1927583002/ ) 
Reason for revert:
still blocking DEPS roll

Original issue's description:
> Repurpose Release_Developer BUILDTYPE and remove SK_DEVELOPER.
>
> The Release_Developer build type is now used to build Skia with
> release level optimizations but still enable SK_DEBUG. This in turn
> means that SkASSERTS and SkRTConf are available in this mode.
>
> Further we can then remove SK_DEVELOPER as a define as it is true
> iff SK_DEBUG is true.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927583002
> DOCS_PREVIEW= https://skia.org/?cl=1927583002
>
> Committed: https://skia.googlesource.com/skia/+/48d6f88479e72efaf9b9d8f9c0769acb1ba773db

TBR=bungeman@gmail.com,bungeman@google.com,benjaminwagner@google.com,djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/1918253006
 2016-04-28 08:12:55 -07:00
reed
9fbee8408e Revert of fix build by using ifdef instead of if for SK_DEBUG (patchset #1 id:1 of https://codereview.chromium.org/1924943003/ ) 
Reason for revert:
need to revert main change for now

Original issue's description:
> fix build by using ifdef instead of if for SK_DEBUG
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1924943003
>
> TBR=
> NOTRY=True
>
> Committed: https://skia.googlesource.com/skia/+/b8498825b54718cdd90c30c39323cfc433695f23

TBR=djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/1927113002
 2016-04-28 08:11:51 -07:00
robertphillips
aa19a5fbc5 Revert of Refactor drawContext/RenderTarget creation (patchset #8 id:140001 of https://codereview.chromium.org/1914883002/ ) 
Reason for revert:
Experimental revert to see if this is blocking the DEPS roll.

Original issue's description:
> Refactor drawContext/RenderTarget creation
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1914883002
>
> Committed: https://skia.googlesource.com/skia/+/2f1c42e8448bbbadeb3df1c626faa90aa33f8907

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

Review-Url: https://codereview.chromium.org/1929833004
 2016-04-28 06:21:55 -07:00