diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 20:07:44 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 20:07:44 +0000 |
| commit | 6b9ed86c9e81937c07f78ca95ff3fb724bb254c8 (patch) | |
| tree | 6419cf7fa6aa072d7283b650a3dbcd3ce700182b /skia/skia_library.gypi | |
| parent | cea99f73d1e10018c2cc67c9bb10564b9448552f (diff) | |
| download | chromium_src-6b9ed86c9e81937c07f78ca95ff3fb724bb254c8.zip chromium_src-6b9ed86c9e81937c07f78ca95ff3fb724bb254c8.tar.gz chromium_src-6b9ed86c9e81937c07f78ca95ff3fb724bb254c8.tar.bz2 | |
Revert 218271 "Roll Skia DEPS to r10790 (take 2)"
E:\b\depot_tools\python_bin\python_slave.exe
E:\b\build\slave\XP_Tests__dbg__6_\build\src\build\..\tools\sharding_supervisor\sharding_supervisor.py
--no-color --retry-failed --total-slaves 5 --slave-index 4
E:\b\build\slave\XP_Tests__dbg__6_\build\src\build\Debug\browser_tests.exe
--lib=browser_tests --gtest_print_time
--gtest_output=xml:E:\b\build\slave\XP_Tests__dbg__6_\build\gtest-results\browser_tests\browser_tests.xml
Failed to list test cases
> Roll Skia DEPS to r10790 (take 2)
>
> R=bsalomon@google.com
>
> Review URL: https://codereview.chromium.org/23295014
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/23072021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 40f59ca..2900553 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -117,8 +117,6 @@ '../third_party/skia/src/ports/SkFontConfigParser_android.cpp', '../third_party/skia/src/ports/SkFontHost_mac.cpp', '../third_party/skia/src/ports/SkFontHost_win.cpp', - '../third_party/skia/src/ports/SkFontHost_win_dw.cpp', - '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp', '../third_party/skia/src/ports/SkOSFile_posix.cpp', '../third_party/skia/src/ports/SkOSFile_stdio.cpp', @@ -157,11 +155,6 @@ '../third_party/skia/src/utils/SkProxyCanvas.cpp', '../third_party/skia/src/utils/SkRTConf.cpp', '../third_party/skia/include/utils/SkRTConf.h', - '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', - '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', - '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', - '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h', - '../third_party/skia/src/utils/win/SkHRESULT.cpp', '../third_party/skia/include/pdf/SkPDFDevice.h', '../third_party/skia/include/pdf/SkPDFDocument.h', @@ -404,24 +397,6 @@ '../third_party/skia/src/ports/SkTime_Unix.cpp', '../third_party/skia/src/ports/SkTLS_pthread.cpp', ], - 'include_dirs': [ - '../third_party/skia/include/utils/win', - '../third_party/skia/src/utils/win', - ], - 'defines': [ - 'SK_FONTHOST_USES_FONTMGR', - ], - },{ # not 'OS == "win"' - 'sources!': [ - '../third_party/skia/src/ports/SkFontHost_win_dw.cpp', - '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', - - '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', - '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', - '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', - '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h', - '../third_party/skia/src/utils/win/SkHRESULT.cpp', - ], }], # TODO(scottmg): http://crbug.com/177306 ['clang==1', { @@ -468,7 +443,6 @@ 'SKIA_IGNORE_GPU_MIPMAPS', - # this flag forces Skia not to use typographic metrics with GDI. 'SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS', 'SK_DEFAULT_FONT_CACHE_LIMIT=<(default_font_cache_limit)', |