26320 2009-06-11 08:00:16 -0700 Some minor code cleanup needed in Chromium/Skia 2009-06-13 21:54:04 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P4 Normal --- 1 senorblanco abarth abarth oldest_to_newest 125309 0 senorblanco 2009-06-11 08:00:16 -0700 Should remove #ifndef SK_USE_OLD_255_TO_256 around old Skia API calls. 125313 1 senorblanco 2009-06-11 08:02:22 -0700 *** Bug 26321 has been marked as a duplicate of this bug. *** 125314 2 31163 senorblanco 2009-06-11 08:05:30 -0700 Created attachment 31163 Janitorial pass 125315 3 31164 senorblanco 2009-06-11 08:11:01 -0700 Created attachment 31164 Removed a FIXME 125729 4 abarth 2009-06-13 21:33:03 -0700 Will land. 125732 5 abarth 2009-06-13 21:54:04 -0700 Sending WebCore/ChangeLog Sending WebCore/platform/graphics/chromium/FontCacheLinux.cpp Sending WebCore/platform/graphics/chromium/TransparencyWin.h Sending WebCore/platform/graphics/skia/PathSkia.cpp Sending WebCore/platform/graphics/skia/SkiaUtils.cpp Transmitting file data ..... Committed revision 44667. 31163 2009-06-11 08:05:30 -0700 2009-06-11 08:11:01 -0700 Janitorial pass webkit_skia_cleanup.patch text/plain 4964 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDYwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMDYtMTEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MzIwCisKKyAg ICAgICAgU29tZSBtaW5vciBjb2RlIGNsZWFudXAgZm9yIGNocm9taXVtL3NraWEgcG9ydC4gIFJl bW92ZWQgI2lmZGVmJ3MKKyAgICAgICAgYXJvdW5kIHNraWEgQVBJIGNoYW5nZXMsIHNpbmNlIHRo ZSBuZXcgdmVyc2lvbiBzZWVtcyBzb2xpZCBhbmQgd2UKKyAgICAgICAgZG9uJ3QgbmVlZCB0byBn byBiYWNrLiAgQWRkZWQgc29tZSBjb21tZW50cyB0bworICAgICAgICBUcmFuc3BhcmVuY3lXaW4u aCwgYXMgcmVxdWVzdGVkIGJ5IEJyZXR0IGluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDU4NC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vVHJhbnNwYXJlbmN5V2luLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9QYXRoU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpib3VuZGluZ1JlY3Qp OgorICAgICAgICAoV2ViQ29yZTo6Ym91bmRpbmdCb3hGb3JDdXJyZW50U3Ryb2tlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTa1BhdGhDb250YWluc1BvaW50KToKKwogMjAwOS0wNi0xMSAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkg QXJpeWEgSGlkYXlhdC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENhY2hlTGludXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCShyZXZpc2lvbiA0NDU0NCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNjcsMTEgKzE2Nyw3IEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6 Y3JlYXRlRm9udFAKIAogICAgIC8vIEZJWE1FOiAgVGhpcyAjaWZkZWYgY2FuIGdvIGF3YXkgb25j ZSB3ZSdyZSBmaXJtbHkgdXNpbmcgdGhlIG5ldyBTa2lhLgogICAgIC8vIER1cmluZyB0aGUgdHJh bnNpdGlvbiwgdGhpcyBtYWtlcyB0aGUgY29kZSBjb21wYXRpYmxlIHdpdGggYm90aCB2ZXJzaW9u cy4KLSNpZmRlZiBTS19VU0VfT0xEXzI1NV9UT18yNTYKICAgICBTa1R5cGVmYWNlKiB0ZiA9IFNr VHlwZWZhY2U6OkNyZWF0ZUZyb21OYW1lKG5hbWUsIHN0YXRpY19jYXN0PFNrVHlwZWZhY2U6OlN0 eWxlPihzdHlsZSkpOwotI2Vsc2UKLSAgICBTa1R5cGVmYWNlKiB0ZiA9IFNrVHlwZWZhY2U6OkNy ZWF0ZShuYW1lLCBzdGF0aWNfY2FzdDxTa1R5cGVmYWNlOjpTdHlsZT4oc3R5bGUpKTsKLSNlbmRp ZgogICAgIGlmICghdGYpCiAgICAgICAgIHJldHVybiAwOwogCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL1RyYW5zcGFyZW5jeVdpbi5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVHJhbnNwYXJlbmN5V2luLmgJKHJldmlz aW9uIDQ0NTQ0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmFuc3Bh cmVuY3lXaW4uaAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDYgKzEzNSw5IEBAIHB1YmxpYzoKICAg ICAgICAgICAgICAgY29uc3QgSW50UmVjdCYgcmVnaW9uKTsKIAogICAgIC8vIENvbWJpbmVzIHRo ZSBzb3VyY2UgYW5kIGRlc3RpbmF0aW9uIGJpdG1hcHMgdXNpbmcgdGhlIGdpdmVuIG1vZGUuCisg ICAgLy8gQ2FsbGluZyB0aGlzIGZ1bmN0aW9uIGJlZm9yZSB0aGUgZGVzdHJ1Y3RvciBydW5zIGlz IG1hbmRhdG9yeSBpbiBtb3N0CisgICAgLy8gY2FzZXMsIGFuZCBoYXJtbGVzcyBvdGhlcndpc2Uu ICBUaGUgbWFuZGF0b3J5IGNhc2VzIGFyZToKKyAgICAvLyAgICAgICAobV9sYXllck1vZGUgIT0g Tm9MYXllcikgfHwgKG1fdHJhbnNmb3JtTW9kZSA9PSBTY2FsZVRyYW5zZm9ybSkKICAgICB2b2lk IGNvbXBvc2l0ZSgpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgY29udGV4dCBmb3IgZHJhd2luZyBp bnRvLCB3aGljaCBtYXkgYmUgdGhlIGRlc3RpbmF0aW9uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvUGF0aFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHAJKHJldmlzaW9uIDQ0NTQ0KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAt ODEsMTUgKzgxLDcgQEAgdm9pZCBQYXRoOjp0cmFuc2xhdGUoY29uc3QgRmxvYXRTaXplJiBzaQog CiBGbG9hdFJlY3QgUGF0aDo6Ym91bmRpbmdSZWN0KCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTog IFRoaXMgI2lmZGVmIGNhbiBnbyBhd2F5IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZSBuZXcg U2tpYS4KLSAgICAvLyBEdXJpbmcgdGhlIHRyYW5zaXRpb24sIHRoaXMgbWFrZXMgdGhlIGNvZGUg Y29tcGF0aWJsZSB3aXRoIGJvdGggdmVyc2lvbnMuCi0jaWZkZWYgU0tfVVNFX09MRF8yNTVfVE9f MjU2CiAgICAgcmV0dXJuIG1fcGF0aC0+Z2V0Qm91bmRzKCk7Ci0jZWxzZQotICAgIFNrUmVjdCBy ZWN0OwotICAgIG1fcGF0aC0+Y29tcHV0ZUJvdW5kcygmcmVjdCwgU2tQYXRoOjprRXhhY3RfQm91 bmRzVHlwZSk7Ci0gICAgcmV0dXJuIHJlY3Q7Ci0jZW5kaWYKIH0KIAogdm9pZCBQYXRoOjptb3Zl VG8oY29uc3QgRmxvYXRQb2ludCYgcG9pbnQpCkBAIC0yODEsMTUgKzI3Myw3IEBAIHN0YXRpYyBG bG9hdFJlY3QgYm91bmRpbmdCb3hGb3JDdXJyZW50U3QKICAgICBjb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7CiAgICAgU2tQYXRo IGJvdW5kaW5nUGF0aDsKICAgICBwYWludC5nZXRGaWxsUGF0aChjb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKS0+Y3VycmVudFBhdGhJbkxvY2FsQ29vcmRpbmF0ZXMoKSwgJmJvdW5kaW5nUGF0aCk7 Ci0gICAgLy8gRklYTUU6ICBUaGlzICNpZmRlZiBjYW4gZ28gYXdheSBvbmNlIHdlJ3JlIGZpcm1s eSB1c2luZyB0aGUgbmV3IFNraWEuCi0gICAgLy8gRHVyaW5nIHRoZSB0cmFuc2l0aW9uLCB0aGlz IG1ha2VzIHRoZSBjb2RlIGNvbXBhdGlibGUgd2l0aCBib3RoIHZlcnNpb25zLgotI2lmZGVmIFNL X1VTRV9PTERfMjU1X1RPXzI1NgogICAgIHJldHVybiBib3VuZGluZ1BhdGguZ2V0Qm91bmRzKCk7 Ci0jZWxzZQotICAgIFNrUmVjdCByOwotICAgIGJvdW5kaW5nUGF0aC5jb21wdXRlQm91bmRzKCZy LCBTa1BhdGg6OmtFeGFjdF9Cb3VuZHNUeXBlKTsKLSAgICByZXR1cm4gcjsKLSNlbmRpZgogfQog CiBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0KFN0cm9rZVN0eWxlQXBwbGllciog YXBwbGllcikKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRpbHMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhVXRp bHMuY3BwCShyZXZpc2lvbiA0NDU0NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9Ta2lhVXRpbHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsMTQgKzE1MCw3IEBAIGJvb2wg U2tQYXRoQ29udGFpbnNQb2ludChTa1BhdGgqIG9yaWdpbmEKICAgICBTa1BhdGggc2NhbGVkUGF0 aDsKICAgICBpbnQgc2NhbGUgPSAxOwogCi0gICAgU2tSZWN0IGJvdW5kczsKLSAgICAvLyBGSVhN RTogIFRoaXMgI2lmZGVmIGNhbiBnbyBhd2F5IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZSBu ZXcgU2tpYS4KLSAgICAvLyBEdXJpbmcgdGhlIHRyYW5zaXRpb24sIHRoaXMgbWFrZXMgdGhlIGNv ZGUgY29tcGF0aWJsZSB3aXRoIGJvdGggdmVyc2lvbnMuCi0jaWZkZWYgU0tfVVNFX09MRF8yNTVf VE9fMjU2Ci0gICAgYm91bmRzID0gb3JpZ2luYWxQYXRoLT5nZXRCb3VuZHMoKTsKLSNlbHNlCi0g ICAgb3JpZ2luYWxQYXRoLT5jb21wdXRlQm91bmRzKCZib3VuZHMsIFNrUGF0aDo6a0Zhc3RfQm91 bmRzVHlwZSk7Ci0jZW5kaWYKKyAgICBTa1JlY3QgYm91bmRzID0gb3JpZ2luYWxQYXRoLT5nZXRC b3VuZHMoKTsKIAogICAgIC8vIFdlIGNhbiBpbW1lZGlhdGVseSByZXR1cm4gZmFsc2UgaWYgdGhl IHBvaW50IGlzIG91dHNpZGUgdGhlIGJvdW5kaW5nIHJlY3QKICAgICBpZiAoIWJvdW5kcy5jb250 YWlucyhTa0Zsb2F0VG9TY2FsYXIocG9pbnQueCgpKSwgU2tGbG9hdFRvU2NhbGFyKHBvaW50Lnko KSkpKQo= 31164 2009-06-11 08:11:01 -0700 2009-06-11 08:36:56 -0700 Removed a FIXME webkit_skia_cleanup.patch text/plain 5038 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDYwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMDYtMTEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MzIwCisKKyAg ICAgICAgU29tZSBtaW5vciBjb2RlIGNsZWFudXAgZm9yIGNocm9taXVtL3NraWEgcG9ydC4gIFJl bW92ZWQgI2lmZGVmJ3MKKyAgICAgICAgYXJvdW5kIHNraWEgQVBJIGNoYW5nZXMsIHNpbmNlIHRo ZSBuZXcgdmVyc2lvbiBzZWVtcyBzb2xpZCBhbmQgd2UKKyAgICAgICAgZG9uJ3QgbmVlZCB0byBn byBiYWNrLiAgQWRkZWQgc29tZSBjb21tZW50cyB0bworICAgICAgICBUcmFuc3BhcmVuY3lXaW4u aCwgYXMgcmVxdWVzdGVkIGJ5IEJyZXR0IGluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDU4NC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vVHJhbnNwYXJlbmN5V2luLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9QYXRoU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpib3VuZGluZ1JlY3Qp OgorICAgICAgICAoV2ViQ29yZTo6Ym91bmRpbmdCb3hGb3JDdXJyZW50U3Ryb2tlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTa1BhdGhDb250YWluc1BvaW50KToKKwogMjAwOS0wNi0xMSAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkg QXJpeWEgSGlkYXlhdC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENhY2hlTGludXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCShyZXZpc2lvbiA0NDU0NCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNjUsMTMgKzE2NSw3IEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6 Y3JlYXRlRm9udFAKICAgICBpZiAoZm9udERlc2NyaXB0aW9uLml0YWxpYygpKQogICAgICAgICBz dHlsZSB8PSBTa1R5cGVmYWNlOjprSXRhbGljOwogCi0gICAgLy8gRklYTUU6ICBUaGlzICNpZmRl ZiBjYW4gZ28gYXdheSBvbmNlIHdlJ3JlIGZpcm1seSB1c2luZyB0aGUgbmV3IFNraWEuCi0gICAg Ly8gRHVyaW5nIHRoZSB0cmFuc2l0aW9uLCB0aGlzIG1ha2VzIHRoZSBjb2RlIGNvbXBhdGlibGUg d2l0aCBib3RoIHZlcnNpb25zLgotI2lmZGVmIFNLX1VTRV9PTERfMjU1X1RPXzI1NgogICAgIFNr VHlwZWZhY2UqIHRmID0gU2tUeXBlZmFjZTo6Q3JlYXRlRnJvbU5hbWUobmFtZSwgc3RhdGljX2Nh c3Q8U2tUeXBlZmFjZTo6U3R5bGU+KHN0eWxlKSk7Ci0jZWxzZQotICAgIFNrVHlwZWZhY2UqIHRm ID0gU2tUeXBlZmFjZTo6Q3JlYXRlKG5hbWUsIHN0YXRpY19jYXN0PFNrVHlwZWZhY2U6OlN0eWxl PihzdHlsZSkpOwotI2VuZGlmCiAgICAgaWYgKCF0ZikKICAgICAgICAgcmV0dXJuIDA7CiAKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVHJhbnNwYXJlbmN5V2luLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UcmFuc3Bh cmVuY3lXaW4uaAkocmV2aXNpb24gNDQ1NDQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL1RyYW5zcGFyZW5jeVdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsNiArMTM1 LDkgQEAgcHVibGljOgogICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiByZWdpb24pOwogCiAg ICAgLy8gQ29tYmluZXMgdGhlIHNvdXJjZSBhbmQgZGVzdGluYXRpb24gYml0bWFwcyB1c2luZyB0 aGUgZ2l2ZW4gbW9kZS4KKyAgICAvLyBDYWxsaW5nIHRoaXMgZnVuY3Rpb24gYmVmb3JlIHRoZSBk ZXN0cnVjdG9yIHJ1bnMgaXMgbWFuZGF0b3J5IGluIG1vc3QKKyAgICAvLyBjYXNlcywgYW5kIGhh cm1sZXNzIG90aGVyd2lzZS4gIFRoZSBtYW5kYXRvcnkgY2FzZXMgYXJlOgorICAgIC8vICAgICAg IChtX2xheWVyTW9kZSAhPSBOb0xheWVyKSB8fCAobV90cmFuc2Zvcm1Nb2RlID09IFNjYWxlVHJh bnNmb3JtKQogICAgIHZvaWQgY29tcG9zaXRlKCk7CiAKICAgICAvLyBSZXR1cm5zIHRoZSBjb250 ZXh0IGZvciBkcmF3aW5nIGludG8sIHdoaWNoIG1heSBiZSB0aGUgZGVzdGluYXRpb24KSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QYXRoU2tpYS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BhdGhTa2lhLmNwcAkocmV2aXNpb24g NDQ1NDQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGF0aFNraWEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04MSwxNSArODEsNyBAQCB2b2lkIFBhdGg6OnRyYW5zbGF0ZShjb25z dCBGbG9hdFNpemUmIHNpCiAKIEZsb2F0UmVjdCBQYXRoOjpib3VuZGluZ1JlY3QoKSBjb25zdAog ewotICAgIC8vIEZJWE1FOiAgVGhpcyAjaWZkZWYgY2FuIGdvIGF3YXkgb25jZSB3ZSdyZSBmaXJt bHkgdXNpbmcgdGhlIG5ldyBTa2lhLgotICAgIC8vIER1cmluZyB0aGUgdHJhbnNpdGlvbiwgdGhp cyBtYWtlcyB0aGUgY29kZSBjb21wYXRpYmxlIHdpdGggYm90aCB2ZXJzaW9ucy4KLSNpZmRlZiBT S19VU0VfT0xEXzI1NV9UT18yNTYKICAgICByZXR1cm4gbV9wYXRoLT5nZXRCb3VuZHMoKTsKLSNl bHNlCi0gICAgU2tSZWN0IHJlY3Q7Ci0gICAgbV9wYXRoLT5jb21wdXRlQm91bmRzKCZyZWN0LCBT a1BhdGg6OmtFeGFjdF9Cb3VuZHNUeXBlKTsKLSAgICByZXR1cm4gcmVjdDsKLSNlbmRpZgogfQog CiB2b2lkIFBhdGg6Om1vdmVUbyhjb25zdCBGbG9hdFBvaW50JiBwb2ludCkKQEAgLTI4MSwxNSAr MjczLDcgQEAgc3RhdGljIEZsb2F0UmVjdCBib3VuZGluZ0JveEZvckN1cnJlbnRTdAogICAgIGNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ryb2tpbmcoJnBhaW50LCAw LCAwKTsKICAgICBTa1BhdGggYm91bmRpbmdQYXRoOwogICAgIHBhaW50LmdldEZpbGxQYXRoKGNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5jdXJyZW50UGF0aEluTG9jYWxDb29yZGluYXRlcygp LCAmYm91bmRpbmdQYXRoKTsKLSAgICAvLyBGSVhNRTogIFRoaXMgI2lmZGVmIGNhbiBnbyBhd2F5 IG9uY2Ugd2UncmUgZmlybWx5IHVzaW5nIHRoZSBuZXcgU2tpYS4KLSAgICAvLyBEdXJpbmcgdGhl IHRyYW5zaXRpb24sIHRoaXMgbWFrZXMgdGhlIGNvZGUgY29tcGF0aWJsZSB3aXRoIGJvdGggdmVy c2lvbnMuCi0jaWZkZWYgU0tfVVNFX09MRF8yNTVfVE9fMjU2CiAgICAgcmV0dXJuIGJvdW5kaW5n UGF0aC5nZXRCb3VuZHMoKTsKLSNlbHNlCi0gICAgU2tSZWN0IHI7Ci0gICAgYm91bmRpbmdQYXRo LmNvbXB1dGVCb3VuZHMoJnIsIFNrUGF0aDo6a0V4YWN0X0JvdW5kc1R5cGUpOwotICAgIHJldHVy biByOwotI2VuZGlmCiB9CiAKIEZsb2F0UmVjdCBQYXRoOjpzdHJva2VCb3VuZGluZ1JlY3QoU3Ry b2tlU3R5bGVBcHBsaWVyKiBhcHBsaWVyKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL1NraWFVdGlscy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL1NraWFVdGlscy5jcHAJKHJldmlzaW9uIDQ0NTQ0KQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9za2lhL1NraWFVdGlscy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MCwx NCArMTUwLDcgQEAgYm9vbCBTa1BhdGhDb250YWluc1BvaW50KFNrUGF0aCogb3JpZ2luYQogICAg IFNrUGF0aCBzY2FsZWRQYXRoOwogICAgIGludCBzY2FsZSA9IDE7CiAKLSAgICBTa1JlY3QgYm91 bmRzOwotICAgIC8vIEZJWE1FOiAgVGhpcyAjaWZkZWYgY2FuIGdvIGF3YXkgb25jZSB3ZSdyZSBm aXJtbHkgdXNpbmcgdGhlIG5ldyBTa2lhLgotICAgIC8vIER1cmluZyB0aGUgdHJhbnNpdGlvbiwg dGhpcyBtYWtlcyB0aGUgY29kZSBjb21wYXRpYmxlIHdpdGggYm90aCB2ZXJzaW9ucy4KLSNpZmRl ZiBTS19VU0VfT0xEXzI1NV9UT18yNTYKLSAgICBib3VuZHMgPSBvcmlnaW5hbFBhdGgtPmdldEJv dW5kcygpOwotI2Vsc2UKLSAgICBvcmlnaW5hbFBhdGgtPmNvbXB1dGVCb3VuZHMoJmJvdW5kcywg U2tQYXRoOjprRmFzdF9Cb3VuZHNUeXBlKTsKLSNlbmRpZgorICAgIFNrUmVjdCBib3VuZHMgPSBv cmlnaW5hbFBhdGgtPmdldEJvdW5kcygpOwogCiAgICAgLy8gV2UgY2FuIGltbWVkaWF0ZWx5IHJl dHVybiBmYWxzZSBpZiB0aGUgcG9pbnQgaXMgb3V0c2lkZSB0aGUgYm91bmRpbmcgcmVjdAogICAg IGlmICghYm91bmRzLmNvbnRhaW5zKFNrRmxvYXRUb1NjYWxhcihwb2ludC54KCkpLCBTa0Zsb2F0 VG9TY2FsYXIocG9pbnQueSgpKSkpCg==