AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,362 Commits 1 Branch 0 Tags 544 MiB
ad6477d02a
Commit Graph

8362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
djsollen@google.com
6a6c80c6e3 Enable SkUtilsArm on all ARM platforms and always use NDK compliant NEON detection on Android. 
R=scroggo@google.com

Review URL: https://codereview.chromium.org/22193002

git-svn-id: http://skia.googlecode.com/svn/trunk@10530 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 13:38:28 +00:00
commit-bot@chromium.org
1a165aa485 Actually flush the path stencil transform when the matrix changes 
Fixes many tests to match the master gm more closely. Examples of fixes:
mixed_xfermodes, strokes_poly, gradients_view_perspective, strokes_round,
... .

Total 58 differing results.

BUG=1479
R=bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/22176002

git-svn-id: http://skia.googlecode.com/svn/trunk@10529 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 13:30:59 +00:00
commit-bot@chromium.org
19dd017a62 Fix a crash on stroking empty paths with nv_path_rendering enabled 
Fix the crash by defining that GrPathRenderer::drawPath and
GrPathRenderer::stencilPath are called only with non-empty paths.

Adds a new test "GpuDrawPath" and tests the condition.

BUG=1477
R=bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/22173002

git-svn-id: http://skia.googlecode.com/svn/trunk@10528 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 13:28:55 +00:00
commit-bot@chromium.org
a62efcc1e0 Avoid counting verbs twice in SkPath::isEmpty() 
Remove redundant call to SkPathRef::countVerbs. The intention was
probably to count points. Instead, assert that all two-verb paths
begin with a 'move' and that if the second verb is a 'line', then the
point count is indeed two.

BUG=1478
R=bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/22171002

git-svn-id: http://skia.googlecode.com/svn/trunk@10527 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-05 13:23:13 +00:00
commit-bot@chromium.org
7e5d18664b In preparation for make Chromium's skia.gyp use pdf.gypi. 
R=edisonn@google.com, djsollen@google.com

Author: robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/21952002

git-svn-id: http://skia.googlecode.com/svn/trunk@10526 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-04 15:09:23 +00:00
robertphillips@google.com
75217ab1eb N7 Performance trigger rebaselines 
(SkipBuildbotRuns)



git-svn-id: http://skia.googlecode.com/svn/trunk@10525 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-04 15:00:58 +00:00
epoger@google.com
2a192a8577 Delete image-based rebaselining tool; we have switched to checksums 
R=borenet@google.com

Review URL: https://codereview.chromium.org/21901004

git-svn-id: http://skia.googlecode.com/svn/trunk@10524 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 20:54:46 +00:00
edisonn@google.com
e2e01ffb94 pdfviewer: implementation of one type of pattern - simple tile patern, colored, with xstep and ystep positive. 
Review URL: https://codereview.chromium.org/21919003

git-svn-id: http://skia.googlecode.com/svn/trunk@10523 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 20:24:48 +00:00
bsalomon@google.com
48bc79194b correctly copy constant coverage from GrPaint to GrDrawState 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/21924006

git-svn-id: http://skia.googlecode.com/svn/trunk@10522 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 19:54:28 +00:00
commit-bot@chromium.org
0837bcdafd Adds poppler and dependencies to DEPS. This is a pre-CL for 20220002, and getting DEPS committed first is necessary to get the trybots to run on the larger CL (since the trybots do 'gclient sync' before patching). 
R=vandebo@chromium.org, edisonn@google.com, djsollen@chromium.org, bungeman@chromium.org, djsollen@google.com

Author: richardlin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/21945002

git-svn-id: http://skia.googlecode.com/svn/trunk@10521 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 19:10:06 +00:00
epoger@google.com
12b0fa558f Create AJAX live-viewer of expected-vs-actual GM results 
R=zachr@google.com

Review URL: https://codereview.chromium.org/20526007

git-svn-id: http://skia.googlecode.com/svn/trunk@10520 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 19:08:52 +00:00
scroggo@google.com
65e508d0b1 Restore a default timer to bench_pictures. 
https://codereview.chromium.org/19862002 removed the default timer
to display from PictureBenchmark. Restore a default by putting it
in the flag description.

