Commit Graph

17705 Commits

Author SHA1 Message Date
bungeman
08d171445b Remove SK_FREETYPE_HAS_MM.
The SK_FREETYPE_HAS_MM define was added to delay the changes to
support GX variation fonts on platforms which did not compile ftmm.c
into their FreeType build. Now that all builds should have this file
the define can be removed.

Committed: https://skia.googlesource.com/skia/+/4f61fee53af956a8beb4c56fa6479cb6b1aa5159

Review URL: https://codereview.chromium.org/1143133006
2015-06-03 12:58:40 -07:00
joshualitt
ce09a28d0c Reenable reordering
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1160063003
2015-06-02 13:48:38 -07:00
cdalton
1acea86914 Begin tracking driver info in GrGLContextInfo
BUG=skia:

Review URL: https://codereview.chromium.org/1165463005
2015-06-02 13:05:52 -07:00
borenet
5aa5ea3831 Add adb_wait_for_device script
BUG=skia:3718

Review URL: https://codereview.chromium.org/1149163003
2015-06-02 12:38:16 -07:00
junov
d26c9fa66c Fixing leaky handling of SkImage in SkDeferredCanvas.
Long lived SkImageHeap objects currently accumulate refs indefinitely.
This leads to massive memory leaks in the gpu-accelerated 2D canvas
code path. This CL does not implement a general fix for SkGPipe, but
it resolves the leak in SkDeferredCanvas (currently the only user
of SkGPipe) by resetting the image heap when the deferral queue is
flushed. This change also fixes the accounting of bytes allocated
by referenced images in order to trigger flushing heuristics
appropriately.

BUG=crbug.com/494148

