Roll Skia DEPS to r10790 (take 2)

R=bsalomon@google.com Review URL: https://codereview.chromium.org/23295014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218271 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Aug 19, 2013 · c311975 · c311975
1 parent ee823c5
commit c311975
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/DEPS b/DEPS
@@ -29,8 +29,8 @@ vars = {
   "ffmpeg_hash": "894e6f715645528e815aee2dad45b59704238dcd",
 
   "sfntly_revision": "134",
-  "skia_revision": "10765",
-  "skia_hash": "1f8b024bc12f3934fd3aa8636865058e3d4aed57",
+  "skia_revision": "10790",
+  "skia_hash": "e397366c26138e8a47915cf4cf26734ba4362200",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
@@ -117,6 +117,8 @@
     '../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',
@@ -155,6 +157,11 @@
     '../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',
 
@@ -397,6 +404,24 @@
         '../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', {
@@ -443,6 +468,7 @@
 
     '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)',

diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
@@ -67,4 +67,9 @@ crbug.com/266315 fast/repaint/shadow-multiple-strict-horizontal.html [ ImageOnly
 crbug.com/266315 fast/repaint/shadow-multiple-strict-vertical.html [ ImageOnlyFailure ]
 crbug.com/266315 fast/repaint/shadow-multiple-vertical.html [ ImageOnlyFailure ]
 
+# With Skia r10769 the rendering of lines was slightly changed resulting in two
+# image layout differences
+crbug.com/275475 virtual/gpu/fast/canvas/canvas-transforms-during-path.html [ ImageOnlyFailure ]
+crbug.com/275475 virtual/gpu/fast/canvas/quadraticCurveTo.xml [ ImageOnlyFailure ]
+
 # END OVERRIDES HERE (this line ensures that the file is newline-terminated)