123519 2013-10-30 11:38:55 -0700 Revert r158243 2013-10-30 11:46:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 123520 P2 Normal --- 1 mmaxfield mmaxfield jonlee simon.fraser oldest_to_newest 945072 0 mmaxfield 2013-10-30 11:38:55 -0700 Revert r158243 945074 1 215539 mmaxfield 2013-10-30 11:42:33 -0700 Created attachment 215539 Patch 945079 2 simon.fraser 2013-10-30 11:46:16 -0700 *** This bug has been marked as a duplicate of bug 123520 *** 215539 2013-10-30 11:42:33 -0700 2013-10-30 11:46:28 -0700 Patch bug-123519-20131030114232.patch text/plain 15713 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMTNjYmE3MDBiOWMwNjU1YWMzNjQ3ZGYwNTFhZjYx M2RhYjNlMGQ3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2ZXJ0IHIx NTgyNDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MzUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh cmluIGNvcnJlY3RseSByZWFsaXplZCB0aGF0IG90aGVyIHBvcnRzIG1pZ2h0IG5vdCB3YW50IHRo ZSBmdW5jdGlvbmFsaXR5CisgICAgICAgIHRoYXQgcjE1ODI0MyBwcm92aWRlcy4gV2Ugc2hvdWxk bid0IGludHJvZHVjZSBjaGFuZ2VzIGluIG90aGVyIHBvcnQncworICAgICAgICByZW5kZXJpbmcu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L1BhdGhCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0OjpkcmF3TGluZUZvclRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNl L0dyYXBoaWNzQ29udGV4dFdpbkNFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6ZHJhd0xpbmVGb3JUZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29yZVRl eHRSZW5kZXJlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkb0RyYXdUZXh0QXRQb2ludCk6Cisg ICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5saW5lVGV4dEJveDo6cGFpbnREZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZVRleHRCb3g6OnBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmUpOgorCiAyMDEzLTEwLTMwICBwZWF2 b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIEZhdmljb25zIGFy ZSBmbGlwcGVkIGluIHZlcnRpY2FsIGRpcmVjdGlvbiBpbiBXaW5DYWlybyBidWlsZHMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmlu ZGV4IDAzOWVlZmYxNzE2NTI3ZDM2NGM5ZGVkY2E4MTM1YTM2MGM0YzZjNzkuLmMzMDhjYmQwYjdk ODU0ZjNkOGViMGJlZmQzYTlmM2Y0ZDRhNzk3YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0zMzAsNyArMzMwLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB9OwogICAgICAgICBGbG9hdFJlY3Qgcm91bmRU b0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmLCBSb3VuZGluZ01vZGUgPSBSb3VuZEFsbFNp ZGVzKTsKIAotICAgICAgICB2b2lkIGRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFJlY3QmIGJv dW5kcywgYm9vbCBwcmludGluZyk7CisgICAgICAgIHZvaWQgZHJhd0xpbmVGb3JUZXh0KGNvbnN0 IEZsb2F0UG9pbnQmLCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZyk7CiAgICAgICAgIGVudW0g RG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgewogICAgICAgICAgICAgRG9jdW1lbnRNYXJrZXJTcGVs bGluZ0xpbmVTdHlsZSwKICAgICAgICAgICAgIERvY3VtZW50TWFya2VyR3JhbW1hckxpbmVTdHls ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvUGF0aEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YmxhY2tiZXJyeS9QYXRoQmxhY2tCZXJyeS5jcHAKaW5kZXggZmFlYzY4YmRlNWNjNjZmZjIxMWZm ZWE3MTU4YjQzNGU0NDZmOTcyNC4uYWM2ZDZiYTY0ZGZmY2EwYTE1NmZhZjgwMGI5N2NkZGRkODlk NTRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2ti ZXJyeS9QYXRoQmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9QYXRoQmxhY2tCZXJyeS5jcHAKQEAgLTI2MywxMiArMjYzLDEyIEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZs b2F0UG9pbnQmIHB0LCBmbG9hdCB3aWR0CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmFkZERyYXdM aW5lRm9yRG9jdW1lbnRNYXJrZXIocHQsIHdpZHRoLCAoQmxhY2tCZXJyeTo6UGxhdGZvcm06Okdy YXBoaWNzOjpEb2N1bWVudE1hcmtlckxpbmVTdHlsZSlzdHlsZSk7CiB9CiAKLXZvaWQgR3JhcGhp Y3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRSZWN0JiBib3VuZHMsIGJvb2wg cHJpbnRpbmcpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZs b2F0UG9pbnQmIHB0LCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZykKIHsKICAgICBpZiAocGFp bnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBwbGF0Zm9ybUNvbnRleHQo KS0+YWRkRHJhd0xpbmVGb3JUZXh0KGJvdW5kcy5sb2NhdGlvbiwgYm91bmRzLndpZHRoKCksIHBy aW50aW5nKTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+YWRkRHJhd0xpbmVGb3JUZXh0KHB0LCB3 aWR0aCwgcHJpbnRpbmcpOwogfQogCiAvLyBGSVhNRTogZG9uJ3QgaWdub3JlIHRoZSB3aW5kaW5n IHJ1bGUuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcwNjQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAppbmRleCBhNzFiMTQ1YjQzY2RhNWFkNzI2MTJmMjQ4 MWViMTc5NGM5ZWUyYmE0Li43MDM2MGVkN2VjODc1MmU2MDQyZWZiYzRmMzg4NzE5ZjRmMjFjMTBh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFw aGljc0NvbnRleHRDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC02MTQsNyArNjE0LDcgQEAgdm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgVmVjdG9yPEludFJlY3Q+JiBy ZWN0cywgaW50IHdpZHRoLCBpbnQKICAgICBjYWlyb19yZXN0b3JlKGNyKTsKIH0KIAotdm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFJlY3QmIGJvdW5kcywg Ym9vbCkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQ b2ludCYgb3JpZ2luLCBmbG9hdCB3aWR0aCwgYm9vbCkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNh YmxlZCgpKQogICAgICAgICByZXR1cm47CkBAIC02MjMsMTYgKzYyMywxNiBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UmVjdCYgYm91bmRzLCBib29s KQogICAgIGNhaXJvX3NhdmUoY2Fpcm9Db250ZXh0KTsKIAogICAgIC8vIFRoaXMgYnVtcGluZyBv ZiA8MSBzdHJva2UgdGhpY2tuZXNzZXMgbWF0Y2hlcyB0aGUgb25lIGluIGRyYXdMaW5lT25DYWly b0NvbnRleHQuCi0gICAgRmxvYXRQb2ludCBlbmRQb2ludChib3VuZHMubG9jYXRpb24oKSArIElu dFNpemUoYm91bmRzLndpZHRoKCksIDApKTsKLSAgICBGbG9hdFJlY3QgbGluZUV4dGVudHMoYm91 bmRzLmxvY2F0aW9uKCksIEZsb2F0U2l6ZShib3VuZHMud2lkdGgoKSwgc3Ryb2tlVGhpY2tuZXNz KCkpKTsKKyAgICBGbG9hdFBvaW50IGVuZFBvaW50KG9yaWdpbiArIEludFNpemUod2lkdGgsIDAp KTsKKyAgICBGbG9hdFJlY3QgbGluZUV4dGVudHMob3JpZ2luLCBGbG9hdFNpemUod2lkdGgsIHN0 cm9rZVRoaWNrbmVzcygpKSk7CiAKICAgICBTaGFkb3dCbHVyJiBzaGFkb3cgPSBwbGF0Zm9ybUNv bnRleHQoKS0+c2hhZG93Qmx1cigpOwogICAgIGlmIChHcmFwaGljc0NvbnRleHQqIHNoYWRvd0Nv bnRleHQgPSBzaGFkb3cuYmVnaW5TaGFkb3dMYXllcih0aGlzLCBsaW5lRXh0ZW50cykpIHsKLSAg ICAgICAgZHJhd0xpbmVPbkNhaXJvQ29udGV4dCh0aGlzLCBzaGFkb3dDb250ZXh0LT5wbGF0Zm9y bUNvbnRleHQoKS0+Y3IoKSwgYm91bmRzLmxvY2F0aW9uKCksIGVuZFBvaW50KTsKKyAgICAgICAg ZHJhd0xpbmVPbkNhaXJvQ29udGV4dCh0aGlzLCBzaGFkb3dDb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKS0+Y3IoKSwgb3JpZ2luLCBlbmRQb2ludCk7CiAgICAgICAgIHNoYWRvdy5lbmRTaGFkb3dM YXllcih0aGlzKTsKICAgICB9CiAKLSAgICBkcmF3TGluZU9uQ2Fpcm9Db250ZXh0KHRoaXMsIGNh aXJvQ29udGV4dCwgYm91bmRzLmxvY2F0aW9uKCksIGVuZFBvaW50KTsKKyAgICBkcmF3TGluZU9u Q2Fpcm9Db250ZXh0KHRoaXMsIGNhaXJvQ29udGV4dCwgb3JpZ2luLCBlbmRQb2ludCk7CiAgICAg Y2Fpcm9fcmVzdG9yZShjYWlyb0NvbnRleHQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKaW5kZXgg ZTc1MjkzZDM3ZDg1MzhjYTBjOWI2MmY0ZWRkZWM4M2RjMTE3MDBiNy4uMWE5YzkwNTVlNmM5MjAz ZmI1NDAzOTkxYmViYjc0Y2U5ODNlZDU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcApAQCAtMTIzNSwx NiArMTIzNSw1MyBAQCBGbG9hdFJlY3QgR3JhcGhpY3NDb250ZXh0Ojpyb3VuZFRvRGV2aWNlUGl4 ZWxzKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgUm91bmRpbmdNbwogICAgIHJldHVybiBGbG9hdFJl Y3Qocm91bmRlZE9yaWdpbiwgcm91bmRlZExvd2VyUmlnaHQgLSByb3VuZGVkT3JpZ2luKTsKIH0K IAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFJlY3Qm IGJvdW5kcywgYm9vbCkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29u c3QgRmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZHRoLCBib29sIHByaW50aW5nKQogewogICAg IGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmICh3aWR0 aCA8PSAwKQorICAgICAgICByZXR1cm47CisKKyAgICBmbG9hdCB4ID0gcG9pbnQueCgpOworICAg IGZsb2F0IHkgPSBwb2ludC55KCk7CisgICAgZmxvYXQgbGluZUxlbmd0aCA9IHdpZHRoOworCisg ICAgLy8gVXNlIGEgbWluaW11bSB0aGlja25lc3Mgb2YgMC41IGluIHVzZXIgc3BhY2UuCisgICAg Ly8gU2VlIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNTUgZm9yIGRl dGFpbHMgb2Ygd2h5IDAuNSBpcyB0aGUgcmlnaHQgbWluaW11bSB0aGlja25lc3MgdG8gdXNlLgor ICAgIGZsb2F0IHRoaWNrbmVzcyA9IG1heChzdHJva2VUaGlja25lc3MoKSwgMC41Zik7CisKKyAg ICBib29sIHJlc3RvcmVBbnRpYWxpYXNNb2RlID0gZmFsc2U7CisKKyAgICBpZiAoIXByaW50aW5n ICYmIGdldENUTShHcmFwaGljc0NvbnRleHQ6OkRlZmluaXRlbHlJbmNsdWRlRGV2aWNlU2NhbGUp LnByZXNlcnZlc0F4aXNBbGlnbm1lbnQoKSkgeworICAgICAgICAvLyBPbiBzY3JlZW4sIHVzZSBh IG1pbmltdW0gdGhpY2tuZXNzIG9mIDEuMCBpbiB1c2VyIHNwYWNlIChsYXRlciByb3VuZGVkIHRv IGFuIGludGVncmFsIG51bWJlciBpbiBkZXZpY2Ugc3BhY2UpLgorICAgICAgICBmbG9hdCBhZGp1 c3RlZFRoaWNrbmVzcyA9IG1heCh0aGlja25lc3MsIDEuMGYpOworCisgICAgICAgIC8vIEZJWE1F OiBUaGlzIHNob3VsZCBiZSBkb25lIGEgYmV0dGVyIHdheS4KKyAgICAgICAgLy8gV2UgdHJ5IHRv IHJvdW5kIGFsbCBwYXJhbWV0ZXJzIHRvIGludGVnZXIgYm91bmRhcmllcyBpbiBkZXZpY2Ugc3Bh Y2UuIElmIHJvdW5kaW5nIHBpeGVscyBpbiBkZXZpY2Ugc3BhY2UKKyAgICAgICAgLy8gbWFrZXMg b3VyIHRoaWNrbmVzcyBtb3JlIHRoYW4gZG91YmxlLCB0aGVuIHRoZXJlIG11c3QgYmUgYSBzaHJp bmtpbmctc2NhbGUgZmFjdG9yIGFuZCByb3VuZGluZyB0byBwaXhlbHMKKyAgICAgICAgLy8gaW4g ZGV2aWNlIHNwYWNlIHdpbGwgbWFrZSB0aGUgdW5kZXJsaW5lcyB0b28gdGhpY2suCisgICAgICAg IENHUmVjdCBsaW5lUmVjdCA9IHJvdW5kVG9EZXZpY2VQaXhlbHMoRmxvYXRSZWN0KHgsIHksIGxp bmVMZW5ndGgsIGFkanVzdGVkVGhpY2tuZXNzKSwgUm91bmRBbGxTaWRlcyk7CisgICAgICAgIGlm IChsaW5lUmVjdC5zaXplLmhlaWdodCA8IHRoaWNrbmVzcyAqIDIuMCkgeworICAgICAgICAgICAg eCA9IGxpbmVSZWN0Lm9yaWdpbi54OworICAgICAgICAgICAgeSA9IGxpbmVSZWN0Lm9yaWdpbi55 OworICAgICAgICAgICAgbGluZUxlbmd0aCA9IGxpbmVSZWN0LnNpemUud2lkdGg7CisgICAgICAg ICAgICB0aGlja25lc3MgPSBsaW5lUmVjdC5zaXplLmhlaWdodDsKKyAgICAgICAgICAgIGlmIChz aG91bGRBbnRpYWxpYXMoKSkgeworICAgICAgICAgICAgICAgIENHQ29udGV4dFNldFNob3VsZEFu dGlhbGlhcyhwbGF0Zm9ybUNvbnRleHQoKSwgZmFsc2UpOworICAgICAgICAgICAgICAgIHJlc3Rv cmVBbnRpYWxpYXNNb2RlID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0K KwogICAgIGlmIChmaWxsQ29sb3IoKSAhPSBzdHJva2VDb2xvcigpKQogICAgICAgICBzZXRDR0Zp bGxDb2xvcihwbGF0Zm9ybUNvbnRleHQoKSwgc3Ryb2tlQ29sb3IoKSwgc3Ryb2tlQ29sb3JTcGFj ZSgpKTsKLSAgICBDR0NvbnRleHRGaWxsUmVjdChwbGF0Zm9ybUNvbnRleHQoKSwgQ0dSZWN0TWFr ZShib3VuZHMubG9jYXRpb24oKS54KCksIGJvdW5kcy5sb2NhdGlvbigpLnkoKSwgYm91bmRzLndp ZHRoKCksIGJvdW5kcy5oZWlnaHQoKSkpOworICAgIENHQ29udGV4dEZpbGxSZWN0KHBsYXRmb3Jt Q29udGV4dCgpLCBDR1JlY3RNYWtlKHgsIHksIGxpbmVMZW5ndGgsIHRoaWNrbmVzcykpOwogICAg IGlmIChmaWxsQ29sb3IoKSAhPSBzdHJva2VDb2xvcigpKQogICAgICAgICBzZXRDR0ZpbGxDb2xv cihwbGF0Zm9ybUNvbnRleHQoKSwgZmlsbENvbG9yKCksIGZpbGxDb2xvclNwYWNlKCkpOworCisg ICAgaWYgKHJlc3RvcmVBbnRpYWxpYXNNb2RlKQorICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRB bnRpYWxpYXMocGxhdGZvcm1Db250ZXh0KCksIHRydWUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6c2V0VVJMRm9yUmVjdChjb25zdCBVUkwmIGxpbmssIGNvbnN0IEludFJlY3QmIGRlc3RS ZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv R3JhcGhpY3NDb250ZXh0V2luQ0UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luQ0UuY3BwCmluZGV4IDE1N2ZhZTQ4YTc5ZGQzM2Iw ZTI3ODYxYzIzODkzYWE0ZGY4YjFmOTguLjFmZjNmYWUxYWQ5MzI1MDUwNGRhZWFiNTc3NDBhZjFm NzhhNjgxY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bmNlL0dyYXBoaWNzQ29udGV4dFdpbkNFLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRleHRXaW5DRS5jcHAKQEAgLTk1MCwxNCArOTUw LDE0IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxJ bnRSZWN0PiYgcmVjdHMsIGludCB3aWR0aCwgaW50CiAgICAgRHJhd0ZvY3VzUmVjdChkYywgJnJl Y3QpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZs b2F0UmVjdCYgYm91bmRzLCBib29sKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9y VGV4dChjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpZHRoLCBib29sIHByaW50aW5n KQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IFN0cm9rZVN0eWxlIG9sZFN0eWxlID0gc3Ryb2tlU3R5bGUoKTsKICAgICBzZXRTdHJva2VTdHls ZShTb2xpZFN0cm9rZSk7Ci0gICAgZHJhd0xpbmUocm91bmRlZEludFBvaW50KGJvdW5kcy5sb2Nh dGlvbigpKSwgcm91bmRlZEludFBvaW50KGJvdW5kcy5sb2NhdGlvbigpICsgRmxvYXRTaXplKGJv dW5kcy53aWR0aCgpLCAwKSkpOworICAgIGRyYXdMaW5lKHJvdW5kZWRJbnRQb2ludChvcmlnaW4p LCByb3VuZGVkSW50UG9pbnQob3JpZ2luICsgRmxvYXRTaXplKHdpZHRoLCAwKSkpOwogICAgIHNl dFN0cm9rZVN0eWxlKG9sZFN0eWxlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwCmluZGV4IDNkMDA3Y2ZmOWM2OTM5MmE4 ZDc2Yjg5ZGI4ZWI5Y2VlM2EzNDJmODUuLmY1NDBmZmJmMDIxOTdlNDFhNzc2M2JhYWZhZDg5NWJj ZjQwMGVmM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3Jl VGV4dFJlbmRlcmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29y ZVRleHRSZW5kZXJlci5jcHAKQEAgLTc2LDggKzc2LDcgQEAgc3RhdGljIHZvaWQgZG9EcmF3VGV4 dEF0UG9pbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIHRleHQsIGNv bnMKICAgICAgICAgdW5kZXJsaW5lUG9pbnQubW92ZShiZWZvcmVXaWR0aCwgMSk7CiAKICAgICAg ICAgY29udGV4dC5zZXRTdHJva2VDb2xvcihjb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7Ci0g ICAgICAgIEZsb2F0UmVjdCBib3VuZHModW5kZXJsaW5lUG9pbnQsIEZsb2F0U2l6ZSh1bmRlcmxp bmVkV2lkdGgsIGNvbnRleHQuc3Ryb2tlVGhpY2tuZXNzKCkpKTsKLSAgICAgICAgY29udGV4dC5k cmF3TGluZUZvclRleHQoYm91bmRzLCBmYWxzZSk7CisgICAgICAgIGNvbnRleHQuZHJhd0xpbmVG b3JUZXh0KHVuZGVybGluZVBvaW50LCB1bmRlcmxpbmVkV2lkdGgsIGZhbHNlKTsKICAgICB9CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAppbmRleCA5Zjdh ZDliZGM0MGU4MmQ4MzBiZWE0NjJiZThkOTJjYTM4M2QwMThiLi45NWE3Y2FlYzUwMmE0OTZiOGE3 NjA3ODU2ZjY2MDk1M2JjNGZmM2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZVRleHRCb3guY3BwCkBAIC02Nyw0OSArNjcsNiBAQCBDT01QSUxFX0FTU0VSVChzaXplb2YoSW5s aW5lVGV4dEJveCkgPT0gc2l6ZW9mKFNhbWVTaXplQXNJbmxpbmVUZXh0Qm94KSwgSW5saW5lVAog dHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgSW5saW5lVGV4dEJveCosIExheW91dFJlY3Q+IElu bGluZVRleHRCb3hPdmVyZmxvd01hcDsKIHN0YXRpYyBJbmxpbmVUZXh0Qm94T3ZlcmZsb3dNYXAq IGdUZXh0Qm94ZXNXaXRoT3ZlcmZsb3c7CiAKLXN0YXRpYyBGbG9hdFJlY3QgY29tcHV0ZUJvdW5k c0ZvclVuZGVybGluZShHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQm IHRvcGxlZnQsIGZsb2F0IGxlbmd0aCwgYm9vbCBwcmludGluZywgYm9vbCYgc2hvdWxkQW50aWFs aWFzKQotewotICAgIGZsb2F0IHRoaWNrbmVzcyA9IHN0ZDo6bWF4KGNvbnRleHQuc3Ryb2tlVGhp Y2tuZXNzKCksIDAuNWYpOwotICAgIAotICAgIEZsb2F0UmVjdCBib3VuZHModG9wbGVmdCwgRmxv YXRTaXplKGxlbmd0aCwgdGhpY2tuZXNzKSk7Ci0KLSAgICBzaG91bGRBbnRpYWxpYXMgPSB0cnVl OwotICAgIAotICAgIGlmIChwcmludGluZyB8fCBjb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSB8 fCAhY29udGV4dC5nZXRDVE0oR3JhcGhpY3NDb250ZXh0OjpEZWZpbml0ZWx5SW5jbHVkZURldmlj ZVNjYWxlKS5wcmVzZXJ2ZXNBeGlzQWxpZ25tZW50KCkpCi0gICAgICAgIHJldHVybiBib3VuZHM7 Ci0KLSAgICAvLyBPbiBzY3JlZW4sIHVzZSBhIG1pbmltdW0gdGhpY2tuZXNzIG9mIDEuMCBpbiB1 c2VyIHNwYWNlIChsYXRlciByb3VuZGVkIHRvIGFuIGludGVncmFsIG51bWJlciBpbiBkZXZpY2Ug c3BhY2UpLgotICAgIEZsb2F0UmVjdCBhZGp1c3RlZEJvdW5kcyA9IGJvdW5kczsKLSAgICBhZGp1 c3RlZEJvdW5kcy5zZXRIZWlnaHQoc3RkOjptYXgodGhpY2tuZXNzLCAxLjBmKSk7Ci0KLSAgICAv LyBGSVhNRTogVGhpcyBzaG91bGQgYmUgZG9uZSBhIGJldHRlciB3YXkuCi0gICAgLy8gV2UgdHJ5 IHRvIHJvdW5kIGFsbCBwYXJhbWV0ZXJzIHRvIGludGVnZXIgYm91bmRhcmllcyBpbiBkZXZpY2Ug c3BhY2UuIElmIHJvdW5kaW5nIHBpeGVscyBpbiBkZXZpY2Ugc3BhY2UKLSAgICAvLyBtYWtlcyBv dXIgdGhpY2tuZXNzIG1vcmUgdGhhbiBkb3VibGUsIHRoZW4gdGhlcmUgbXVzdCBiZSBhIHNocmlu a2luZy1zY2FsZSBmYWN0b3IgYW5kIHJvdW5kaW5nIHRvIHBpeGVscwotICAgIC8vIGluIGRldmlj ZSBzcGFjZSB3aWxsIG1ha2UgdGhlIHVuZGVybGluZXMgdG9vIHRoaWNrLgotICAgIEZsb2F0UmVj dCBsaW5lUmVjdCA9IGNvbnRleHQucm91bmRUb0RldmljZVBpeGVscyhhZGp1c3RlZEJvdW5kcywg R3JhcGhpY3NDb250ZXh0OjpSb3VuZEFsbFNpZGVzKTsKLSAgICBpZiAobGluZVJlY3QuaGVpZ2h0 KCkgPCB0aGlja25lc3MgKiAyLjApIHsKLSAgICAgICAgc2hvdWxkQW50aWFsaWFzID0gZmFsc2U7 Ci0gICAgICAgIHJldHVybiBsaW5lUmVjdDsKLSAgICB9Ci0KLSAgICByZXR1cm4gYm91bmRzOwot fQotCi1zdGF0aWMgdm9pZCBkcmF3TGluZUZvclRleHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zdCBGbG9hdFBvaW50JiB0b3BsZWZ0LCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZykK LXsKLSAgICBpZiAod2lkdGggPD0gMCkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGJvb2wg c2hvdWxkQW50aWFsaWFzOwotICAgIAotICAgIEZsb2F0UmVjdCB1bmRlcmxpbmVCb3VuZHMgPSBj b21wdXRlQm91bmRzRm9yVW5kZXJsaW5lKGNvbnRleHQsIHRvcGxlZnQsIHdpZHRoLCBwcmludGlu Zywgc2hvdWxkQW50aWFsaWFzKTsKLSAgICAKLSAgICBib29sIHdhc0FudGlhbGlhc2luZyA9IGNv bnRleHQuc2hvdWxkQW50aWFsaWFzKCk7Ci0gICAgY29udGV4dC5zZXRTaG91bGRBbnRpYWxpYXMo c2hvdWxkQW50aWFsaWFzKTsKLSAgICBjb250ZXh0LmRyYXdMaW5lRm9yVGV4dCh1bmRlcmxpbmVC b3VuZHMsIHByaW50aW5nKTsKLSAgICBjb250ZXh0LnNldFNob3VsZEFudGlhbGlhcyh3YXNBbnRp YWxpYXNpbmcpOwotfQotCiB2b2lkIElubGluZVRleHRCb3g6OmRlc3Ryb3koUmVuZGVyQXJlbmEm IGFyZW5hKQogewogICAgIGlmICgha25vd25Ub0hhdmVOb092ZXJmbG93KCkgJiYgZ1RleHRCb3hl c1dpdGhPdmVyZmxvdykKQEAgLTEwNDcsMTQgKzEwMDQsMTQgQEAgdm9pZCBJbmxpbmVUZXh0Qm94 OjpwYWludERlY29yYXRpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9hdFBv aW50JgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg ZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBkcmF3TGluZUZvclRleHQoKmNvbnRleHQsIEZsb2F0 UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyB1bmRlcmxpbmVPZmZzZXQp LCB3aWR0aCwgaXNQcmludGluZyk7CisgICAgICAgICAgICAgICAgY29udGV4dC0+ZHJhd0xpbmVG b3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyB1bmRl cmxpbmVPZmZzZXQpLCB3aWR0aCwgaXNQcmludGluZyk7CiAKICAgICAgICAgICAgICAgICBpZiAo ZGVjb3JhdGlvblN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGVEb3VibGUpCi0gICAgICAgICAg ICAgICAgICAgIGRyYXdMaW5lRm9yVGV4dCgqY29udGV4dCwgRmxvYXRQb2ludChsb2NhbE9yaWdp bi54KCksIGxvY2FsT3JpZ2luLnkoKSArIHVuZGVybGluZU9mZnNldCArIGRvdWJsZU9mZnNldCks IHdpZHRoLCBpc1ByaW50aW5nKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGV4dC0+ZHJhd0xp bmVGb3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyB1 bmRlcmxpbmVPZmZzZXQgKyBkb3VibGVPZmZzZXQpLCB3aWR0aCwgaXNQcmludGluZyk7CiAgICAg ICAgICAgICB9CiAjZWxzZQogICAgICAgICAgICAgLy8gTGVhdmUgb25lIHBpeGVsIG9mIHdoaXRl IGJldHdlZW4gdGhlIGJhc2VsaW5lIGFuZCB0aGUgdW5kZXJsaW5lLgotICAgICAgICAgICAgZHJh d0xpbmVGb3JUZXh0KCpjb250ZXh0LCBGbG9hdFBvaW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxP cmlnaW4ueSgpICsgYmFzZWxpbmUgKyAxKSwgd2lkdGgsIGlzUHJpbnRpbmcpOworICAgICAgICAg ICAgY29udGV4dC0+ZHJhd0xpbmVGb3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBs b2NhbE9yaWdpbi55KCkgKyBiYXNlbGluZSArIDEpLCB3aWR0aCwgaXNQcmludGluZyk7CiAjZW5k aWYgLy8gQ1NTM19URVhUCiAgICAgICAgIH0KICAgICAgICAgaWYgKGRlY28gJiBUZXh0RGVjb3Jh dGlvbk92ZXJsaW5lKSB7CkBAIC0xMDY5LDEwICsxMDI2LDEwIEBAIHZvaWQgSW5saW5lVGV4dEJv eDo6cGFpbnREZWNvcmF0aW9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRQ b2ludCYKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRlZmF1bHQ6CiAjZW5kaWYgLy8gQ1NT M19URVhUCi0gICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JUZXh0KCpjb250ZXh0LCBsb2NhbE9y aWdpbiwgd2lkdGgsIGlzUHJpbnRpbmcpOworICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdM aW5lRm9yVGV4dChsb2NhbE9yaWdpbiwgd2lkdGgsIGlzUHJpbnRpbmcpOwogI2lmIEVOQUJMRShD U1MzX1RFWFQpCiAgICAgICAgICAgICAgICAgaWYgKGRlY29yYXRpb25TdHlsZSA9PSBUZXh0RGVj b3JhdGlvblN0eWxlRG91YmxlKQotICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvclRleHQo KmNvbnRleHQsIEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgLSBk b3VibGVPZmZzZXQpLCB3aWR0aCwgaXNQcmludGluZyk7CisgICAgICAgICAgICAgICAgICAgIGNv bnRleHQtPmRyYXdMaW5lRm9yVGV4dChGbG9hdFBvaW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxP cmlnaW4ueSgpIC0gZG91YmxlT2Zmc2V0KSwgd2lkdGgsIGlzUHJpbnRpbmcpOwogICAgICAgICAg ICAgfQogI2VuZGlmIC8vIENTUzNfVEVYVAogICAgICAgICB9CkBAIC0xMDg4LDEwICsxMDQ1LDEw IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREZWNvcmF0aW9uKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRl ZmF1bHQ6CiAjZW5kaWYgLy8gQ1NTM19URVhUCi0gICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JU ZXh0KCpjb250ZXh0LCBGbG9hdFBvaW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgp ICsgMiAqIGJhc2VsaW5lIC8gMyksIHdpZHRoLCBpc1ByaW50aW5nKTsKKyAgICAgICAgICAgICAg ICBjb250ZXh0LT5kcmF3TGluZUZvclRleHQoRmxvYXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxv Y2FsT3JpZ2luLnkoKSArIDIgKiBiYXNlbGluZSAvIDMpLCB3aWR0aCwgaXNQcmludGluZyk7CiAj aWYgRU5BQkxFKENTUzNfVEVYVCkKICAgICAgICAgICAgICAgICBpZiAoZGVjb3JhdGlvblN0eWxl ID09IFRleHREZWNvcmF0aW9uU3R5bGVEb3VibGUpCi0gICAgICAgICAgICAgICAgICAgIGRyYXdM aW5lRm9yVGV4dCgqY29udGV4dCwgRmxvYXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3Jp Z2luLnkoKSArIGRvdWJsZU9mZnNldCArIDIgKiBiYXNlbGluZSAvIDMpLCB3aWR0aCwgaXNQcmlu dGluZyk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdMaW5lRm9yVGV4dChGbG9h dFBvaW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpICsgZG91YmxlT2Zmc2V0ICsg MiAqIGJhc2VsaW5lIC8gMyksIHdpZHRoLCBpc1ByaW50aW5nKTsKICAgICAgICAgICAgIH0KICNl bmRpZiAvLyBDU1MzX1RFWFQKICAgICAgICAgfQpAQCAtMTMzOSw3ICsxMjk2LDcgQEAgdm9pZCBJ bmxpbmVUZXh0Qm94OjpwYWludENvbXBvc2l0aW9uVW5kZXJsaW5lKEdyYXBoaWNzQ29udGV4dCog Y3R4LCBjb25zdCBGbG9hdFAKIAogICAgIGN0eC0+c2V0U3Ryb2tlQ29sb3IodW5kZXJsaW5lLmNv bG9yLCByZW5kZXJlcigpLnN0eWxlKCkuY29sb3JTcGFjZSgpKTsKICAgICBjdHgtPnNldFN0cm9r ZVRoaWNrbmVzcyhsaW5lVGhpY2tuZXNzKTsKLSAgICBkcmF3TGluZUZvclRleHQoKmN0eCwgRmxv YXRQb2ludChib3hPcmlnaW4ueCgpICsgc3RhcnQsIGJveE9yaWdpbi55KCkgKyBsb2dpY2FsSGVp Z2h0KCkgLSBsaW5lVGhpY2tuZXNzKSwgd2lkdGgsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5wcmlu dGluZygpKTsKKyAgICBjdHgtPmRyYXdMaW5lRm9yVGV4dChGbG9hdFBvaW50KGJveE9yaWdpbi54 KCkgKyBzdGFydCwgYm94T3JpZ2luLnkoKSArIGxvZ2ljYWxIZWlnaHQoKSAtIGxpbmVUaGlja25l c3MpLCB3aWR0aCwgcmVuZGVyZXIoKS5kb2N1bWVudCgpLnByaW50aW5nKCkpOwogfQogCiBpbnQg SW5saW5lVGV4dEJveDo6Y2FyZXRNaW5PZmZzZXQoKSBjb25zdAo=