R=mtklein@google.com

Review URL: https://codereview.chromium.org/21567005

git-svn-id: http://skia.googlecode.com/svn/trunk@10516 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 16:09:10 +00:00
zachr@google.com
a479aa1366 fix skpdiff viewer bug when using relative paths 
BUG=skia:1463
R=djsollen@google.com

Review URL: https://codereview.chromium.org/21601002

git-svn-id: http://skia.googlecode.com/svn/trunk@10515 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:54:30 +00:00
sugoi@google.com
89066e5cd5 Removed duplicate file 
BUG=

Review URL: https://codereview.chromium.org/21890003

git-svn-id: http://skia.googlecode.com/svn/trunk@10514 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:45:41 +00:00
junov@chromium.org
44324fae1c Fixing SkDeferredCanvas::writePixels to trigger appropriate change notifications to SkSurface 
BUG=crbug.com/256269
TEST=DeferredCanvas unit test, TestDeferredCanvasWritePixelsToSurface
R=reed@google.com

Review URL: https://codereview.chromium.org/20628005

git-svn-id: http://skia.googlecode.com/svn/trunk@10513 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:36:02 +00:00
commit-bot@chromium.org
b6c79859a1 Add nv_path_rendering entry points to Unix GLInterface 
Add nv_path_rendering entry points to Unix GLInterface.
Also add few other GL entry points that are used by nv_path_rendering
codepaths.

BUG=1468
R=bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/21808003

git-svn-id: http://skia.googlecode.com/svn/trunk@10512 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:19:40 +00:00
commit-bot@chromium.org
db5460bb79 add remote debugging support for x86 phone 
R=djsollen@google.com, borenet@google.com

Author: yunchao.he@intel.com

Review URL: https://chromiumcodereview.appspot.com/19920003

git-svn-id: http://skia.googlecode.com/svn/trunk@10511 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 15:14:24 +00:00
bsalomon@google.com
aade2e1e19 Add fullscreen rect bench 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/21592002

git-svn-id: http://skia.googlecode.com/svn/trunk@10510 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 14:39:25 +00:00
commit-bot@chromium.org
fde1e7ccb4 Support MSAA in the picture debugger 
Add radio buttons for setting the GL sample count to 0 ("off"), 4 or
16.

Change the default mode of the GL widget to MSAA4. Previous behavior
corresponded to "off".

BUG=1459
R=robertphillips@google.com

Author: kkinnunen@nvidia.com

Review URL: https://chromiumcodereview.appspot.com/21752002

git-svn-id: http://skia.googlecode.com/svn/trunk@10509 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 13:59:50 +00:00
skia.committer@gmail.com
bd74add1dc Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10503 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 07:00:59 +00:00
bungeman@google.com
febfd70d26 Add onRefMatchingStyle to SkFontHost_linux. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10502 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-02 00:20:34 +00:00
bungeman@google.com
5ecd4fac89 Fix SkTMin call introduced in 10500 which fails on some platforms. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10501 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 22:48:21 +00:00
bungeman@google.com
ddc218e508 Implement onGetTableTags and onGetTableData on Windows. 
Implements these and removes default implementation, making the
declaration in SkTypeface pure virtual.

Review URL: https://codereview.chromium.org/20672004

git-svn-id: http://skia.googlecode.com/svn/trunk@10500 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 22:29:43 +00:00
commit-bot@chromium.org
35a20a16dd Fix memory leak in SkPDFResourceDict 
R=vandebo@chromium.org, edisonn@google.com

Author: richardlin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/20655004

git-svn-id: http://skia.googlecode.com/svn/trunk@10499 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 21:54:26 +00:00
edisonn@google.com
276fed9e0a pdfviewer: debug the parameters for snc, and for resolveReference 
Review URL: https://codereview.chromium.org/21604003

git-svn-id: http://skia.googlecode.com/svn/trunk@10498 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 21:20:47 +00:00
bungeman@google.com
397a9546e4 Reintroduce default impls removed in 10495. 
Due to poor placement of overrides in the hierarchy, nacl is failing.


