New issue
Advanced search Search tips

Issue 601528 link

Starred by 3 users

Issue metadata

Status: Fixed
Owner:
Closed: Apr 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

Roll HarfBuzz to 1.2.6

Project Member Reported by drott@chromium.org, Apr 7 2016

Issue description

Behdad recommends taking in 1.2.5 to address a regression in 1.2.3, however, we had 1.2.1 plus 

Local changes:
    * Custom revert: Change mark strategy back to UNICODE_LATE from
      GDEF_LATE for the default shaper - contributed by Behdad to unblock
      the HarfBuzz roll in Blink while the issue about broken quote glyphs
      in Times New Roman Italic can be resolved in upstream.
    * Upstream commit ebd7431f824
      "Partially revert 86c68c7a2c97"
      in order to fix mark positioning in
      fast/text/international/arabic-vertical-offset.html

before. So, needs clarification whether we had the regression.
 

Comment 1 by drott@chromium.org, Apr 7 2016

Cc: kojii@chromium.org
Owner: kojii@chromium.org
Status: Assigned (was: Started)
Okay, in email Behdad comments this version needs the fix, we should cherry pick https://github.com/behdad/harfbuzz/commit/6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8 to M50.

I am assigning this to you Koji - would be great if you can help. If not, reassign it to me and I can try to work on it next week and then we would have to try picking it to stable.

Comment 3 by js...@chromium.org, Apr 7 2016

Cc: js...@chromium.org
Anyway, in case of Chrome OS, HB is currently at 1.2.3. 

