Roll Skia DEPS to r8339

Roll Skia DEPS to r8339

control: https://codereview.chromium.org/12827023/
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=189823

[robertphillips, 2013-03-22 16:03:12]

The main basis for this roll is a prior roll attempt
(https://codereview.chromium.org/12797010/)

[bsalomon, 2013-03-22 16:07:01]

lgtm


On Fri, Mar 22, 2013 at 12:03 PM, <robertphillips@google.com> wrote:

> Reviewers: reed1, bsalomon,
>
> Message:
> The main basis for this roll is a prior roll attempt
>
(https://codereview.chromium.**org/12797010/<https://codereview.chromium.org/1...
> )
>
> Description:
> Roll Skia DEPS to r8339
>
> control:
https://codereview.chromium.**org/12827023/<https://codereview.chromium.org/1...
>
> Please review this at
https://codereview.chromium.**org/12989022/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src/<http://svn.chromium.org/chrome/trunk/src/>
>
> Affected files:
>   M     DEPS
>   M     skia/skia.gyp
>
>
> Index: DEPS
> ==============================**==============================**=======
> --- DEPS        (revision 189815)
> +++ DEPS        (working copy)
> @@ -29,7 +29,7 @@
>    "ffmpeg_hash": "**bb82a38d45e65c1fba378c15180b98**ad76ebe1ca",
>
>    "sfntly_revision": "134",
> -  "skia_revision": "8255",
> +  "skia_revision": "8339",
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling Skia
>    # and V8 without interference from each other.
> Index: skia/skia.gyp
> ==============================**==============================**=======
> --- skia/skia.gyp       (revision 189815)
> +++ skia/skia.gyp       (working copy)
> @@ -98,7 +98,6 @@
>          '../third_party/skia/src/**ports/SkFontHost_FreeType_**common.h',
>          '../third_party/skia/src/**ports/SkFontHost_android.cpp',
>          #'../third_party/skia/src/**ports/SkFontHost_ascender.cpp'**,
> -        '../third_party/skia/src/**ports/SkFontHost_tables.cpp',
>          #'../third_party/skia/src/**ports/SkFontHost_linux.cpp',
>          '../third_party/skia/src/**ports/SkFontHost_mac.cpp',
>          #'../third_party/skia/src/**ports/SkFontHost_none.cpp',
> @@ -382,9 +381,6 @@
>              '../third_party/skia/src/**ports/SkFontHost_fontconfig.**
> cpp',
>              '../third_party/skia/src/**ports/SkFontConfigInterface_**
> direct.cpp',
>            ],
> -          'sources!': [
> -            '../third_party/skia/src/**ports/SkFontHost_tables.cpp',
> -          ],
>            'defines': [
>  #            'SK_USE_COLOR_LUMINANCE',
>            ],
> @@ -485,7 +481,6 @@
>              ['exclude', '/pdf/'],
>              ['exclude', '^ext/vector_platform_device_**skia\\.'],
>              ['exclude', 'opts_check_SSE2\\.cpp$'],
> -            ['exclude', 'SkFontHost_tables\\.cpp$',],
>            ],
>          }],
>          [ 'OS == "mac"', {
> @@ -505,11 +500,6 @@
>            'sources': [
>              '../third_party/skia/src/**utils/mac/SkStream_mac.cpp',
>            ],
> -          'sources!': [
> -            # The mac's fonthost implements the table methods natively,
> -            # so no need for these generic versions.
> -            '../third_party/skia/src/**ports/SkFontHost_tables.cpp',
> -          ],
>          }],
>          [ 'OS == "win"', {
>            'sources!': [
>
>
>

[robertphillips, 2013-03-22 16:12:16]

Committed patchset #1 manually as r189823 (presubmit successful).