Review URL: https://codereview.chromium.org/1145893007
2015-06-02 11:47:45 -07:00
robertphillips
a66cc7e1e0 Revert of Fix dst bound reported by SkTileImageFilter (patchset #3 id:40001 of https://codereview.chromium.org/1152553006/)
Reason for revert:
breaking tests

Original issue's description:
> Fix dst bound reported by SkTileImageFilter
>
> In the example from the bug we had the filter DAG:
>
> color filter (table)
>     0: xfermode filter (arith)
>         0: tile filter [0,80,34,114] -> [0,80,800,480]
>              0: color filter (table)
>                  0: bitmap src 34x34 -> [0,80,34,114]
>         1: color filter (table)
>              0: picture filter [0, 80, 800, 480]
>
> computeFastBounds was coming out of the DAG with a bound of [0,80,34,114] which didn't represent the pixels that would be drawn.
>
> This CL updates SkTileImageFilter to correctly set the bound for the pixels it will hit.
>
> BUG=493783
>
> Committed: https://skia.googlesource.com/skia/+/05be93bbdf09576f7903130e3b106b0a8c7c4b4e

TBR=reed@google.com,senorblanco@google.com,senorblanco@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=493783

Review URL: https://codereview.chromium.org/1143083006
2015-06-02 10:57:26 -07:00
robertphillips
05be93bbdf Fix dst bound reported by SkTileImageFilter
In the example from the bug we had the filter DAG:

color filter (table)
    0: xfermode filter (arith)
        0: tile filter [0,80,34,114] -> [0,80,800,480]
             0: color filter (table)
                 0: bitmap src 34x34 -> [0,80,34,114]
        1: color filter (table)
             0: picture filter [0, 80, 800, 480]

computeFastBounds was coming out of the DAG with a bound of [0,80,34,114] which didn't represent the pixels that would be drawn.

This CL updates SkTileImageFilter to correctly set the bound for the pixels it will hit.

BUG=493783

Review URL: https://codereview.chromium.org/1152553006
2015-06-02 10:52:43 -07:00
reed
91284caa23 check (runtime) for null-pixels even when lock succeeds
BUG=492818
TBR=

Review URL: https://codereview.chromium.org/1159953006
2015-06-02 10:47:42 -07:00
cdalton
1fa4572d1a Update XPF invariant info to not account for conflation
Renames getInvariantOutput to getInvariantBlendedColor on GrXPFactory
and redefines it to not account for coverage conflation. This is the
information that all the callsites actually wanted to know.

BUG=skia:

Review URL: https://codereview.chromium.org/1161273005
2015-06-02 10:43:39 -07:00
joshualitt
d58d74ab58 whitespace change to trigger android bots
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1160853005
2015-06-02 10:35:04 -07:00
joshualitt
5cd95c61cb whitespace change to trigger android bots
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1164813002
2015-06-02 10:10:28 -07:00
joshualitt
995594b4a0 disable reordering until android bots clear up
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1167693006
2015-06-02 09:10:31 -07:00
joshualitt
cee72b071e whitespace change to get android bots to cycle
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1155293008
2015-06-02 08:12:08 -07:00
joshualitt
09a486e270 fix dm crash
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1149243006
2015-06-02 07:26:43 -07:00
joshualitt
5c7dfeecb2 re-enable reordering
BUG=skia:

Review URL: https://codereview.chromium.org/1164763002
2015-06-02 07:09:31 -07:00
reed
c657b6932b Revert of Remove SK_FREETYPE_HAS_MM. (patchset #1 id:1 of https://codereview.chromium.org/1143133006/)
Reason for revert:
seems to be breaking DEPS roll

FAILED: /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -shared -Wl,--fatal-warnings -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -fuse-ld=gold -Wl,--no-undefined -Wl,--exclude-libs=libgcc.a -Wl,--exclude-libs=libc++_static.a -Wl,--exclude-libs=libvpx_assembly_arm.a -Wl,--icf=safe -Wl,--warn-shared-textrel -nostdlib --sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm  -Wl,--warn-shared-textrel -Wl,-O1 -Wl,--gc-sections -Wl,--as-needed -Wl,--version-script=/b/build/slave/android_chromium_gn/build/src/build/android/android_no_jni_exports.lst -L../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a -o ./libskia.so -Wl,-soname=libskia.so @./libskia.so.rsp && { /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf -d ./libskia.so | grep SONAME ; /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm -gD -f p ./libskia.so | cut -f1-2 -d' '; } > ./libskia.so.tmp && if ! cmp -s ./libskia.so.tmp ./libskia.so.TOC; then mv ./libskia.so.tmp ./libskia.so.TOC; fi && mkdir -p lib.stripped && ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip --strip-unneeded -o lib.stripped/libskia.so.tmp libskia.so && if ! cmp -s lib.stripped/libskia.so.tmp lib.stripped/libskia.so; then mv lib.stripped/libskia.so.tmp lib.stripped/libskia.so; fi
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:283: error: undefined reference to 'FT_Get_MM_Var'
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:302: error: undefined reference to 'FT_Set_Var_Design_Coordinates'
../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:1766: error: undefined reference to 'FT_Get_MM_Var'
collect2: error: ld returned 1 exit status

Original issue's description:
> Remove SK_FREETYPE_HAS_MM.
>
> The SK_FREETYPE_HAS_MM define was added to delay the changes to
> support GX variation fonts on platforms which did not compile ftmm.c
> into their FreeType build. Now that all builds should have this file
> the define can be removed.
>
> Committed: https://skia.googlesource.com/skia/+/4f61fee53af956a8beb4c56fa6479cb6b1aa5159

TBR=djsollen@google.com,bungeman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1148303005
2015-06-01 18:40:52 -07:00
joshualitt
8b08159aa7 Fix for crashing bots
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1159183006
2015-06-01 16:17:03 -07:00
joshualitt
e5b74c6856 Set GeometryBufferMapThreshold defaults
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1161543003
2015-06-01 14:17:47 -07:00
reed
933d9863dd suppress chatty warning about Funkster.ttf not be supported (on mac at least)
BUG=skia:

Review URL: https://codereview.chromium.org/1146273003
2015-06-01 12:51:24 -07:00
bungeman
4f61fee53a Remove SK_FREETYPE_HAS_MM.
The SK_FREETYPE_HAS_MM define was added to delay the changes to
support GX variation fonts on platforms which did not compile ftmm.c
into their FreeType build. Now that all builds should have this file
the define can be removed.

Review URL: https://codereview.chromium.org/1143133006
2015-06-01 12:05:23 -07:00
bsalomon
6df86409ca Revert "Revert of Move copy-surface-as-draw fallback to GrGLGpu. (patchset #12 id:220001 of https://codereview.chromium.org/1144433002/)"
This reverts commit 404b3b264b.

Review URL: https://codereview.chromium.org/1161063003
2015-06-01 10:41:49 -07:00
bsalomon
0513c83e0f Fix NULL access
BUG=skia:

TBR=egdaniel@google.com

Review URL: https://codereview.chromium.org/1157363004
2015-06-01 10:22:48 -07:00
caryclark
c00e1dd93d another double square
This is also a case where the square term is passed to a helper
function that squares the error term a second time.

R=reed@google.com
BUG=skia:3877

Review URL: https://codereview.chromium.org/1152623005
2015-06-01 10:21:31 -07:00
joshualitt
7fe8ee4cb7 Expand VisualBench to a real benching tool
BUG=skia:

Review URL: https://codereview.chromium.org/1159213002
2015-06-01 10:03:55 -07:00
nodir
038b01c081 /infra directory
Added /infra directory, it will contain chrome-infra specific files, in
particular configs for chrome infra services.

/infra/project-config/cr-buildbucket.cfg defines buckets on
cr-buildbucket.appspot.com

R=borenet@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1164633002
2015-06-01 09:39:11 -07:00
caryclark
1bfcaa4636 don't square error term twice
The cubic code erroneously passed the error square term to a function
which in turn squares the error term.

R=reed@google.com
BUG=skia:3877

Review URL: https://codereview.chromium.org/1163843003
2015-06-01 08:40:48 -07:00
bungeman
a35778ba32 Roll third_party/externals/gyp dd831fd:08429da
Summary of changes available at:
dd831fd..08429da

Review URL: https://codereview.chromium.org/1162453005
2015-06-01 07:25:18 -07:00
bsalomon
c59a1df655 Stretch small textures up to 16 pixels on PowerVR 54x
Review URL: https://codereview.chromium.org/1161183002
2015-06-01 07:13:42 -07:00
caryclark
c58e5326bb add res to stroke bench
R=reed@google.com

Review URL: https://codereview.chromium.org/1158183003
2015-06-01 06:30:06 -07:00
kkinnunen
cabe20cafd Refactor GrGpu path rendering functions to GrPathRendering
GrGpu, GrGLGpu, GrPathRendering, GrGLPathRendering all duplicated
each others' path rendering related member functions. Make
GrPathRending the logical extension of GrGpu by removing the methods
from GrGpu. Similarly to the GL variants.

Changes includes and forward declarations due to removing
GrDrawTarget.h include from GrGpu.h. This was necessary due to
GrDrawTarget.h including GrPathRendering.h, and now GrPathRendering.h
includes GrGpu.h. (Also GrGpu.h does not need GrDrawTarget.h anymore).

Very slight runtime improvement on x86_64:
             desk_fontwipe.skp_1	 836us ->  841us	1.01x
            desk_silkfinance.skp_1	2.01ms -> 2.01ms	1x
             desk_forecastio.skp_1	7.03ms -> 7.05ms	1x
                desk_weather.skp_1	3.74ms -> 3.74ms	1x
                desk_twitter.skp_1	8.02ms -> 8.01ms	1x
                 desk_mapsvg.skp_1	5.24ms -> 5.23ms	1x
            desk_pokemonwiki.skp_1	7.06ms -> 7.03ms	1x
                 desk_sfgate.skp_1	3.19ms -> 3.17ms	1x
           tabl_cuteoverload.skp_1	2.66ms -> 2.64ms	0.99x
...
           tabl_transformice.skp_1	3.06ms -> 2.98ms	0.98x
         tabl_googlecalendar.skp_1	11.3ms ->   11ms	0.97x
            tabl_gamedeksiam.skp_1	12.8ms -> 12.4ms	0.97x
               desk_samoasvg.skp_1	10.6ms -> 10.3ms	0.97x
           tabl_worldjournal.skp_1	4.44ms ->  4.3ms	0.97x

Review URL: https://codereview.chromium.org/1157683006
2015-06-01 01:37:27 -07:00
skia.buildbots
d772491274 Update SKP version
Automatic commit by the RecreateSKPs bot.

TBR=
NO_MERGE_BUILDS

Review URL: https://codereview.chromium.org/1155133003
2015-05-31 00:49:10 -07:00
reed
db74f62c7a Revert[6] of add asserts around results from requestLock
This reverts commit 11e833d91b.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1159183003
2015-05-30 13:41:15 -07:00
reed
11e833d91b Revert of Revert[4] of add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.org/1159733006/)
Reason for revert:
gfx_unittests (under linux_asan)

@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@Direct leak of 368 byte(s) in 1 object(s) allocated from:@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@    #0 0x4cc74b in __interceptor_malloc (/b/build/slave/linux_asan/build/src/out/Release/gfx_unittests+0x4cc74b)@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@    #1 0x7f2f7060ebdf in _cairo_image_surface_create_for_pixman_image /build/buildd/cairo-1.10.2/src/cairo-image-surface.c:158@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@Indirect leak of 256 byte(s) in 1 object(s) allocated from:@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@    #0 0x4cc74b in __interceptor_malloc (/b/build/slave/linux_asan/build/src/out/Release/gfx_unittests+0x4cc74b)@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@    #1 0x7f2f6c7be26a in _pixman_image_allocate /build/buildd/pixman-0.30.2/build/pixman/../../pixman/pixman-image.c:184@@@
@@@STEP_LOG_LINE@RenderTextTest.HarfBuzz_HorizontalPositions@@@@

I think they are creating a cairo surface, but it has no pixels (zero size?). In this CL, if I see no pixels, I ignore the call-back which is used to free the surface (doh).

Original issue's description:
> Revert[4] of add asserts around results from requestLock
>
> This reverts commit 19663e54c0.
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/df91b73a34e3a306c93a5e320704736255c3d9f0

TBR=reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1151063005
2015-05-30 09:20:29 -07:00
reed
df91b73a34 Revert[4] of add asserts around results from requestLock
This reverts commit 19663e54c0.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1159733006
2015-05-30 06:32:55 -07:00
reed
19663e54c0 Revert of add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.or… (patchset #1 id:1 of https://codereview.chromium.org/1165583005/)
Reason for revert:
failure in cc_unittests (need to diagnose)

@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@ResourceProviderTests/ResourceProviderTest.TransferInvalidSoftware/1 (run #1):@@@
@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@[ RUN      ] ResourceProviderTests/ResourceProviderTest.TransferInvalidSoftware/1@@@
@@@STEP_LOG_LINE@ResourceProviderTests_ResourceProviderTest.TransferInvalidSoftware_1@[17114:17114:0529/180822:15336467671:INFO:SkPixelRef.cpp(168)] ../../third_party/skia/src/core/SkPixelRef.cpp:168: failed assertion "pixels"@@@

Original issue's description:
> add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.org/1155403003/)"
>
> This reverts commit 3953d36041.
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/6980f5a96455c8062403c995a64b654a0e9a1319

TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1151573009
2015-05-29 18:36:07 -07:00
reed
6980f5a964 add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.org/1155403003/)"
This reverts commit 3953d36041.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1165583005
2015-05-29 15:46:36 -07:00
reed
3953d36041 Revert of add asserts around results from requestLock (patchset #3 id:40001 of https://codereview.chromium.org/1155403003/)
Reason for revert:
asserts in ui/gfx unittests (need to investigate why)

[ RUN      ] RenderTextTest.SelectionKeepsLigatures
[14602:14602:0529/134016:16779526944:INFO:SkPixelRef.cpp(164)] ../../third_party/skia/src/core/SkPixelRef.cpp:164: failed assertion "pixels"

Original issue's description:
> add asserts around results from requestLock and lockPixels, ensuring that true always means we have non-null pixels (and non-null colortable if that matches the colortype)
>
> BUG= 491975
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/f941a68126d8fe647eaea902c244c466568b7809

TBR=scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 491975

Review URL: https://codereview.chromium.org/1159013006
2015-05-29 14:22:05 -07:00
reed
f941a68126 add asserts around results from requestLock and lockPixels, ensuring that true always means we have non-null pixels (and non-null colortable if that matches the colortype)
BUG= 491975
TBR=

Review URL: https://codereview.chromium.org/1155403003
2015-05-29 11:39:14 -07:00
bsalomon
993a4216a6 SkImage::NewFromYUVTexturesCopy
Review URL: https://codereview.chromium.org/1149553002
2015-05-29 11:37:25 -07:00
bsalomon
4061b1262e Remove GrContext from GrDrawTarget
Still exists on clip target (for now).

Review URL: https://codereview.chromium.org/1166553002
2015-05-29 10:26:19 -07:00
bsalomon
edd77a112d Remove GrContext from GrClipMaskCache
Review URL: https://codereview.chromium.org/1144013007
2015-05-29 09:45:57 -07:00
bungeman
c4fba51ea6 Add Em test font.
This test font contains
☓ U+2613 SALTIRE
 U+2B1B BLACK LARGE SQUARE
 U+2B1C WHITE LARGE SQUARE
All at full EM size (with standard amount above and below the
baseline).

Review URL: https://codereview.chromium.org/1134153002
2015-05-29 08:42:21 -07:00
caryclark
ecaf9c9c21 use inline version of eval quad if tangent is not needed
R=reed@google.com

Review URL: https://codereview.chromium.org/1160163002
2015-05-29 08:11:16 -07:00
joshualitt
29f8679068 Removing GrAutoMalloc
BUG=skia:

Review URL: https://codereview.chromium.org/1161993003
2015-05-29 08:06:48 -07:00
bsalomon
7622863095 Add direct getter for GrCaps to GrContext.
TBR=joshualitt@google.com

Committed: https://skia.googlesource.com/skia/+/9138c46e572085870638b6f7ad7fcdfcdf3cac99

Review URL: https://codereview.chromium.org/1149773005
2015-05-29 08:02:10 -07:00
reed
ff2f423d90 add bench for building strokes
BUG=skia:

Review URL: https://codereview.chromium.org/1160093004
2015-05-29 07:17:16 -07:00
joshualitt
611cc5f964 delete experimental path renderers
BUG=skia:

Review URL: https://codereview.chromium.org/1160863006
2015-05-29 07:09:09 -07:00
joshualitt
7224c86632 add context override of GeometryBufferMapThreshold
BUG=skia:

Review URL: https://codereview.chromium.org/1159713006
2015-05-29 06:46:47 -07:00
reed
e800657f2f add assert that the pixelref really did success in requestlock
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1142343010
2015-05-28 14:06:06 -07:00
joshualitt
bd245426bb Revert of small CL to experiment with 'disabling' memory mapping (patchset #1 id:1 of https://codereview.chromium.org/1160003004/)
Reason for revert:
experiment complete

Original issue's description:
> small CL to experiment with 'disabling' memory mapping
>
> TBR=bsalomon@google.com
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/2e48e1514396b363ecd19372eab637b11bfb8a82

TBR=robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1159133004
2015-05-28 13:40:20 -07:00