Behdad, what kind of regressions does 1.2.3 have? Nothing obvious pops up when going through the list of commits since 1.2.3 ( https://github.com/behdad/harfbuzz/commits/master ) 
The regression was introduced in https://github.com/behdad/harfbuzz/commit/9a13ed453ef96822a47d6e6f58332b87f38d5c59

It broke mark-filtering-sets in GDEF.

Comment 5 by kojii@chromium.org, Apr 8 2016

Cherry pick CL under review:
https://codereview.chromium.org/1869993002


Comment 6 by kojii@chromium.org, Apr 8 2016

Note the cherry-pick fixes the change in crrev.com/377246 which is M49.

Comment 7 by kojii@chromium.org, Apr 8 2016

I'm not sure if I follow all the context, but here's my understanding + investigation, please correct me if I'm wrong:

1. The regression (comment 4) is in 1.2.1, which was rolled to M49.
2. The 1.2.5 roll (comment 2) includes the fix.
3. The cherry-pick (comment 5) is only necessary if either:
  a. The 1.2.5 roll can't land before M51 branch,
     and we'd like the minimum fix for M50 before the branch.
  b. We'd like the minimum fix separately from 1.2.5 roll
     so that it can be merged to M49.

Reading through comments, the regression is in 1.2.3, and comment 1 wants the fix in M50, not M49, so I might be wrong somewhere.

The cheery-pick (comment 5) doesn't look to harm anyway though, so I'll wait for the review on it.

Comment 8 by kojii@chromium.org, Apr 8 2016

Ah, I was totally mistaken on the branch date, so the correction:

1. The regression (comment 4) is in 1.2.1, which was rolled to M50.
2. The 1.2.5 roll (comment 2) includes the fix.
3. For the cherry-pick (comment 5):
  a. If it can land before 1.2.5 roll, we can request a merge to TPM.
     tkent@ suggested to have a separate bug.
  b. If 1.2.5 roll lands first, but want to pick one line to M50,
     the process becomes a little more complicated.

So I think it's nice to land the cherry-pick first.

Also, I guess TPM might need to understand what kind of regressions it will fix to approve the merge, but I can't explain that. Can drott@/behdad@ help?
Project Member

Comment 9 by bugdroid1@chromium.org, Apr 8 2016

Owner: drott@chromium.org
The regression part is split into  issue 601739 .

Comment 11 by drott@chromium.org, Apr 11 2016

Summary: Roll HarfBuzz to 1.2.6 (was: Roll HarfBuzz to 1.2.5)
Updating the title after we found another case of the Times New Roman quote mark issue.
Project Member

Comment 12 by bugdroid1@chromium.org, Apr 11 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7

commit fcbabe31b76d0b8e783ceeb319d7e2fa116889c7
Author: kojii <kojii@chromium.org>
Date: Mon Apr 11 18:19:39 2016

Roll HarfBuzz to 1.2.6

Following Behdad's recommendation to pull this version.

Removed hb-directwrite.* as they are not used, as per
crrev.com/1867053004#msg18

BUG= 601528 

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

Cr-Commit-Position: refs/heads/master@{#386413}

[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/NEWS
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/README
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/README.chromium
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-buffer-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-buffer.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-coretext.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-deprecated.h
[delete] https://crrev.com/b828f35675f44aa749a95951a742ae6898e4143e/third_party/harfbuzz-ng/src/hb-directwrite.cc
[delete] https://crrev.com/b828f35675f44aa749a95951a742ae6898e4143e/third_party/harfbuzz-ng/src/hb-directwrite.h
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-fallback-shape.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-font-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-font.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-font.h
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ft.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-icu.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-open-type-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-cmap-table.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-font.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-glyf-table.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-hmtx-table.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-layout-gsub-table.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-layout.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-map.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-default.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-myanmar.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-thai.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-complex-use.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-fallback.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape-normalize.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-ot-shape.cc
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-unicode-private.hh
[modify] https://crrev.com/fcbabe31b76d0b8e783ceeb319d7e2fa116889c7/third_party/harfbuzz-ng/src/hb-version.h

Project Member

Comment 13 by bugdroid1@chromium.org, Apr 11 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/f764f879976eb07bc6efa83fdab269d1e20866ac

commit f764f879976eb07bc6efa83fdab269d1e20866ac
Author: Jungshik Shin <jshin@chromium.org>
Date: Sat Apr 09 00:08:32 2016

Cherry pick an upstream patch (commit: 6dd80faf0)

This cherry-pick is recommended by the upstream maintainer
behdad@behdad.org. This is to make a merging to R50 branch
easier and is the same cherry-pick was done for Chromium.

For the trunk, this will be followed by upgrading to 1.2.[56].

BUG= chromium:601528 ,  chromium:601739 
TEST=emerge-${BOARD} harfbuzz

Change-Id: If900942f0b461ddb15f84deb004438b81548a3f4
Reviewed-on: https://chromium-review.googlesource.com/338004
Commit-Ready: Jungshik Shin <jshin@chromium.org>
Tested-by: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/f764f879976eb07bc6efa83fdab269d1e20866ac/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
[add] https://crrev.com/f764f879976eb07bc6efa83fdab269d1e20866ac/media-libs/harfbuzz/files/harfbuzz-1.2.3-fixedversion2int.patch
[rename] https://crrev.com/f764f879976eb07bc6efa83fdab269d1e20866ac/media-libs/harfbuzz/harfbuzz-1.2.3-r2.ebuild

Comment 14 by drott@chromium.org, Apr 12 2016

Status: Fixed (was: Assigned)
Project Member

Comment 16 by bugdroid1@chromium.org, Apr 12 2016

Labels: merge-merged-2661
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/12bddafcdd166cdc0471c92b8f079932dfde8a38

commit 12bddafcdd166cdc0471c92b8f079932dfde8a38
Author: Dominik Röttsches <drott@chromium.org>
Date: Tue Apr 12 20:36:35 2016

Cheery pick Fix FixedVersion::to_int()

Cherry pick to fix a regression in mark-filtering-sets in GDEF.

https://github.com/behdad/harfbuzz/commit/6dd80fa

BUG= 601528 ,  601739 

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

Cr-Commit-Position: refs/heads/master@{#386039}
(cherry picked from commit 62cf1d88109abbf7020fc01ca6c32a76d133230d)

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

Cr-Commit-Position: refs/branch-heads/2661@{#570}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}

[modify] https://crrev.com/12bddafcdd166cdc0471c92b8f079932dfde8a38/third_party/harfbuzz-ng/README.chromium
[modify] https://crrev.com/12bddafcdd166cdc0471c92b8f079932dfde8a38/third_party/harfbuzz-ng/src/hb-open-type-private.hh

Project Member

Comment 17 by bugdroid1@chromium.org, Apr 18 2016

Labels: merge-merged-release-R51-8172.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/27a7794d68413db81587268baca6485993b20595

commit 27a7794d68413db81587268baca6485993b20595
Author: Jungshik Shin <jshin@chromium.org>
Date: Sat Apr 09 00:08:32 2016

Cherry pick an upstream patch (commit: 6dd80faf0)

This cherry-pick is recommended by the upstream maintainer
behdad@behdad.org. This is to make a merging to R50 branch
easier and is the same cherry-pick was done for Chromium.

For the trunk, this will be followed by upgrading to harfbuzz 1.2.[56].

BUG= chromium:601528 ,  chromium:601739 
TEST=emerge-${BOARD} harfbuzz

Change-Id: If900942f0b461ddb15f84deb004438b81548a3f4
Previous-Reviewed-on: https://chromium-review.googlesource.com/338004
(cherry picked from commit 1afcc6053eedb88bedf9a61b451cc7d4de273f47)
Reviewed-on: https://chromium-review.googlesource.com/339433
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Jungshik Shin <jshin@chromium.org>
Commit-Queue: Jungshik Shin <jshin@chromium.org>
Tested-by: Jungshik Shin <jshin@chromium.org>

[modify] https://crrev.com/27a7794d68413db81587268baca6485993b20595/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
[add] https://crrev.com/27a7794d68413db81587268baca6485993b20595/media-libs/harfbuzz/files/harfbuzz-1.2.3-fixedversion2int.patch
[rename] https://crrev.com/27a7794d68413db81587268baca6485993b20595/media-libs/harfbuzz/harfbuzz-1.2.3-r2.ebuild

Project Member

Comment 18 by bugdroid1@chromium.org, Apr 22 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/e208153918d1cdd494100ff7a88eabb440e6be5f

commit e208153918d1cdd494100ff7a88eabb440e6be5f
Author: Jungshik Shin <jshin@chromium.org>
Date: Tue Apr 12 22:55:33 2016

Update harfbuzz to 1.2.6 from 1.2.3+patch

Chromium on other platforms moved on to 1.2.6. CrOS had better be
in sync.

BUG= chromium:601528 
TEST=emerge-{x86-alex,amd64-generic,daisy} harfbuzz succeeds.
TEST=cbuildbot chromiumos-sdk succeeds.
TEST=cbuildbot x86-alex VMtest passes

Change-Id: I7b9b5dbe6ee33b7b8743ff6e0636052ba9390890
Reviewed-on: https://chromium-review.googlesource.com/338640
Commit-Ready: Jungshik Shin <jshin@chromium.org>
Tested-by: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[add] https://crrev.com/e208153918d1cdd494100ff7a88eabb440e6be5f/media-libs/harfbuzz/harfbuzz-1.2.6-r1.ebuild
[delete] https://crrev.com/dab6d4cc0da68770c03496e97623dd9db716261f/media-libs/harfbuzz/harfbuzz-1.2.3-r2.ebuild
[delete] https://crrev.com/dab6d4cc0da68770c03496e97623dd9db716261f/media-libs/harfbuzz/files/harfbuzz-1.2.3-fixedversion2int.patch
[modify] https://crrev.com/e208153918d1cdd494100ff7a88eabb440e6be5f/media-libs/harfbuzz/Manifest
[rename] https://crrev.com/e208153918d1cdd494100ff7a88eabb440e6be5f/media-libs/harfbuzz/harfbuzz-1.2.6.ebuild

Sign in to add a comment