81486 2012-03-18 20:52:53 -0700 [BlackBerry] Use GraphicsContext::fillPath() and strokePath instead of drawPath() in RenderThemeBlackBerry 2012-04-01 06:40:54 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73144 1 leo.yang leo.yang charles.wei robin.webkit rwlbuis staikos tonikitoo webkit.review.bot zimmermann oldest_to_newest 581608 0 leo.yang 2012-03-18 20:52:53 -0700 RenderThemeBlackBerry.cpp is now using GraphicsContext::drawPath(). 581610 1 132537 leo.yang 2012-03-18 21:03:03 -0700 Created attachment 132537 Patch 581746 2 132537 rwlbuis 2012-03-19 07:02:06 -0700 Comment on attachment 132537 Patch We should work on getting rid of using drawPath, it can be replaced by using fillPath/strokePath. This means RenderThemeBlackBerry has to be adapted to use those instead. 582780 3 leo.yang 2012-03-19 22:52:48 -0700 (In reply to comment #2) > (From update of attachment 132537 [details]) > We should work on getting rid of using drawPath, it can be replaced by using fillPath/strokePath. This means RenderThemeBlackBerry has to be adapted to use those instead. If we replace drawPath with fillPath and strokePath, there is some overhead: 826 if (paintingDisabled()) 827 return; 828 829 SkPath path = *pathToFill.platformPath(); 830 if (!isPathSkiaSafe(getCTM(), path)) 831 return; 832 833 const GraphicsContextState& state = m_state; 834 path.setFillType(state.fillRule == RULE_EVENODD ? 835 SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType); This block of code will be unnecessarily called twice. 588510 4 leo.yang 2012-03-26 20:08:27 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 132537 [details] [details]) > > We should work on getting rid of using drawPath, it can be replaced by using fillPath/strokePath. This means RenderThemeBlackBerry has to be adapted to use those instead. > > If we replace drawPath with fillPath and strokePath, there is some overhead: > > 826 if (paintingDisabled()) > 827 return; > 828 > 829 SkPath path = *pathToFill.platformPath(); > 830 if (!isPathSkiaSafe(getCTM(), path)) > 831 return; > 832 > 833 const GraphicsContextState& state = m_state; > 834 path.setFillType(state.fillRule == RULE_EVENODD ? > 835 SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType); > > This block of code will be unnecessarily called twice. @rob: what do you think? I can move drawPath implementation to a separated new file or RenderThemeBlackBerry if you agree. 592966 5 leo.yang 2012-03-31 19:54:03 -0700 Change bug title 592968 6 134985 leo.yang 2012-03-31 20:04:41 -0700 Created attachment 134985 Patch v2 Substituting drawPath() by fillPath() and strokePath() 593027 7 134985 rwlbuis 2012-04-01 05:57:00 -0700 Comment on attachment 134985 Patch v2 Looks fine. 593030 8 leo.yang 2012-04-01 06:03:37 -0700 Thanks for your review. 593033 9 134985 webkit.review.bot 2012-04-01 06:40:49 -0700 Comment on attachment 134985 Patch v2 Clearing flags on attachment: 134985 Committed r112814: <http://trac.webkit.org/changeset/112814> 593034 10 webkit.review.bot 2012-04-01 06:40:54 -0700 All reviewed patches have been landed. Closing bug. 132537 2012-03-18 21:03:03 -0700 2012-03-31 20:04:41 -0700 Patch 0001-BlackBerry-Add-GraphicsContext-drawPath-for-blackber.patch text/plain 4151 leo.yang RnJvbSBhYzU2YzNiY2ZhZWEyNGFlMmM4ZjFkNzg2MGNiNzVhOTljNDI2NjI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW8gWWFuZyA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNu PgpEYXRlOiBNb24sIDE5IE1hciAyMDEyIDEyOjAyOjEwICswODAwClN1YmplY3Q6IFtQQVRDSF0g W0JsYWNrQmVycnldIEFkZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdQYXRoKCkgZm9yIGJsYWNrYmVy cnkKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTQ4NgoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpHcmFwaGljc0NvbnRleHQ6OmRyYXdQYXRoKCkgaXMgbmVl ZGVkIGJ5IFJlbmRlclRoZW1lQmxhY2tCZXJyeS4KClRoZSBwb3J0IGNhbid0IGJlIGJ1aWxkIHll dCwgbm8gbmV3IHRlc3RzLgoKKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoK KEdyYXBoaWNzQ29udGV4dCk6CiogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRl eHRTa2lhLmNwcDoKKFdlYkNvcmUpOgooV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3UGF0 aCk6Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgIDE3ICsrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmggfCAgICA1ICsrKwogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv R3JhcGhpY3NDb250ZXh0U2tpYS5jcHAgfCAgIDI3ICsrKysrKysrKysrKysrKysrKysrCiAzIGZp bGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDY4ZGQ4YzkuLmNhYTFhMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0w My0xOCAgTGVvIFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIEFkZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdQYXRoKCkgZm9yIGJsYWNrYmVy cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDg2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR3JhcGhp Y3NDb250ZXh0OjpkcmF3UGF0aCgpIGlzIG5lZWRlZCBieSBSZW5kZXJUaGVtZUJsYWNrQmVycnku CisKKyAgICAgICAgVGhlIHBvcnQgY2FuJ3QgYmUgYnVpbGQgeWV0LCBubyBuZXcgdGVzdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAg KEdyYXBoaWNzQ29udGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFw aGljc0NvbnRleHRTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3UGF0aCk6CisKIDIwMTItMDMtMTggIERhbmEgSmFuc2Vu cyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBEb24ndCBvY2Ns dWRlIG9uIG1haW4tdGhyZWFkIGJlaGluZCBsYXllcnMvc3VyZmFjZXMgd2l0aCBpbXBsLXRocmVh ZCBhbmltYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCmluZGV4IGY3YmVmNGYuLjM1YzYwNGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0xLDYgKzEs NyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwMywgMjAwNiwgMjAwNywgMjAwOCwgMjAwOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgtMjAw OSBUb3JjaCBNb2JpbGUsIEluYy4KKyAqIENvcHlyaWdodCAoQykgUmVzZWFyY2ggSW4gTW90aW9u IExpbWl0ZWQgMjAxMi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMjU2LDYgKzI1NywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAg ICAgICAgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlKCkgY29uc3Q7CiAKKyNpZiBQ TEFURk9STShCTEFDS0JFUlJZKQorICAgICAgICB2b2lkIGRyYXdQYXRoKGNvbnN0IFBhdGgmKTsK KyNlbmRpZgorCiAjaWYgVVNFKENHKQogICAgICAgICB2b2lkIGFwcGx5U3Ryb2tlUGF0dGVybigp OwogICAgICAgICB2b2lkIGFwcGx5RmlsbFBhdHRlcm4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEu Y3BwCmluZGV4IDRmNzljZmIuLjI0NmU5ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcApA QCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKGMpIDIwMDYsIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgUmVzZWFyY2ggSW4gTW90 aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMgYXJlCkBAIC03OTcsNiArNzk4LDMyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5kcmF3 UmVjdChyKTsKIH0KIAorI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCit2b2lkIEdyYXBoaWNzQ29u dGV4dDo6ZHJhd1BhdGgoY29uc3QgUGF0aCYgcGF0aFRvRHJhdykKK3sKKyAgICBpZiAocGFpbnRp bmdEaXNhYmxlZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBTa1BhdGggcGF0aCA9ICpwYXRo VG9EcmF3LnBsYXRmb3JtUGF0aCgpOworICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCks IHBhdGgpKQorICAgICAgcmV0dXJuOworCisgICAgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUm IHN0YXRlID0gbV9zdGF0ZTsKKyAgICBwYXRoLnNldEZpbGxUeXBlKHN0YXRlLmZpbGxSdWxlID09 IFJVTEVfRVZFTk9ERCA/CisgICAgICAgIFNrUGF0aDo6a0V2ZW5PZGRfRmlsbFR5cGUgOiBTa1Bh dGg6OmtXaW5kaW5nX0ZpbGxUeXBlKTsKKworICAgIFNrUGFpbnQgcGFpbnQ7CisKKyAgICAvLyBG aWxsIHRoZSBwYXRoLgorICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yRmlsbGlu ZygmcGFpbnQpOworICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgocGF0 aCwgcGFpbnQpOworCisgICAgLy8gVGhlbiBzdHJva2UgdGhlIHBhdGguCisgICAgcGxhdGZvcm1D b250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOworICAgIHBsYXRm b3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgocGF0aCwgcGFpbnQpOworfQorI2VuZGlm CisKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUGF0aChjb25zdCBQYXRoJiBwYXRoVG9GaWxs KQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCi0tIAoxLjcuNS40Cgo= 134985 2012-03-31 20:04:41 -0700 2012-04-01 06:40:49 -0700 Patch v2 0001-BlackBerry-Use-GraphicsContext-fillPath-and-strokePa.patch text/plain 4739 leo.yang RnJvbSAzNzZhNzE2Mzc1YTM3ZjM1MTIxZDEyZTlhYzk1NTYzNjkzMWM2ZWYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW8gWWFuZyA8bGVvLnlhbmdAdG9yY2htb2JpbGUuY29tLmNu PgpEYXRlOiBTdW4sIDEgQXByIDIwMTIgMTE6MDI6MzYgKzA4MDAKU3ViamVjdDogW1BBVENIXSBb QmxhY2tCZXJyeV0gVXNlIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoKSBhbmQgc3Ryb2tlUGF0 aAogaW5zdGVhZCBvZiBkcmF3UGF0aCgpIGluIFJlbmRlclRoZW1lQmxhY2tCZXJyeQogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDg2CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KClJlbmRlclRoZW1lQmxhY2tCZXJyeSB3YXMgdXNpbmcgR3JhcGhpY3NDb250 ZXh0OjpkcmF3UGF0aCgpIHRoYXQncyBhZGRlZCBmb3IgQmxhY2tCZXJyeSBpbnRlcm5hbGx5LgpC dXQgd2UgYWxyZWFkeSBoYXZlIGZpbGxQYXRoKCkgYW5kIHN0cm9rZVBhdGgoKSBpbiBHcmFwaGlj c0NvbnRleHQuIFNvIGp1c3Qgc3Vic3RpdHV0ZSBkcmF3UGF0aCgpCmJ5IHRoZW0uIEFsc28gZml4 IGEgYnVpbGQgaXNzdWUgYnkgYWRkaW5nIGEgI2luY2x1ZGUgbGluZS4KCk5vIGZ1bmN0aW9uYWxp dGllcyBjaGFuZ2VkLCBubyBuZXcgdGVzdHMuCgoqIHBsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVy VGhlbWVCbGFja0JlcnJ5LmNwcDoKKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFp bnRUZXh0RmllbGRPclRleHRBcmVhT3JTZWFyY2hGaWVsZCk6CihXZWJDb3JlOjpSZW5kZXJUaGVt ZUJsYWNrQmVycnk6OnBhaW50QnV0dG9uKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIC4uLi9w bGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAgIHwgICAxNiArKysr KysrKysrKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM1NjNmODUuLmNlYzYxNmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMi0wMy0zMSAgTGVvIFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5j b20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFVzZSBHcmFwaGljc0NvbnRleHQ6OmZpbGxQ YXRoKCkgYW5kIHN0cm9rZVBhdGggaW5zdGVhZCBvZiBkcmF3UGF0aCgpIGluIFJlbmRlclRoZW1l QmxhY2tCZXJyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODE0ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW5kZXJUaGVtZUJsYWNrQmVycnkgd2FzIHVzaW5nIEdyYXBoaWNzQ29udGV4dDo6ZHJhd1Bh dGgoKSB0aGF0J3MgYWRkZWQgZm9yIEJsYWNrQmVycnkgaW50ZXJuYWxseS4KKyAgICAgICAgQnV0 IHdlIGFscmVhZHkgaGF2ZSBmaWxsUGF0aCgpIGFuZCBzdHJva2VQYXRoKCkgaW4gR3JhcGhpY3ND b250ZXh0LiBTbyBqdXN0IHN1YnN0aXR1dGUgZHJhd1BhdGgoKQorICAgICAgICBieSB0aGVtLiBB bHNvIGZpeCBhIGJ1aWxkIGlzc3VlIGJ5IGFkZGluZyBhICNpbmNsdWRlIGxpbmUuCisKKyAgICAg ICAgTm8gZnVuY3Rpb25hbGl0aWVzIGNoYW5nZWQsIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAq IHBsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRUZXh0RmllbGRPclRleHRBcmVh T3JTZWFyY2hGaWVsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6 OnBhaW50QnV0dG9uKToKKwogMjAxMi0wMy0zMSAgUGhpbGlwIFJvZ2VycyAgPHBkckBnb29nbGUu Y29tPgogCiAgICAgICAgIEZpeCBjb21wbGV4IHN0cm9rZXMgb24gQ0cgcGxhdGZvcm0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFj a0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhl bWVCbGFja0JlcnJ5LmNwcAppbmRleCBjNTc4MTNmLi5jNjRiOTZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNr QmVycnkuY3BwCkBAIC0yMyw2ICsyMyw3IEBACiAKICNpbmNsdWRlICJDU1NWYWx1ZUtleXdvcmRz LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAj aW5jbHVkZSAiTWVkaWFDb250cm9sRWxlbWVudHMuaCIKICNpbmNsdWRlICJNZWRpYVBsYXllclBy aXZhdGVCbGFja0JlcnJ5LmgiCiAjaW5jbHVkZSAiUGFpbnRJbmZvLmgiCkBAIC0yNTYsNyArMjU3 LDggQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50VGV4dEZpZWxkT3JUZXh0QXJl YU9yU2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KgogICAgIGlmIChvYmplY3QtPnN0eWxlKCktPmFw cGVhcmFuY2UoKSA9PSBTZWFyY2hGaWVsZFBhcnQpIHsKICAgICAgICAgLy8gV2UgZm9yY2UgdGhl IGZpbGwgY29sb3IgdG8gV2hpdGUgc28gYXMgdG8gbWF0Y2ggdGhlIGJhY2tncm91bmQgY29sb3Ig b2YgdGhlIHNlYXJjaCBjYW5jZWwgYnV0dG9uIGdyYXBoaWMuCiAgICAgICAgIGNvbnRleHQtPnNl dEZpbGxDb2xvcihDb2xvcjo6d2hpdGUsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotICAgICAgICBj b250ZXh0LT5kcmF3UGF0aCh0ZXh0RmllbGRSb3VuZGVkUmVjdGFuZ2xlKTsKKyAgICAgICAgY29u dGV4dC0+ZmlsbFBhdGgodGV4dEZpZWxkUm91bmRlZFJlY3RhbmdsZSk7CisgICAgICAgIGNvbnRl eHQtPnN0cm9rZVBhdGgodGV4dEZpZWxkUm91bmRlZFJlY3RhbmdsZSk7CiAgICAgfSBlbHNlCiAg ICAgICAgIGNvbnRleHQtPnN0cm9rZVBhdGgodGV4dEZpZWxkUm91bmRlZFJlY3RhbmdsZSk7CiAg ICAgY29udGV4dC0+cmVzdG9yZSgpOwpAQCAtNDA1LDcgKzQwNyw4IEBAIGJvb2wgUmVuZGVyVGhl bWVCbGFja0JlcnJ5OjpwYWludEJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFp bnRJbmZvJiBpCiAgICAgICAgIEZsb2F0U2l6ZSBzbWFsbENvcm5lcihzbWFsbFJhZGl1cywgc21h bGxSYWRpdXMpOwogICAgICAgICBQYXRoIHBhdGg7CiAgICAgICAgIHBhdGguYWRkUm91bmRlZFJl Y3QocmVjdCwgc21hbGxDb3JuZXIpOwotICAgICAgICBpbmZvLmNvbnRleHQtPmRyYXdQYXRoKHBh dGgpOworICAgICAgICBpbmZvLmNvbnRleHQtPmZpbGxQYXRoKHBhdGgpOworICAgICAgICBpbmZv LmNvbnRleHQtPnN0cm9rZVBhdGgocGF0aCk7CiAKICAgICAgICAgaWYgKGlzQ2hlY2tlZChvYmpl Y3QpKSB7CiAgICAgICAgICAgICBQYXRoIGNoZWNrUGF0aDsKQEAgLTQxNyw3ICs0MjAsOCBAQCBi b29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiBvYmpl Y3QsIGNvbnN0IFBhaW50SW5mbyYgaQogICAgICAgICAgICAgaW5mby5jb250ZXh0LT5zZXRMaW5l Q2FwKFJvdW5kQ2FwKTsKICAgICAgICAgICAgIGluZm8uY29udGV4dC0+c2V0U3Ryb2tlQ29sb3Io YmxhY2tQZW4sIENvbG9yU3BhY2VEZXZpY2VSR0IpOwogICAgICAgICAgICAgaW5mby5jb250ZXh0 LT5zZXRTdHJva2VUaGlja25lc3MocmVjdDIud2lkdGgoKSAvIGNoZWNrYm94U3Ryb2tlVGhpY2tu ZXNzKTsKLSAgICAgICAgICAgIGluZm8uY29udGV4dC0+ZHJhd1BhdGgoY2hlY2tQYXRoKTsKKyAg ICAgICAgICAgIGluZm8uY29udGV4dC0+ZmlsbFBhdGgoY2hlY2tQYXRoKTsKKyAgICAgICAgICAg IGluZm8uY29udGV4dC0+c3Ryb2tlUGF0aChjaGVja1BhdGgpOwogICAgICAgICB9CiAgICAgICAg IGJyZWFrOwogICAgIH0KQEAgLTQzNiwxMyArNDQwLDE1IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFj a0JlcnJ5OjpwYWludEJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZv JiBpCiAgICAgICAgIEZsb2F0U2l6ZSBsYXJnZUNvcm5lcihsYXJnZVJhZGl1cywgbGFyZ2VSYWRp dXMpOwogICAgICAgICBQYXRoIHBhdGg7CiAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QocmVj dCwgbGFyZ2VDb3JuZXIpOwotICAgICAgICBpbmZvLmNvbnRleHQtPmRyYXdQYXRoKHBhdGgpOwor ICAgICAgICBpbmZvLmNvbnRleHQtPmZpbGxQYXRoKHBhdGgpOworICAgICAgICBpbmZvLmNvbnRl eHQtPnN0cm9rZVBhdGgocGF0aCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIFNx dWFyZUJ1dHRvblBhcnQ6IHsKICAgICAgICAgUGF0aCBwYXRoOwogICAgICAgICBwYXRoLmFkZFJl Y3QocmVjdCk7Ci0gICAgICAgIGluZm8uY29udGV4dC0+ZHJhd1BhdGgocGF0aCk7CisgICAgICAg IGluZm8uY29udGV4dC0+ZmlsbFBhdGgocGF0aCk7CisgICAgICAgIGluZm8uY29udGV4dC0+c3Ry b2tlUGF0aChwYXRoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGRlZmF1bHQ6Ci0tIAox LjcuNS40Cgo=