git-svn-id: http://skia.googlecode.com/svn/trunk@10497 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 21:01:28 +00:00
bungeman@google.com
b10b51f64d Implement onGetTableTags and onGetTableData on Windows. 
Implements these and removes default implementation, making the
declaration in SkTypeface pure virtual.

Review URL: https://codereview.chromium.org/20672004/


git-svn-id: http://skia.googlecode.com/svn/trunk@10495 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 20:18:41 +00:00
edisonn@google.com
9a43c18740 pdfviewer: finish implementation of SkPdfObject.toString(), and include in debugging traces we leave when rendering. 
Review URL: https://codereview.chromium.org/20628008

git-svn-id: http://skia.googlecode.com/svn/trunk@10494 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 20:06:42 +00:00
djsollen@google.com
24202c7a9a Revert "Don't call SkGpuDevice::drawVertices from drawPoints when AA is required." 
This reverts commit r10489.

Review URL: https://codereview.chromium.org/21496003

git-svn-id: http://skia.googlecode.com/svn/trunk@10492 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 18:36:08 +00:00
senorblanco@chromium.org
70c54b1a88 New baselines for imagefiltersgraph GM after r10482. 
TBR=djsollen
BUG=

Review URL: https://codereview.chromium.org/20938004

git-svn-id: http://skia.googlecode.com/svn/trunk@10491 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 18:33:03 +00:00
commit-bot@chromium.org
74f96b9c4c Added 3-color gradient scraper for detecting symmetrical gradients. 
Made changes to lua to scrape info about 3 color gradients

BUG=
R=reed@google.com

Author: dierk@google.com

Review URL: https://chromiumcodereview.appspot.com/21571002

git-svn-id: http://skia.googlecode.com/svn/trunk@10490 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 17:32:56 +00:00
commit-bot@chromium.org
c048de0162 Don't call SkGpuDevice::drawVertices from drawPoints when AA is required. 
R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/12943007

git-svn-id: http://skia.googlecode.com/svn/trunk@10489 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 17:30:32 +00:00
egdaniel@google.com
3f2a2d5fdc Add Loop Blinn hairline conics to GPU 
BUG=
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/21036008

git-svn-id: http://skia.googlecode.com/svn/trunk@10487 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 17:09:11 +00:00
commit-bot@chromium.org
7fb83c8c72 When skia run bench cases to test performance, it will run constructors for all cases one by one, then getName to skip unnecessary cases according to command line parameters, so these constructors should be lightweight enough to avoid redundant computing. Unfortunately, some constructors contain intensive computing/rendering. They are very heavy, maybe much heavier than need-to-run bench case itself. And these redundant computation will be run every time you run bench, even you just test a single simple case. Moreover, it will mislead the real hotspot/bottleneck of the case itself. 
For example, run a lightweight case, say, region_intersectsrgn_16, the hot spots are gles operation, SuperBlitter, SkRTree... introduced by irrelevant cases' constructors. These redundant computation will mislead performance tuning. 
So we can move these intensive computation to onPreDraw() of these case. They will be executed only if this case should be run.

R=reed@google.com, robertphillips@google.com, humper@google.com, tomhudson@chromium.org

Author: yunchao.he@intel.com

Review URL: https://chromiumcodereview.appspot.com/20997003

git-svn-id: http://skia.googlecode.com/svn/trunk@10486 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 15:58:07 +00:00
reed@google.com
ab44a17f37 stub support for SK_FONTHOST_USES_FONTMGR 
BUG=

Review URL: https://codereview.chromium.org/21563002

git-svn-id: http://skia.googlecode.com/svn/trunk@10485 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 15:53:39 +00:00
commit-bot@chromium.org
62df526042 Make SkPath::conservativelyContainsRect not assert on paths that begin with repeated moveTos 
R=reed@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/21565002

git-svn-id: http://skia.googlecode.com/svn/trunk@10484 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 15:35:06 +00:00
scroggo@google.com
d4c3565aac Fixes for JPEG subset decoding. 
Ensure that the stream passed to JPEG for subset decoding is
neither deleted before it is no longer needed nor deleted an
extra time.

