93169 2012-08-03 18:05:26 -0700 [chromium] Stop relying on implicit WebFoo <-> WebCore conversion operators in compositor 2012-08-03 18:39:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs webkit.review.bot oldest_to_newest 687304 0 jamesr 2012-08-03 18:05:26 -0700 [chromium] Stop relying on implicit WebFoo <-> WebCore conversion operators in compositor 687306 1 156493 jamesr 2012-08-03 18:06:30 -0700 Created attachment 156493 Patch 687310 2 156493 enne 2012-08-03 18:08:55 -0700 Comment on attachment 156493 Patch R=me. 687322 3 jamesr 2012-08-03 18:39:44 -0700 Committed r124683: <http://trac.webkit.org/changeset/124683> 156493 2012-08-03 18:06:30 -0700 2012-08-03 18:39:57 -0700 Patch bug-93169-20120803180609.patch text/plain 13499 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQwY2M3OTUzNGMzNjll ZjY5MjAwNDgyNWU5MzdkMDk0MDNjNDEwMy4uYzZlZGYzMDE3NTE4YzJjMzgyNmZhZGIyZGE0ZTEy MTYzYzc4M2U0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA4LTAzICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBT dG9wIHJlbHlpbmcgb24gaW1wbGljaXQgV2ViRm9vIDwtPiBXZWJDb3JlIGNvbnZlcnNpb24gb3Bl cmF0b3JzIGluIGNvbXBvc2l0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkzMTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyByZW1vdmVzIHRoZSBjb21wb3NpdG9yJ3MgcmVsaWFuY2Ugb24gaW1w bGljaXQgY29udmVyc2lvbiBvcGVyYXRvcnMgZnJvbSBXZWIqIHR5cGVzIHRvIFdlYktpdC1pbnRl cm5hbAorICAgICAgICB0eXBlcywgc3BlY2lmaWNhbGx5IFdlYlJlY3QgPC0+IFdlYkNvcmU6Oklu dFJlY3QgYW5kIFdlYlN0cmluZyA8LT4gV1RGOjpTdHJpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllclRleHR1cmVVcGRhdGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXI6OnBhaW50Q29udGVudHMpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZyYW1lQnVmZmVyU2tQaWN0dXJl Q2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUJ1 ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXI6OnVwZGF0ZVRleHR1cmVSZWN0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpnZXRG cmFtZWJ1ZmZlclBpeGVscyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v U2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJM YXllckNocm9taXVtOjpzZXRUZXh0dXJlUHJpb3JpdGllcyk6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxiYXJMYXllckNocm9taXVtOjp1cGRhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDRm9udEF0bGFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDRm9u dEF0bGFzOjpkcmF3T25lTGluZU9mVGV4dEludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5TGF5ZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNDSGVhZHNVcERpc3BsYXlMYXllckltcGw6OmRyYXdGUFNDb3VudGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNVcERpc3BsYXlMYXllckltcGw6OmRyYXdEZWJ1Z1Jl Y3RzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJh ckxheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1VWUmVjdCk6CisgICAgICAgIChX ZWJDb3JlOjpDQ1Njcm9sbGJhckxheWVySW1wbDo6YXBwZW5kUXVhZHMpOgorICAgICAgICAoV2Vi Q29yZTo6Q0NTY3JvbGxiYXJMYXllckltcGw6OkNDU2Nyb2xsYmFyOjpzaXplKToKKwogMjAxMi0w OC0wMyAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3Zl IGRlcGVuZGVuY3kgb24gTGF5b3V0VHlwZXMuaCBmcm9tIHRyYW5zZm9ybWF0aW9uIGNvZGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZh c0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlci5jcHAKaW5kZXggM2Y5ZWUzNmFh NTFkN2MzMTdhMDJhMjhiMjgyMjZlMjVkNjE5NTQzMi4uYjVjNjUxYzdiNDllZTQ5NTVhMDk3YTAz OWU4ODRlNDA5OTZiZWIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJUZXh0dXJlVXBk YXRlci5jcHAKQEAgLTcwLDggKzcwLDkgQEAgdm9pZCBDYW52YXNMYXllclRleHR1cmVVcGRhdGVy OjpwYWludENvbnRlbnRzKFNrQ2FudmFzKiBjYW52YXMsIGNvbnN0IEludFJlY3QmIGMKICAgICBT a1BhaW50IHBhaW50OwogICAgIHBhaW50LnNldEFudGlBbGlhcyhmYWxzZSk7CiAgICAgcGFpbnQu c2V0WGZlcm1vZGVNb2RlKFNrWGZlcm1vZGU6OmtDbGVhcl9Nb2RlKTsKLSAgICBjYW52YXMtPmRy YXdSZWN0KGxheWVyUmVjdCwgcGFpbnQpOwotICAgIGNhbnZhcy0+Y2xpcFJlY3QobGF5ZXJSZWN0 KTsKKyAgICBTa1JlY3QgbGF5ZXJTa1JlY3QgPSBTa1JlY3Q6Ok1ha2VYWVdIKGxheWVyUmVjdC54 KCksIGxheWVyUmVjdC55KCksIGxheWVyUmVjdC53aWR0aCgpLCBsYXllclJlY3QuaGVpZ2h0KCkp OworICAgIGNhbnZhcy0+ZHJhd1JlY3QobGF5ZXJTa1JlY3QsIHBhaW50KTsKKyAgICBjYW52YXMt PmNsaXBSZWN0KGxheWVyU2tSZWN0KTsKIAogICAgIEZsb2F0UmVjdCBvcGFxdWVMYXllclJlY3Q7 CiAgICAgZG91YmxlIHBhaW50QmVnaW5UaW1lID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1l KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRnJhbWVCdWZmZXJTa1BpY3R1 cmVDYW52YXNMYXllclRleHR1cmVVcGRhdGVyLmNwcAppbmRleCA5Y2QxZTc1MGNjZjI4Yzc1NTcx ZDgxYmM5Yzc2YjRhYzI1ODBkOTQwLi5hMGU4NTdlOWQ0YmM1ZWE3OTI0OTI5NWY5MDYxYmY0YWRk ZjI1MzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZyYW1lQnVmZmVy U2tQaWN0dXJlQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlci5jcHAKQEAgLTExNyw3ICsxMTcsNyBA QCB2b2lkIEZyYW1lQnVmZmVyU2tQaWN0dXJlQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlcjo6dXBk YXRlVGV4dHVyZVJlY3QoV2ViR3JhcGhpYwogICAgIGNhbnZhcy0+dHJhbnNsYXRlKDAuMCwgdGV4 dHVyZS0+c2l6ZSgpLmhlaWdodCgpKTsKICAgICBjYW52YXMtPnNjYWxlKDEuMCwgLTEuMCk7CiAg ICAgLy8gT25seSB0aGUgcmVnaW9uIGNvcnJlc3BvbmRpbmcgdG8gZGVzdFJlY3Qgb24gdGhlIHRl eHR1cmUgbXVzdCBiZSB1cGRhdGVkLgotICAgIGNhbnZhcy0+Y2xpcFJlY3QoU2tSZWN0KGRlc3RS ZWN0KSk7CisgICAgY2FudmFzLT5jbGlwUmVjdChTa1JlY3Q6Ok1ha2VYWVdIKGRlc3RSZWN0Lngo KSwgZGVzdFJlY3QueSgpLCBkZXN0UmVjdC53aWR0aCgpLCBkZXN0UmVjdC5oZWlnaHQoKSkpOwog ICAgIC8vIFRyYW5zbGF0ZSB0aGUgb3JpZ2luIG9mIGNvbnRlbnRSZWN0IHRvIHRoYXQgb2YgZGVz dFJlY3QuCiAgICAgLy8gTm90ZSB0aGF0IGRlc3RSZWN0IGlzIGRlZmluZWQgcmVsYXRpdmUgdG8g c291cmNlUmVjdC4KICAgICBjYW52YXMtPnRyYW5zbGF0ZShjb250ZW50UmVjdCgpLngoKSAtIHNv dXJjZVJlY3QueCgpICsgZGVzdFJlY3QueCgpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJv bWl1bS5jcHAKaW5kZXggMWVjY2YzZTQ1YTkxZjUxZmQ5ZGVmNTE5YjBmODIwOGRkOGY4NGZlNi4u MDI5NmI3N2Y3NjBhYTU4YTU2NzU0MTM1MDNkMjI5Zjg1MzRiYjVkYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9t aXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0xMzA5LDggKzEzMDksOCBAQCB2b2lkIExheWVy UmVuZGVyZXJDaHJvbWl1bTo6Z2V0RnJhbWVidWZmZXJQaXhlbHModm9pZCAqcGl4ZWxzLCBjb25z dCBJbnRSZWN0JiByZQogCiAgICAgYm9vbCBkb1dvcmthcm91bmQgPSBuZWVkc0lPU3VyZmFjZVJl YWRiYWNrV29ya2Fyb3VuZCgpOwogCi0gICAgUGxhdGZvcm0zRE9iamVjdCB0ZW1wb3JhcnlUZXh0 dXJlID0gTnVsbFBsYXRmb3JtM0RPYmplY3Q7Ci0gICAgUGxhdGZvcm0zRE9iamVjdCB0ZW1wb3Jh cnlGQk8gPSBOdWxsUGxhdGZvcm0zRE9iamVjdDsKKyAgICBQbGF0Zm9ybTNET2JqZWN0IHRlbXBv cmFyeVRleHR1cmUgPSAwOworICAgIFBsYXRmb3JtM0RPYmplY3QgdGVtcG9yYXJ5RkJPID0gMDsK IAogICAgIGlmIChkb1dvcmthcm91bmQpIHsKICAgICAgICAgLy8gT24gTWFjIE9TIFgsIGNhbGxp bmcgZ2xSZWFkUGl4ZWxzIGFnYWluc3QgYW4gRkJPIHdob3NlIGNvbG9yIGF0dGFjaG1lbnQgaXMg YW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L1Njcm9sbGJhckxheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNWY3M2ViZTI2 ZTUzOGI1ODdhZGJlZjc0ODU4ZTE1ODJhZDg2N2Y1Mi4uNjUyZDc0NDliMGI0M2ViMzk2ZjZhYTZh YWY5YWZjYTFlMmM1ZGU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2Nyb2xsYmFyTGF5ZXJDaHJvbWl1bS5j cHAKQEAgLTk0LDcgKzk0LDggQEAgcHVibGljOgogICAgIHsKICAgICAgICAgV2ViS2l0OjpXZWJD YW52YXMqIGNhbnZhcyA9IHNrQ2FudmFzOwogICAgICAgICAvLyBUaGUgZm9sbG93aW5nIGlzIGEg c2ltcGxpZmljYXRpb24gb2YgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50LgotICAgICAg ICBtX3BhaW50ZXIucGFpbnRTY3JvbGxiYXJCYWNrZ3JvdW5kKGNhbnZhcywgbV9zY3JvbGxiYXIs IGNvbnRlbnRSZWN0KTsKKyAgICAgICAgV2ViS2l0OjpXZWJSZWN0IGNvbnRlbnRXZWJSZWN0KGNv bnRlbnRSZWN0LngoKSwgY29udGVudFJlY3QueSgpLCBjb250ZW50UmVjdC53aWR0aCgpLCBjb250 ZW50UmVjdC5oZWlnaHQoKSk7CisgICAgICAgIG1fcGFpbnRlci5wYWludFNjcm9sbGJhckJhY2tn cm91bmQoY2FudmFzLCBtX3Njcm9sbGJhciwgY29udGVudFdlYlJlY3QpOwogCiAgICAgICAgIGlm IChtX2dlb21ldHJ5Lmhhc0J1dHRvbnMobV9zY3JvbGxiYXIpKSB7CiAgICAgICAgICAgICBXZWJS ZWN0IGJhY2tCdXR0b25TdGFydFBhaW50UmVjdCA9IG1fZ2VvbWV0cnkuYmFja0J1dHRvblN0YXJ0 UmVjdChtX3Njcm9sbGJhcik7CkBAIC0yNDYsOCArMjQ3LDggQEAgdm9pZCBTY3JvbGxiYXJMYXll ckNocm9taXVtOjpzZXRUZXh0dXJlUHJpb3JpdGllcyhjb25zdCBDQ1ByaW9yaXR5Q2FsY3VsYXRv ciYpCiAgICAgICAgIG1fZm9yZVRyYWNrLT50ZXh0dXJlKCktPnNldFJlcXVlc3RQcmlvcml0eShD Q1ByaW9yaXR5Q2FsY3VsYXRvcjo6dWlQcmlvcml0eShkcmF3c1RvUm9vdCkpOwogICAgIH0KICAg ICBpZiAobV90aHVtYikgewotICAgICAgICBJbnRTaXplIHRodW1iU2l6ZSA9IEludFJlY3QobV9n ZW9tZXRyeS50aHVtYlJlY3QobV9zY3JvbGxiYXIuZ2V0KCkpKS5zaXplKCk7Ci0gICAgICAgIG1f dGh1bWItPnRleHR1cmUoKS0+c2V0RGltZW5zaW9ucyh0aHVtYlNpemUsIG1fdGV4dHVyZUZvcm1h dCk7CisgICAgICAgIFdlYktpdDo6V2ViUmVjdCB0aHVtYlJlY3QgPSBtX2dlb21ldHJ5LnRodW1i UmVjdChtX3Njcm9sbGJhci5nZXQoKSk7CisgICAgICAgIG1fdGh1bWItPnRleHR1cmUoKS0+c2V0 RGltZW5zaW9ucyhJbnRTaXplKHRodW1iUmVjdC53aWR0aCwgdGh1bWJSZWN0LmhlaWdodCksIG1f dGV4dHVyZUZvcm1hdCk7CiAgICAgICAgIG1fdGh1bWItPnRleHR1cmUoKS0+c2V0UmVxdWVzdFBy aW9yaXR5KENDUHJpb3JpdHlDYWxjdWxhdG9yOjp1aVByaW9yaXR5KGRyYXdzVG9Sb290KSk7CiAg ICAgfQogfQpAQCAtMjU5LDE2ICsyNjAsMTcgQEAgdm9pZCBTY3JvbGxiYXJMYXllckNocm9taXVt Ojp1cGRhdGUoQ0NUZXh0dXJlVXBkYXRlciYgdXBkYXRlciwgY29uc3QgQ0NPY2NsdXNpb24KIAog ICAgIGNyZWF0ZVRleHR1cmVVcGRhdGVySWZOZWVkZWQoKTsKIAotICAgIEludFBvaW50IHNjcm9s bGJhck9yaWdpbihtX3Njcm9sbGJhci0+bG9jYXRpb24oKSk7CisgICAgSW50UG9pbnQgc2Nyb2xs YmFyT3JpZ2luKG1fc2Nyb2xsYmFyLT5sb2NhdGlvbigpLngsIG1fc2Nyb2xsYmFyLT5sb2NhdGlv bigpLnkpOwogICAgIEludFJlY3QgY29udGVudFJlY3Qoc2Nyb2xsYmFyT3JpZ2luLCBjb250ZW50 Qm91bmRzKCkpOwogICAgIHVwZGF0ZVBhcnQobV9iYWNrVHJhY2tVcGRhdGVyLmdldCgpLCBtX2Jh Y2tUcmFjay5nZXQoKSwgY29udGVudFJlY3QsIHVwZGF0ZXIsIHN0YXRzKTsKICAgICBpZiAobV9m b3JlVHJhY2sgJiYgbV9mb3JlVHJhY2tVcGRhdGVyKQogICAgICAgICB1cGRhdGVQYXJ0KG1fZm9y ZVRyYWNrVXBkYXRlci5nZXQoKSwgbV9mb3JlVHJhY2suZ2V0KCksIGNvbnRlbnRSZWN0LCB1cGRh dGVyLCBzdGF0cyk7CiAKICAgICAvLyBDb25zaWRlciB0aGUgdGh1bWIgdG8gYmUgYXQgdGhlIG9y aWdpbiB3aGVuIHBhaW50aW5nLgotICAgIEludFJlY3QgdGh1bWJSZWN0ID0gSW50UmVjdChJbnRQ b2ludCgpLCBJbnRSZWN0KG1fZ2VvbWV0cnkudGh1bWJSZWN0KG1fc2Nyb2xsYmFyLmdldCgpKSku c2l6ZSgpKTsKLSAgICBpZiAoIXRodW1iUmVjdC5pc0VtcHR5KCkpCi0gICAgICAgIHVwZGF0ZVBh cnQobV90aHVtYlVwZGF0ZXIuZ2V0KCksIG1fdGh1bWIuZ2V0KCksIHRodW1iUmVjdCwgdXBkYXRl ciwgc3RhdHMpOworICAgIFdlYktpdDo6V2ViUmVjdCB0aHVtYlJlY3QgPSBtX2dlb21ldHJ5LnRo dW1iUmVjdChtX3Njcm9sbGJhci5nZXQoKSk7CisgICAgSW50UmVjdCBvcmlnaW5UaHVtYlJlY3Qg PSBJbnRSZWN0KDAsIDAsIHRodW1iUmVjdC53aWR0aCwgdGh1bWJSZWN0LmhlaWdodCk7CisgICAg aWYgKCFvcmlnaW5UaHVtYlJlY3QuaXNFbXB0eSgpKQorICAgICAgICB1cGRhdGVQYXJ0KG1fdGh1 bWJVcGRhdGVyLmdldCgpLCBtX3RodW1iLmdldCgpLCBvcmlnaW5UaHVtYlJlY3QsIHVwZGF0ZXIs IHN0YXRzKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NGb250QXRsYXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NGb250QXRsYXMuY3BwCmluZGV4IGY5NDE0NTRjY2Y3 NTRkODVlOWU1ZWE2Y2Y0NGUxOGFhMTA1OGY2ZGMuLjY1Y2Y0MzRkYjU1YmZmODU2M2IzNjc1YWZj MTU2NTk5MGE2OTZlMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDRm9udEF0bGFzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0ZvbnRBdGxhcy5jcHAKQEAgLTcxLDcgKzcxLDcg QEAgdm9pZCBDQ0ZvbnRBdGxhczo6ZHJhd09uZUxpbmVPZlRleHRJbnRlcm5hbChTa0NhbnZhcyog Y2FudmFzLCBjb25zdCBTdHJpbmcmIHRleHQKICAgICAgICAgLy8gSWYgdGhlIEFTQ0lJIGNvZGUg aXMgb3V0IG9mIGJvdW5kcywgdGhlbiBpbmRleCAwIGlzIHVzZWQsIHdoaWNoIGlzIGp1c3QgYSBw bGFpbiByZWN0YW5nbGUgZ2x5cGguCiAgICAgICAgIGludCBhc2NpaUluZGV4ID0gKHRleHRMaW5l W2ldIDwgMTI4KSA/IHRleHRMaW5lW2ldIDogMDsKICAgICAgICAgSW50UmVjdCBnbHlwaEJvdW5k cyA9IG1fYXNjaWlUb1JlY3RUYWJsZVthc2NpaUluZGV4XTsKLSAgICAgICAgU2tJUmVjdCBzb3Vy Y2UgPSBnbHlwaEJvdW5kczsKKyAgICAgICAgU2tJUmVjdCBzb3VyY2UgPSBTa0lSZWN0OjpNYWtl WFlXSChnbHlwaEJvdW5kcy54KCksIGdseXBoQm91bmRzLnkoKSwgZ2x5cGhCb3VuZHMud2lkdGgo KSwgZ2x5cGhCb3VuZHMuaGVpZ2h0KCkpOwogICAgICAgICBjYW52YXMtPmRyYXdCaXRtYXBSZWN0 KG1fYXRsYXMsICZzb3VyY2UsIFNrUmVjdDo6TWFrZVhZV0gocG9zaXRpb24ueCgpLCBwb3NpdGlv bi55KCksIGdseXBoQm91bmRzLndpZHRoKCksIGdseXBoQm91bmRzLmhlaWdodCgpKSk7CiAgICAg ICAgIHBvc2l0aW9uLnNldFgocG9zaXRpb24ueCgpICsgZ2x5cGhCb3VuZHMud2lkdGgoKSk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NIZWFkc1VwRGlzcGxheUxheWVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5TGF5ZXJJbXBsLmNwcApp bmRleCBjZmU4OTEwNjBmYWUxYjM4MDhkM2FjMWY3ZGVlYWFmZjM1ZmVmYjBkLi5kZDMyMWIxYTY0 M2QxMzU0YWQ0ZTg1OGQ1NTYzMDQwNzNjOGJlYjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5TGF5ZXJJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0hlYWRzVXBEaXNwbGF5TGF5ZXJJbXBsLmNwcApAQCAtMTg3LDcgKzE4Nyw3IEBAIHZvaWQgQ0NI ZWFkc1VwRGlzcGxheUxheWVySW1wbDo6ZHJhd0ZQU0NvdW50ZXIoU2tDYW52YXMqIGNhbnZhcywg Q0NGcmFtZVJhdGVDb3VuCiAgICAgICAgICAgICBwID0gMTsKIAogICAgICAgICAvLyBQbG90IHRo aXMgZGF0YSBwb2ludC4KLSAgICAgICAgSW50UG9pbnQgY3VyKGdyYXBoTGVmdCArIHgsIDEgKyB0 b3AgKyBwKmgpOworICAgICAgICBTa1BvaW50IGN1ciA9IFNrUG9pbnQ6Ok1ha2UoZ3JhcGhMZWZ0 ICsgeCwgMSArIHRvcCArIHAqaCk7CiAgICAgICAgIGlmIChwYXRoLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIHBhdGgubW92ZVRvKGN1cik7CiAgICAgICAgIGVsc2UKQEAgLTI1NywxNSArMjU3LDE2 IEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheUxheWVySW1wbDo6ZHJhd0RlYnVnUmVjdHMoU2tDYW52 YXMqIGNhbnZhcywgQ0NEZWJ1Z1JlY3RIaXN0CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogCi0gICAgICAgIFNrUmVjdCByZWN0ID0gZGVidWdSZWN0c1tpXS5yZWN0OworICAgICAgICBj b25zdCBGbG9hdFJlY3QmIHJlY3QgPSBkZWJ1Z1JlY3RzW2ldLnJlY3Q7CisgICAgICAgIFNrUmVj dCBza1JlY3QgPSBTa1JlY3Q6Ok1ha2VYWVdIKHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKICAgICAgICAgU2tQYWludCBwYWludDsKICAgICAgICAgcGFp bnQuc2V0Q29sb3IoZmlsbENvbG9yKTsKLSAgICAgICAgY2FudmFzLT5kcmF3UmVjdChyZWN0LCBw YWludCk7CisgICAgICAgIGNhbnZhcy0+ZHJhd1JlY3Qoc2tSZWN0LCBwYWludCk7CiAKICAgICAg ICAgcGFpbnQuc2V0Q29sb3Ioc3Ryb2tlQ29sb3IpOwogICAgICAgICBwYWludC5zZXRTdHlsZShT a1BhaW50OjprU3Ryb2tlX1N0eWxlKTsKICAgICAgICAgcGFpbnQuc2V0U3Ryb2tlV2lkdGgoMik7 Ci0gICAgICAgIGNhbnZhcy0+ZHJhd1JlY3QocmVjdCwgcGFpbnQpOworICAgICAgICBjYW52YXMt PmRyYXdSZWN0KHNrUmVjdCwgcGFpbnQpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllcklt cGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NT Y3JvbGxiYXJMYXllckltcGwuY3BwCmluZGV4IDMxYWJiMWQzOTQwMjYxYmEzMmExM2Y5OGYwNGFi NmM5ZjY5OTg5YzIuLjU4MDE4YWFkMjY0NDM0Y2NhNTUxNGY0YjM3NjM4ODlkNzVlZmM5NTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND U2Nyb2xsYmFyTGF5ZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJhckxheWVySW1wbC5jcHAKQEAgLTgwLDEwICs4MCwx MCBAQCB2b2lkIENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpzZXRTY3JvbGxiYXJEYXRhKGNvbnN0IFdl YlNjcm9sbGJhciogc2Nyb2xsYmFyLCBXZWJLaQogICAgIHNjcm9sbGJhci0+Z2V0VGlja21hcmtz KG1fdGlja21hcmtzKTsKIH0KIAotc3RhdGljIEZsb2F0UmVjdCB0b1VWUmVjdChjb25zdCBXZWJS ZWN0JiByLCBjb25zdCBXZWJSZWN0JiBib3VuZHMpCitzdGF0aWMgRmxvYXRSZWN0IHRvVVZSZWN0 KGNvbnN0IFdlYlJlY3QmIHIsIGNvbnN0IEludFJlY3QmIGJvdW5kcykKIHsKLSAgICByZXR1cm4g RmxvYXRSZWN0KHN0YXRpY19jYXN0PGZsb2F0PihyLngpIC8gYm91bmRzLndpZHRoLCBzdGF0aWNf Y2FzdDxmbG9hdD4oci55KSAvIGJvdW5kcy5oZWlnaHQsCi0gICAgICAgICAgICAgICAgICAgICBz dGF0aWNfY2FzdDxmbG9hdD4oci53aWR0aCkgLyBib3VuZHMud2lkdGgsIHN0YXRpY19jYXN0PGZs b2F0PihyLmhlaWdodCkgLyBib3VuZHMuaGVpZ2h0KTsKKyAgICByZXR1cm4gRmxvYXRSZWN0KHN0 YXRpY19jYXN0PGZsb2F0PihyLngpIC8gYm91bmRzLndpZHRoKCksIHN0YXRpY19jYXN0PGZsb2F0 PihyLnkpIC8gYm91bmRzLmhlaWdodCgpLAorICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nh c3Q8ZmxvYXQ+KHIud2lkdGgpIC8gYm91bmRzLndpZHRoKCksIHN0YXRpY19jYXN0PGZsb2F0Pihy LmhlaWdodCkgLyBib3VuZHMuaGVpZ2h0KCkpOwogfQogCiB2b2lkIENDU2Nyb2xsYmFyTGF5ZXJJ bXBsOjpzY3JvbGxiYXJHZW9tZXRyeShXZWJSZWN0JiB0aHVtYlJlY3QsIFdlYlJlY3QmIGJhY2tU cmFja1JlY3QsIFdlYlJlY3QmIGZvcmVUcmFja1JlY3QpCkBAIC0xMDQsNyArMTA0LDcgQEAgdm9p ZCBDQ1Njcm9sbGJhckxheWVySW1wbDo6YXBwZW5kUXVhZHMoQ0NRdWFkU2luayYgcXVhZExpc3Qs IGNvbnN0IENDU2hhcmVkUXVhZFMKICAgICBzY3JvbGxiYXJHZW9tZXRyeSh0aHVtYlJlY3QsIGJh Y2tUcmFja1JlY3QsIGZvcmVUcmFja1JlY3QpOwogCiAgICAgaWYgKG1fdGh1bWJSZXNvdXJjZUlk ICYmICF0aHVtYlJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIE93blB0cjxDQ1RleHR1cmVEcmF3 UXVhZD4gcXVhZCA9IENDVGV4dHVyZURyYXdRdWFkOjpjcmVhdGUoc2hhcmVkUXVhZFN0YXRlLCBJ bnRSZWN0KHRodW1iUmVjdCksIG1fdGh1bWJSZXNvdXJjZUlkLCBwcmVtdWx0aXBsZWRBbHBoYSwg dXZSZWN0LCBmbGlwcGVkKTsKKyAgICAgICAgT3duUHRyPENDVGV4dHVyZURyYXdRdWFkPiBxdWFk ID0gQ0NUZXh0dXJlRHJhd1F1YWQ6OmNyZWF0ZShzaGFyZWRRdWFkU3RhdGUsIEludFJlY3QodGh1 bWJSZWN0LngsIHRodW1iUmVjdC55LCB0aHVtYlJlY3Qud2lkdGgsIHRodW1iUmVjdC5oZWlnaHQp LCBtX3RodW1iUmVzb3VyY2VJZCwgcHJlbXVsdGlwbGVkQWxwaGEsIHV2UmVjdCwgZmxpcHBlZCk7 CiAgICAgICAgIHF1YWQtPnNldE5lZWRzQmxlbmRpbmcoKTsKICAgICAgICAgcXVhZExpc3QuYXBw ZW5kKHF1YWQucmVsZWFzZSgpKTsKICAgICB9CkBAIC0xMTQsNyArMTE0LDcgQEAgdm9pZCBDQ1Nj cm9sbGJhckxheWVySW1wbDo6YXBwZW5kUXVhZHMoQ0NRdWFkU2luayYgcXVhZExpc3QsIGNvbnN0 IENDU2hhcmVkUXVhZFMKIAogICAgIC8vIFdlIG9ubHkgcGFpbnQgdGhlIHRyYWNrIGluIHR3byBw YXJ0cyBpZiB3ZSB3ZXJlIGdpdmVuIGEgdGV4dHVyZSBmb3IgdGhlIGZvcndhcmQgdHJhY2sgcGFy dC4KICAgICBpZiAobV9mb3JlVHJhY2tSZXNvdXJjZUlkICYmICFmb3JlVHJhY2tSZWN0LmlzRW1w dHkoKSkKLSAgICAgICAgcXVhZExpc3QuYXBwZW5kKENDVGV4dHVyZURyYXdRdWFkOjpjcmVhdGUo c2hhcmVkUXVhZFN0YXRlLCBJbnRSZWN0KGZvcmVUcmFja1JlY3QpLCBtX2ZvcmVUcmFja1Jlc291 cmNlSWQsIHByZW11bHRpcGxlZEFscGhhLCB0b1VWUmVjdChmb3JlVHJhY2tSZWN0LCBib3VuZHNS ZWN0KSwgZmxpcHBlZCkpOworICAgICAgICBxdWFkTGlzdC5hcHBlbmQoQ0NUZXh0dXJlRHJhd1F1 YWQ6OmNyZWF0ZShzaGFyZWRRdWFkU3RhdGUsIEludFJlY3QoZm9yZVRyYWNrUmVjdC54LCBmb3Jl VHJhY2tSZWN0LnksIGZvcmVUcmFja1JlY3Qud2lkdGgsIGZvcmVUcmFja1JlY3QuaGVpZ2h0KSwg bV9mb3JlVHJhY2tSZXNvdXJjZUlkLCBwcmVtdWx0aXBsZWRBbHBoYSwgdG9VVlJlY3QoZm9yZVRy YWNrUmVjdCwgYm91bmRzUmVjdCksIGZsaXBwZWQpKTsKIAogICAgIC8vIE9yZGVyIG1hdHRlcnMg aGVyZTogc2luY2UgdGhlIGJhY2sgdHJhY2sgdGV4dHVyZSBpcyBiZWluZyBkcmF3biB0byB0aGUg ZW50aXJlIGNvbnRlbnRzIHJlY3QsIHdlIG11c3QgYXBwZW5kIGl0IGFmdGVyIHRoZSB0aHVtYiBh bmQKICAgICAvLyBmb3JlIHRyYWNrIHF1YWRzLiBUaGUgYmFjayB0cmFjayB0ZXh0dXJlIGNvbnRh aW5zIChhbmQgZGlzcGxheXMpIHRoZSBidXR0b25zLgpAQCAtMTQ2LDcgKzE0Niw3IEBAIFdlYktp dDo6V2ViUG9pbnQgQ0NTY3JvbGxiYXJMYXllckltcGw6OkNDU2Nyb2xsYmFyOjpsb2NhdGlvbigp IGNvbnN0CiAKIFdlYktpdDo6V2ViU2l6ZSBDQ1Njcm9sbGJhckxheWVySW1wbDo6Q0NTY3JvbGxi YXI6OnNpemUoKSBjb25zdAogewotICAgIHJldHVybiBtX293bmVyLT5jb250ZW50Qm91bmRzKCk7 CisgICAgcmV0dXJuIFdlYktpdDo6V2ViU2l6ZShtX293bmVyLT5jb250ZW50Qm91bmRzKCkud2lk dGgoKSwgbV9vd25lci0+Y29udGVudEJvdW5kcygpLmhlaWdodCgpKTsKIH0KIAogYm9vbCBDQ1Nj cm9sbGJhckxheWVySW1wbDo6Q0NTY3JvbGxiYXI6OmVuYWJsZWQoKSBjb25zdAo=