src/images/SkJpegUtility.h:
src/images/SkJpegUtility.cpp:
Always ref and unref the stream provided to skjpeg_source_mgr.
Add some comments explaining how skjpeg_source_mgr's members
handle ownership.
Fix a warning comparing signed and unsigned numbers, converting
to size_t which is more appropriate for measuring bytes.
Remove dead code referring to fMemoryBase and fMemoryBaseSize,
which are never used.

src/images/SkImageDecoder_libjpeg.cpp:
Call the new constructor for skjpeg_source_mgr, which no longer
takes a boolean to determine ownership.

include/images/SkBitmapRegionDecoder.h
src/images/SkBitmapRegionDecoder.cpp:
This small shim has been removed, since it is not needed to use
Skia's image decoders. Its functionality will be folded into
Android.

Required for the merge to Android.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/21561002

git-svn-id: http://skia.googlecode.com/svn/trunk@10483 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 15:03:42 +00:00
senorblanco@chromium.org
350b4d50ea Remove SkBlendImageFilter, and all tests. Its functionality has been subsumed by SkXfermodeImageFilter. 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/21404002

git-svn-id: http://skia.googlecode.com/svn/trunk@10482 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 14:59:05 +00:00
commit-bot@chromium.org
8743b8f2a5 Mark GrMemoryPool methods as static. 
R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/21553002

git-svn-id: http://skia.googlecode.com/svn/trunk@10481 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 14:23:33 +00:00
commit-bot@chromium.org
1fdc677428 ARM Skia NEON patches - 14 - S32A_Blend 
Blitrow32: S32A_Blend new NEON version

Adding a NEON version of S32A_Blend_BlitRow32. Here are the
benchmark results:

+-------+--------------------------+--------------------------+
|       |      Speedup vs. C       |    Speedup vs. ARM asm   |
| count +------------+-------------+------------+-------------+
|       | Cortex A-9 | Cortex A-15 | Cortex A-9 | Cortex A-15 |
+-------+------------+-------------+------------+-------------+
| 1     | +8,5%      | +18,5%      | +0.9%      | +2,9%       |
+-------+------------+-------------+------------+-------------+
| 2     | +65,6%     | +94%        | +70,3%     | +80%        |
+-------+------------+-------------+------------+-------------+
| 4     | +42,4%     | +87,8%      | +56,8%     | +84,4%      |
+-------+------------+-------------+------------+-------------+
| 8     | +30%       | +90%        | +49,9%     | +82,7%      |
+-------+------------+-------------+------------+-------------+
| 16    | +23,1%     | +95,4%      | +46,6%     | +87,6%      |
+-------+------------+-------------+------------+-------------+
| 64    | +23,1%     | +95,7%      | +46,1%     | +89,4%      |
+-------+------------+-------------+------------+-------------+
| 256   | +35,5%     | +122%       | +53,6%     | +99,2%      |
+-------+------------+-------------+------------+-------------+
| 1024  | +61,8%     | +101%       | +64,2%     | +91,2%      |
+-------+------------+-------------+------------+-------------+

BUG=
R=djsollen@google.com

Author: kevin.petit.arm@gmail.com

Review URL: https://chromiumcodereview.appspot.com/18614010

git-svn-id: http://skia.googlecode.com/svn/trunk@10480 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 14:23:23 +00:00
edisonn@google.com
251176ebe9 pdfviewer: remove simple implementation for non-isolated groups. will be implemented in skia most probably. also it is not generated by SkPDFDevice 
Review URL: https://codereview.chromium.org/21537003

git-svn-id: http://skia.googlecode.com/svn/trunk@10479 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 13:24:00 +00:00
robertphillips@google.com
34a3e9b531 N7 performance trigger rebaselines 
(SkipBuildbotRuns)



git-svn-id: http://skia.googlecode.com/svn/trunk@10478 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 12:08:58 +00:00
skia.committer@gmail.com
5d4b7733ae Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10477 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-01 07:01:05 +00:00
commit-bot@chromium.org
92ffe7d10e Inverse fill support in PDF 
BUG= https://code.google.com/p/skia/issues/detail?id=241 (partial fix)
R=edisonn@google.com, vandebo@chromium.org, reed@google.com

Author: richardlin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19519017

git-svn-id: http://skia.googlecode.com/svn/trunk@10476 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 22:54:31 +00:00
senorblanco@chromium.org
1958e912e1 New baselines for imagefilterscropped. 
TBR=robertphillips
BUG=

Review URL: https://codereview.chromium.org/21340005

git-svn-id: http://skia.googlecode.com/svn/trunk@10475 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 20:21:50 +00:00
mtklein@google.com
d9d5c05b50 Enable runtime checks for SSSE3 on x86 on Android. 
$ compare-android.sh bench --match bitmap_ --repeat 30
master -> ssse3
N=30 p=0.001000 (corrected to 0.000033)
sig?  speedup  bench
  n    -1.16%  bitmap_scale_filter_256_64
  y    -0.72%  bitmap_8888_A_scale_bicubic
  y    -0.21%  bitmap_index8_A
  n    -0.00%  bitmap_565
  n    -0.00%  bitmap_scale_filter_90_80
  n     0.03%  bitmap_8888_A_source_transparent
  y     0.06%  bitmap_index8
  y     0.30%  bitmap_8888_A_source_stripes_two
  n     0.34%  bitmap_scale_filter_80_90
  y     0.42%  bitmap_8888_A
  y     0.44%  bitmap_8888_A_source_opaque
  n     0.53%  bitmap_scale_filter_90_10
  y     0.71%  bitmap_8888_A_source_stripes_three
  y     0.91%  bitmap_8888_A_scale_rotate_bicubic
  y     1.04%  bitmap_8888_update
  n     1.19%  bitmap_scale_filter_10_90
  n     1.39%  bitmap_scale_filter_90_90
  y     1.77%  bitmap_8888_update_volatile
  y     1.89%  bitmap_8888
  y     2.37%  bitmap_scale_filter_30_90
  y     9.57%  bitmap_scale_filter_64_256
  n    17.86%  bitmap_scale_filter_90_30
  y    25.40%  bitmap_8888_A_scale_rotate_bilerp
  y    27.19%  bitmap_8888_scale_rotate_bilerp
  y    27.23%  bitmap_8888_update_scale_rotate_bilerp
  y    27.29%  bitmap_8888_update_volatile_scale_rotate_bilerp
  y    55.08%  bitmap_8888_A_scale_bilerp
  y    58.75%  bitmap_8888_update_volatile_scale_bilerp
  y    58.90%  bitmap_8888_scale_bilerp
  y    58.92%  bitmap_8888_update_scale_bilerp
Overall speedup: 10.52%

BUG=skia:1111
R=djsollen@google.com

Review URL: https://codereview.chromium.org/21203005

git-svn-id: http://skia.googlecode.com/svn/trunk@10474 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 20:09:25 +00:00
commit-bot@chromium.org
55fd612adf Committed: http://code.google.com/p/skia/source/detail?r=10372 
R=borenet@google.com, bungeman@google.com, robertphillips@google.com, scroggo@google.com, sglez@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/19862002

git-svn-id: http://skia.googlecode.com/svn/trunk@10473 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 20:00:56 +00:00
reed@google.com
65a629ab33 Revert "Revert "Revert "try enabling FONTHOST_USES_FONTMGR and see what breaks""" 
This reverts commit d0a1a568ac5d5c2ed94e826e91b01241de2ca0ce.

git-svn-id: http://skia.googlecode.com/svn/trunk@10472 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 19:36:07 +00:00
reed@google.com
699c06e2f5 Revert "Revert "try enabling FONTHOST_USES_FONTMGR and see what breaks"" 
This reverts commit a8946cf4180908d577681cb62d621db0ebcbe67e.

i.e. reapply the change to try enabling FONTHOST_USES_FONTMGR

git-svn-id: http://skia.googlecode.com/svn/trunk@10471 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 19:00:30 +00:00
bsalomon@google.com
f3f2d1619e set nominmax on windows 
R=scroggo@google.com

Review URL: https://codereview.chromium.org/20990007

git-svn-id: http://skia.googlecode.com/svn/trunk@10470 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-31 18:52:31 +00:00