129558 2014-03-01 13:53:40 -0800 Subpixel rendering: Make border-radius painting device pixel aware. 2014-03-04 11:47:49 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 129557 1 zalan zalan commit-queue esprehn+autocc glenn jonlee kondapallykalyan simon.fraser oldest_to_newest 985973 0 zalan 2014-03-01 13:53:40 -0800 in order to support proper clipping for { background-color: green; border-radius: 10px } 986441 1 225680 zalan 2014-03-03 12:14:02 -0800 Created attachment 225680 Patch 986847 2 225785 zalan 2014-03-04 09:47:28 -0800 Created attachment 225785 Patch 986848 3 225785 zalan 2014-03-04 09:47:46 -0800 Comment on attachment 225785 Patch EWS 986905 4 225785 commit-queue 2014-03-04 11:47:46 -0800 Comment on attachment 225785 Patch Clearing flags on attachment: 225785 Committed r165065: <http://trac.webkit.org/changeset/165065> 986906 5 commit-queue 2014-03-04 11:47:49 -0800 All reviewed patches have been landed. Closing bug. 225680 2014-03-03 12:14:02 -0800 2014-03-04 09:47:25 -0800 Patch patch.txt text/plain 12580 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYjhiZDYwLi4zMmM5NDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTQtMDMtMDMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBTdWJwaXhlbCByZW5kZXJpbmc6IE1ha2UgYm9yZGVyLXJhZGl1cyBwYWludGluZyBkZXZpY2Ug cGl4ZWwgYXdhcmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjk1NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTbmFwIHJvdW5kZWQgcmVjdHMgdG8gZGV2aWNlIHBpeGVscyByaWdodCBiZWZvcmUgcGFz c2luZyB0aGVtIHRvIEdyYXBoaWNzQ29udGV4dC4KKworICAgICAgICBOb3QgdGVzdGFibGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNsaXBSb3VuZGVkSW5uZXJSZWN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEZpbGxMYXllckV4dGVu ZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJvcmRl cik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0Lmg6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clJlcGxhY2VkOjpwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJXaWRnZXQ6OnBhaW50KToKKwogMjAxNC0wMy0wMSAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFN1YnBpeGVsIHJlbmRl cmluZzogTWFrZSBHcmFwaGljc0xheWVyOjpmaWxsUmVjdCBGbG9hdFJvdW5kZWRSZWN0IGJhc2Vk IGFuZCBjbGVhbnVwIGRlcGVuZGVuY2llcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCmluZGV4IDA3MDMzZWYuLmQxZDUzYzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApA QCAtNDk4LDEwICs0OTgsMTAgQEAgUm91bmRlZFJlY3QgUmVuZGVyQm94TW9kZWxPYmplY3Q6Omdl dEJhY2tncm91bmRSb3VuZGVkUmVjdChjb25zdCBMYXlvdXRSZWN0JiBib3IKICAgICByZXR1cm4g Ym9yZGVyOwogfQogCi12b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjbGlwUm91bmRlZElubmVy UmVjdChHcmFwaGljc0NvbnRleHQgKiBjb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBj b25zdCBSb3VuZGVkUmVjdCYgY2xpcFJlY3QpCit2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpj bGlwUm91bmRlZElubmVyUmVjdChHcmFwaGljc0NvbnRleHQgKiBjb250ZXh0LCBjb25zdCBGbG9h dFJlY3QmIHJlY3QsIGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIGNsaXBSZWN0KQogewogICAgIGlm IChjbGlwUmVjdC5pc1JlbmRlcmFibGUoKSkKLSAgICAgICAgY29udGV4dC0+Y2xpcFJvdW5kZWRS ZWN0KEZsb2F0Um91bmRlZFJlY3QoY2xpcFJlY3QpKTsKKyAgICAgICAgY29udGV4dC0+Y2xpcFJv dW5kZWRSZWN0KGNsaXBSZWN0KTsKICAgICBlbHNlIHsKICAgICAgICAgLy8gV2UgY3JlYXRlIGEg cm91bmRlZCByZWN0IGZvciBlYWNoIG9mIHRoZSBjb3JuZXJzIGFuZCBjbGlwIGl0LCB3aGlsZSBt YWtpbmcgc3VyZSB3ZSBjbGlwIG9wcG9zaW5nIGNvcm5lcnMgdG9nZXRoZXIuCiAgICAgICAgIGlm ICghY2xpcFJlY3QucmFkaWkoKS50b3BMZWZ0KCkuaXNFbXB0eSgpIHx8ICFjbGlwUmVjdC5yYWRp aSgpLmJvdHRvbVJpZ2h0KCkuaXNFbXB0eSgpKSB7CkBAIC02NDAsNyArNjQwLDkgQEAgdm9pZCBS ZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY28KICAgICB9CiAKICAgICBib29sIGNvbG9yVmlzaWJsZSA9IGJnQ29s b3IuaXNWYWxpZCgpICYmIGJnQ29sb3IuYWxwaGEoKTsKLSAgICAKKyAgICBmbG9hdCBkZXZpY2VT Y2FsZUZhY3RvciA9IGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKKyAgICBGbG9hdFJl Y3QgcGl4ZWxTbmFwcGVkUmVjdCA9IHBpeGVsU25hcHBlZEZvclBhaW50aW5nKHJlY3QsIGRldmlj ZVNjYWxlRmFjdG9yKTsKKwogICAgIC8vIEZhc3QgcGF0aCBmb3IgZHJhd2luZyBzaW1wbGUgY29s b3IgYmFja2dyb3VuZHMuCiAgICAgaWYgKCFpc1Jvb3QgJiYgIWNsaXBwZWRXaXRoTG9jYWxTY3Jv bGxpbmcgJiYgIXNob3VsZFBhaW50QmFja2dyb3VuZEltYWdlICYmIGlzQm9yZGVyRmlsbCAmJiAh YmdMYXllci0+bmV4dCgpKSB7CiAgICAgICAgIGlmICghY29sb3JWaXNpYmxlKQpAQCAtNjUyLDE3 ICs2NTQsMTggQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRl bmRlZChjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY28KICAgICAgICAgICAgIGFwcGx5Qm94 U2hhZG93Rm9yQmFja2dyb3VuZChjb250ZXh0LCAmc3R5bGUoKSk7CiAKICAgICAgICAgaWYgKGhh c1JvdW5kZWRCb3JkZXIgJiYgYmxlZWRBdm9pZGFuY2UgIT0gQmFja2dyb3VuZEJsZWVkVXNlVHJh bnNwYXJlbmN5TGF5ZXIpIHsKLSAgICAgICAgICAgIFJvdW5kZWRSZWN0IGJvcmRlciA9IGJhY2tn cm91bmRSb3VuZGVkUmVjdEFkanVzdGVkRm9yQmxlZWRBdm9pZGFuY2UoKmNvbnRleHQsIHJlY3Qs IGJsZWVkQXZvaWRhbmNlLCBib3gsIGJveFNpemUsIGluY2x1ZGVMZWZ0RWRnZSwgaW5jbHVkZVJp Z2h0RWRnZSk7Ci0gICAgICAgICAgICBpZiAoYm9yZGVyLmlzUmVuZGVyYWJsZSgpKQotICAgICAg ICAgICAgICAgIGNvbnRleHQtPmZpbGxSb3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KGJvcmRl ciksIGJnQ29sb3IsIHN0eWxlKCkuY29sb3JTcGFjZSgpKTsKKyAgICAgICAgICAgIEZsb2F0Um91 bmRlZFJlY3QgcGl4ZWxTbmFwcGVkQm9yZGVyID0gYmFja2dyb3VuZFJvdW5kZWRSZWN0QWRqdXN0 ZWRGb3JCbGVlZEF2b2lkYW5jZSgqY29udGV4dCwgcmVjdCwgYmxlZWRBdm9pZGFuY2UsIGJveCwg Ym94U2l6ZSwKKyAgICAgICAgICAgICAgICBpbmNsdWRlTGVmdEVkZ2UsIGluY2x1ZGVSaWdodEVk Z2UpLnBpeGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3Ip OworICAgICAgICAgICAgaWYgKHBpeGVsU25hcHBlZEJvcmRlci5pc1JlbmRlcmFibGUoKSkKKyAg ICAgICAgICAgICAgICBjb250ZXh0LT5maWxsUm91bmRlZFJlY3QocGl4ZWxTbmFwcGVkQm9yZGVy LCBiZ0NvbG9yLCBzdHlsZSgpLmNvbG9yU3BhY2UoKSk7CiAgICAgICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgICAgICBjb250ZXh0LT5zYXZlKCk7Ci0gICAgICAgICAgICAgICAgY2xpcFJvdW5k ZWRJbm5lclJlY3QoY29udGV4dCwgcmVjdCwgYm9yZGVyKTsKLSAgICAgICAgICAgICAgICBjb250 ZXh0LT5maWxsUmVjdChib3JkZXIucmVjdCgpLCBiZ0NvbG9yLCBzdHlsZSgpLmNvbG9yU3BhY2Uo KSk7CisgICAgICAgICAgICAgICAgY2xpcFJvdW5kZWRJbm5lclJlY3QoY29udGV4dCwgcGl4ZWxT bmFwcGVkUmVjdCwgcGl4ZWxTbmFwcGVkQm9yZGVyKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0 LT5maWxsUmVjdChwaXhlbFNuYXBwZWRCb3JkZXIucmVjdCgpLCBiZ0NvbG9yLCBzdHlsZSgpLmNv bG9yU3BhY2UoKSk7CiAgICAgICAgICAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwogICAgICAg ICAgICAgfQogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KHBp eGVsU25hcHBlZEZvclBhaW50aW5nKHJlY3QsIGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3Io KSksIGJnQ29sb3IsIHN0eWxlKCkuY29sb3JTcGFjZSgpKTsKKyAgICAgICAgICAgIGNvbnRleHQt PmZpbGxSZWN0KHBpeGVsU25hcHBlZFJlY3QsIGJnQ29sb3IsIHN0eWxlKCkuY29sb3JTcGFjZSgp KTsKIAogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNjgwLDcgKzY4Myw3IEBAIHZvaWQgUmVu ZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQoY29uc3QgUGFpbnRJbmZv JiBwYWludEluZm8sIGNvCiAgICAgICAgIH0gZWxzZSBpZiAoYmdMYXllci0+Y2xpcCgpID09IFBh ZGRpbmdGaWxsQm94KQogICAgICAgICAgICAgYm9yZGVyID0gc3R5bGUoKS5nZXRSb3VuZGVkSW5u ZXJCb3JkZXJGb3IoYm9yZGVyLnJlY3QoKSwgaW5jbHVkZUxlZnRFZGdlLCBpbmNsdWRlUmlnaHRF ZGdlKTsKIAotICAgICAgICBjbGlwUm91bmRlZElubmVyUmVjdChjb250ZXh0LCByZWN0LCBib3Jk ZXIpOworICAgICAgICBjbGlwUm91bmRlZElubmVyUmVjdChjb250ZXh0LCBwaXhlbFNuYXBwZWRS ZWN0LCBib3JkZXIucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQYWludGluZyhkZXZpY2VTY2Fs ZUZhY3RvcikpOwogICAgIH0KICAgICAKICAgICBMYXlvdXRVbml0IGJMZWZ0ID0gaW5jbHVkZUxl ZnRFZGdlID8gYm9yZGVyTGVmdCgpIDogTGF5b3V0VW5pdDo6ZnJvbVBpeGVsKDApOwpAQCAtMTg3 Miw2ICsxODc1LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIoY29u c3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBMYXlvdXRSZWN0JgogICAgIGlmIChoYXZlQWxsU29s aWRFZGdlcyAmJiBvdXRlckJvcmRlci5pc1JvdW5kZWQoKSAmJiBhbGxDb3JuZXJzQ2xpcHBlZE91 dChvdXRlckJvcmRlciwgaW5mby5yZWN0KSkKICAgICAgICAgb3V0ZXJCb3JkZXIuc2V0UmFkaWko Um91bmRlZFJlY3Q6OlJhZGlpKCkpOwogCisgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSBk b2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCk7CiAgICAgLy8gaXNSZW5kZXJhYmxlKCkgY2hl Y2sgYXZvaWRzIGlzc3VlIGRlc2NyaWJlZCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mzg3ODcKICAgICBpZiAoKGhhdmVBbGxTb2xpZEVkZ2VzIHx8IGhhdmVBbGxE b3VibGVFZGdlcykgJiYgYWxsRWRnZXNTaGFyZUNvbG9yICYmIGlubmVyQm9yZGVyLmlzUmVuZGVy YWJsZSgpKSB7CiAgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgZHJhd2luZyBhbGwgc29saWQgZWRn ZXMgYW5kIGFsbCB1bnJvdW5kZWQgZG91YmxlIGVkZ2VzCkBAIC0xODc5LDEwICsxODgzLDExIEBA IHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYg aW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgICAgICYmIChoYXZlQWxsU29saWRFZGdl cyB8fCAoIW91dGVyQm9yZGVyLmlzUm91bmRlZCgpICYmICFpbm5lckJvcmRlci5pc1JvdW5kZWQo KSkpKSB7CiAgICAgICAgICAgICBQYXRoIHBhdGg7CiAgICAgICAgICAgICAKLSAgICAgICAgICAg IGlmIChvdXRlckJvcmRlci5pc1JvdW5kZWQoKSAmJiBibGVlZEF2b2lkYW5jZSAhPSBCYWNrZ3Jv dW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKLSAgICAgICAgICAgICAgICBwYXRoLmFkZFJv dW5kZWRSZWN0KG91dGVyQm9yZGVyKTsKKyAgICAgICAgICAgIEZsb2F0Um91bmRlZFJlY3QgcGl4 ZWxTbmFwcGVkUm91bmRlZFJlY3QgPSBvdXRlckJvcmRlci5waXhlbFNuYXBwZWRSb3VuZGVkUmVj dEZvclBhaW50aW5nKGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgICAgIGlmIChwaXhlbFNu YXBwZWRSb3VuZGVkUmVjdC5pc1JvdW5kZWQoKSAmJiBibGVlZEF2b2lkYW5jZSAhPSBCYWNrZ3Jv dW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKKyAgICAgICAgICAgICAgICBwYXRoLmFkZFJv dW5kZWRSZWN0KHBpeGVsU25hcHBlZFJvdW5kZWRSZWN0KTsKICAgICAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qob3V0ZXJCb3JkZXIucmVjdCgpKTsKKyAgICAgICAg ICAgICAgICBwYXRoLmFkZFJlY3QocGl4ZWxTbmFwcGVkUm91bmRlZFJlY3QucmVjdCgpKTsKIAog ICAgICAgICAgICAgaWYgKGhhdmVBbGxEb3VibGVFZGdlcykgewogICAgICAgICAgICAgICAgIExh eW91dFJlY3QgaW5uZXJUaGlyZFJlY3QgPSBvdXRlckJvcmRlci5yZWN0KCk7CkBAIC0xOTA3LDI2 ICsxOTEyLDI3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0 IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIFJvdW5kZWRSZWN0IG91dGVy VGhpcmQgPSBvdXRlckJvcmRlcjsKLSAgICAgICAgICAgICAgICBSb3VuZGVkUmVjdCBpbm5lclRo aXJkID0gaW5uZXJCb3JkZXI7Ci0gICAgICAgICAgICAgICAgaW5uZXJUaGlyZC5zZXRSZWN0KGlu bmVyVGhpcmRSZWN0KTsKLSAgICAgICAgICAgICAgICBvdXRlclRoaXJkLnNldFJlY3Qob3V0ZXJU aGlyZFJlY3QpOworICAgICAgICAgICAgICAgIEZsb2F0Um91bmRlZFJlY3QgcGl4ZWxTbmFwcGVk T3V0ZXJUaGlyZCA9IG91dGVyQm9yZGVyLnBpeGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRp bmcoZGV2aWNlU2NhbGVGYWN0b3IpOworICAgICAgICAgICAgICAgIHBpeGVsU25hcHBlZE91dGVy VGhpcmQuc2V0UmVjdChwaXhlbFNuYXBwZWRGb3JQYWludGluZyhvdXRlclRoaXJkUmVjdCwgZGV2 aWNlU2NhbGVGYWN0b3IpKTsKIAotICAgICAgICAgICAgICAgIGlmIChvdXRlclRoaXJkLmlzUm91 bmRlZCgpICYmIGJsZWVkQXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5j eUxheWVyKQotICAgICAgICAgICAgICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KG91dGVyVGhp cmQpOworICAgICAgICAgICAgICAgIGlmIChwaXhlbFNuYXBwZWRPdXRlclRoaXJkLmlzUm91bmRl ZCgpICYmIGJsZWVkQXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxh eWVyKQorICAgICAgICAgICAgICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KHBpeGVsU25hcHBl ZE91dGVyVGhpcmQpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAg cGF0aC5hZGRSZWN0KG91dGVyVGhpcmQucmVjdCgpKTsKKyAgICAgICAgICAgICAgICAgICAgcGF0 aC5hZGRSZWN0KHBpeGVsU25hcHBlZE91dGVyVGhpcmQucmVjdCgpKTsKIAotICAgICAgICAgICAg ICAgIGlmIChpbm5lclRoaXJkLmlzUm91bmRlZCgpICYmIGJsZWVkQXZvaWRhbmNlICE9IEJhY2tn cm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQotICAgICAgICAgICAgICAgICAgICBwYXRo LmFkZFJvdW5kZWRSZWN0KGlubmVyVGhpcmQpOworICAgICAgICAgICAgICAgIEZsb2F0Um91bmRl ZFJlY3QgcGl4ZWxTbmFwcGVkSW5uZXJUaGlyZCA9IGlubmVyQm9yZGVyLnBpeGVsU25hcHBlZFJv dW5kZWRSZWN0Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3IpOworICAgICAgICAgICAgICAg IHBpeGVsU25hcHBlZElubmVyVGhpcmQuc2V0UmVjdChwaXhlbFNuYXBwZWRGb3JQYWludGluZyhp bm5lclRoaXJkUmVjdCwgZGV2aWNlU2NhbGVGYWN0b3IpKTsKKyAgICAgICAgICAgICAgICBpZiAo cGl4ZWxTbmFwcGVkSW5uZXJUaGlyZC5pc1JvdW5kZWQoKSAmJiBibGVlZEF2b2lkYW5jZSAhPSBC YWNrZ3JvdW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikKKyAgICAgICAgICAgICAgICAgICAg cGF0aC5hZGRSb3VuZGVkUmVjdChwaXhlbFNuYXBwZWRJbm5lclRoaXJkKTsKICAgICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChpbm5lclRoaXJkLnJl Y3QoKSk7CisgICAgICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChwaXhlbFNuYXBwZWRJbm5l clRoaXJkLnJlY3QoKSk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmIChpbm5lckJv cmRlci5pc1JvdW5kZWQoKSkKLSAgICAgICAgICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGlu bmVyQm9yZGVyKTsKKyAgICAgICAgICAgIEZsb2F0Um91bmRlZFJlY3Qgc25hcHBlZElubmVyQm9y ZGVyID0gaW5uZXJCb3JkZXIucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQYWludGluZyhkZXZp Y2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICBpZiAoc25hcHBlZElubmVyQm9yZGVyLmlzUm91 bmRlZCgpKQorICAgICAgICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3Qoc25hcHBlZElubmVy Qm9yZGVyKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qo aW5uZXJCb3JkZXIucmVjdCgpKTsKKyAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qoc25hcHBl ZElubmVyQm9yZGVyLnJlY3QoKSk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+c2V0RmlsbFJ1bGUoUlVMRV9FVkVOT0REKTsKICAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+c2V0RmlsbENvbG9yKGVkZ2VzW2ZpcnN0VmlzaWJsZUVkZ2VdLmNvbG9yLCBzdHls ZS0+Y29sb3JTcGFjZSgpKTsKQEAgLTE5NjEsNyArMTk2Nyw3IEBAIHZvaWQgUmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0 UmVjdCYKICAgICAgICAgLy8gaXNSZW5kZXJhYmxlKCkgY2hlY2sgYXZvaWRzIGlzc3VlIGRlc2Ny aWJlZCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg3ODcKICAg ICAgICAgLy8gVGhlIGluc2lkZSB3aWxsIGJlIGNsaXBwZWQgb3V0IGxhdGVyIChpbiBjbGlwQm9y ZGVyU2lkZUZvckNvbXBsZXhJbm5lclBhdGgpCiAgICAgICAgIGlmIChpbm5lckJvcmRlci5pc1Jl bmRlcmFibGUoKSkKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+Y2xpcE91dFJvdW5kZWRS ZWN0KEZsb2F0Um91bmRlZFJlY3QoaW5uZXJCb3JkZXIpKTsKKyAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+Y2xpcE91dFJvdW5kZWRSZWN0KGlubmVyQm9yZGVyLnBpeGVsU25hcHBlZFJvdW5k ZWRSZWN0Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3IpKTsKICAgICB9CiAKICAgICAvLyBJ ZiBvbmx5IG9uZSBlZGdlIHZpc2libGUgYW50aWFsaWFzaW5nIGRvZXNuJ3QgY3JlYXRlIHNlYW1z CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCmlu ZGV4IGRiZjVhM2YuLmJjZGY4YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5oCkBAIC0yNzksNyArMjc5LDcgQEAgcHJvdGVjdGVkOgogCiAg ICAgc3RhdGljIGJvb2wgc2hvdWxkQW50aWFsaWFzTGluZXMoR3JhcGhpY3NDb250ZXh0Kik7CiAK LSAgICBzdGF0aWMgdm9pZCBjbGlwUm91bmRlZElubmVyUmVjdChHcmFwaGljc0NvbnRleHQqLCBj b25zdCBMYXlvdXRSZWN0JiwgY29uc3QgUm91bmRlZFJlY3QmIGNsaXBSZWN0KTsKKyAgICBzdGF0 aWMgdm9pZCBjbGlwUm91bmRlZElubmVyUmVjdChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9h dFJlY3QmLCBjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiBjbGlwUmVjdCk7CiAKICAgICBib29sIGhh c0F1dG9IZWlnaHRPckNvbnRhaW5pbmdCbG9ja1dpdGhBdXRvSGVpZ2h0KCkgY29uc3Q7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDE5ODkzN2Yu LmI1NmFlMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs YWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNw cApAQCAtMjYsNiArMjYsNyBAQAogCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJHcmFw aGljc0NvbnRleHQuaCIKKyNpbmNsdWRlICJGbG9hdFJvdW5kZWRSZWN0LmgiCiAjaW5jbHVkZSAi SW5saW5lRWxlbWVudEJveC5oIgogI2luY2x1ZGUgIkxheW91dFJlcGFpbnRlci5oIgogI2luY2x1 ZGUgIlBhZ2UuaCIKQEAgLTE2OSw4ICsxNzAsOCBAQCB2b2lkIFJlbmRlclJlcGxhY2VkOjpwYWlu dChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQog ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIC8vIFB1c2ggYSBjbGlwIGlmIHdlIGhhdmUgYSBi b3JkZXIgcmFkaXVzLCBzaW5jZSB3ZSB3YW50IHRvIHJvdW5kIHRoZSBmb3JlZ3JvdW5kIGNvbnRl bnQgdGhhdCBnZXRzIHBhaW50ZWQuCiAgICAgICAgICAgICBwYWludEluZm8uY29udGV4dC0+c2F2 ZSgpOwotICAgICAgICAgICAgUm91bmRlZFJlY3Qgcm91bmRlZElubmVyUmVjdCA9IHN0eWxlKCku Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKHBhaW50UmVjdCwKLSAgICAgICAgICAgICAgICBwYWRk aW5nVG9wKCkgKyBib3JkZXJUb3AoKSwgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCks IHBhZGRpbmdMZWZ0KCkgKyBib3JkZXJMZWZ0KCksIHBhZGRpbmdSaWdodCgpICsgYm9yZGVyUmln aHQoKSwgdHJ1ZSwgdHJ1ZSk7CisgICAgICAgICAgICBGbG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRJ bm5lclJlY3QgPSBGbG9hdFJvdW5kZWRSZWN0KHN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9yZGVy Rm9yKHBhaW50UmVjdCwKKyAgICAgICAgICAgICAgICBwYWRkaW5nVG9wKCkgKyBib3JkZXJUb3Ao KSwgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCksIHBhZGRpbmdMZWZ0KCkgKyBib3Jk ZXJMZWZ0KCksIHBhZGRpbmdSaWdodCgpICsgYm9yZGVyUmlnaHQoKSwgdHJ1ZSwgdHJ1ZSkpOwog ICAgICAgICAgICAgY2xpcFJvdW5kZWRJbm5lclJlY3QocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50 UmVjdCwgcm91bmRlZElubmVyUmVjdCk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCmluZGV4IDllNjAxM2UuLjliYzAyMmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCkBAIC0yNCw2ICsyNCw3IEBA CiAjaW5jbHVkZSAiUmVuZGVyV2lkZ2V0LmgiCiAKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgi CisjaW5jbHVkZSAiRmxvYXRSb3VuZGVkUmVjdC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5j bHVkZSAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5o IgpAQCAtMjc2LDggKzI3Nyw4IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpwYWludChQYWludEluZm8m IHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQogCiAgICAgICAgIC8v IFB1c2ggYSBjbGlwIGlmIHdlIGhhdmUgYSBib3JkZXIgcmFkaXVzLCBzaW5jZSB3ZSB3YW50IHRv IHJvdW5kIHRoZSBmb3JlZ3JvdW5kIGNvbnRlbnQgdGhhdCBnZXRzIHBhaW50ZWQuCiAgICAgICAg IHBhaW50SW5mby5jb250ZXh0LT5zYXZlKCk7Ci0gICAgICAgIFJvdW5kZWRSZWN0IHJvdW5kZWRJ bm5lclJlY3QgPSBzdHlsZSgpLmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihib3JkZXJSZWN0LAot ICAgICAgICAgICAgcGFkZGluZ1RvcCgpICsgYm9yZGVyVG9wKCksIHBhZGRpbmdCb3R0b20oKSAr IGJvcmRlckJvdHRvbSgpLCBwYWRkaW5nTGVmdCgpICsgYm9yZGVyTGVmdCgpLCBwYWRkaW5nUmln aHQoKSArIGJvcmRlclJpZ2h0KCksIHRydWUsIHRydWUpOworICAgICAgICBGbG9hdFJvdW5kZWRS ZWN0IHJvdW5kZWRJbm5lclJlY3QgPSBGbG9hdFJvdW5kZWRSZWN0KHN0eWxlKCkuZ2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsCisgICAgICAgICAgICBwYWRkaW5nVG9wKCkgKyBi b3JkZXJUb3AoKSwgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCksIHBhZGRpbmdMZWZ0 KCkgKyBib3JkZXJMZWZ0KCksIHBhZGRpbmdSaWdodCgpICsgYm9yZGVyUmlnaHQoKSwgdHJ1ZSwg dHJ1ZSkpOwogICAgICAgICBjbGlwUm91bmRlZElubmVyUmVjdChwYWludEluZm8uY29udGV4dCwg Ym9yZGVyUmVjdCwgcm91bmRlZElubmVyUmVjdCk7CiAgICAgfQogCg== 225785 2014-03-04 09:47:28 -0800 2014-03-04 11:47:46 -0800 Patch bug-129558-20140304094727.patch text/plain 12970 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRjMTdlNTFjYzdhNWQ1 YWU1MzI0OGZkMjg0MWZhNTRkNDkyOTJlZS4uZTVkZmNlM2VjNTZmYjFlOTFkMmM1ZjQ4NGNkYzVk YWRhNTc0ZDFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTAzLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5n OiBNYWtlIGJvcmRlci1yYWRpdXMgcGFpbnRpbmcgZGV2aWNlIHBpeGVsIGF3YXJlLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NTU4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFNuYXAgcm91bmRlZCByZWN0 cyB0byBkZXZpY2UgcGl4ZWxzIHJpZ2h0IGJlZm9yZSBwYXNzaW5nIHRoZW0gdG8gR3JhcGhpY3ND b250ZXh0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpjbGlwUm91bmRlZElubmVy UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxs TGF5ZXJFeHRlbmRlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6 cGFpbnRCb3JkZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJSZXBsYWNlZDo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJX aWRnZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyV2lkZ2V0OjpwYWludCk6CisKKzIw MTQtMDMtMDQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwogICAgICAgICBTdWJw aXhlbCByZW5kZXJpbmc6IE1ha2UgR3JhcGhpY3NMYXllcjo6ZmlsbFJlY3QgRmxvYXRSb3VuZGVk UmVjdCBiYXNlZCBhbmQgY2xlYW51cCBkZXBlbmRlbmNpZXMuCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk1NTcKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggMDcwMzNlZjViMDk2 ZDA0NmRhOGVkNjg1ZTYxN2EyNWNiMzE3ODJlNy4uZDFkNTNjM2E2MDBhOGU3ZDdhNmU4NzRiODI0 YjI2N2Y2M2YwMWQ0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuY3BwCkBAIC00OTgsMTAgKzQ5OCwxMCBAQCBSb3VuZGVkUmVjdCBSZW5k ZXJCb3hNb2RlbE9iamVjdDo6Z2V0QmFja2dyb3VuZFJvdW5kZWRSZWN0KGNvbnN0IExheW91dFJl Y3QmIGJvcgogICAgIHJldHVybiBib3JkZXI7CiB9CiAKLXZvaWQgUmVuZGVyQm94TW9kZWxPYmpl Y3Q6OmNsaXBSb3VuZGVkSW5uZXJSZWN0KEdyYXBoaWNzQ29udGV4dCAqIGNvbnRleHQsIGNvbnN0 IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IFJvdW5kZWRSZWN0JiBjbGlwUmVjdCkKK3ZvaWQgUmVu ZGVyQm94TW9kZWxPYmplY3Q6OmNsaXBSb3VuZGVkSW5uZXJSZWN0KEdyYXBoaWNzQ29udGV4dCAq IGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYg Y2xpcFJlY3QpCiB7CiAgICAgaWYgKGNsaXBSZWN0LmlzUmVuZGVyYWJsZSgpKQotICAgICAgICBj b250ZXh0LT5jbGlwUm91bmRlZFJlY3QoRmxvYXRSb3VuZGVkUmVjdChjbGlwUmVjdCkpOworICAg ICAgICBjb250ZXh0LT5jbGlwUm91bmRlZFJlY3QoY2xpcFJlY3QpOwogICAgIGVsc2UgewogICAg ICAgICAvLyBXZSBjcmVhdGUgYSByb3VuZGVkIHJlY3QgZm9yIGVhY2ggb2YgdGhlIGNvcm5lcnMg YW5kIGNsaXAgaXQsIHdoaWxlIG1ha2luZyBzdXJlIHdlIGNsaXAgb3Bwb3NpbmcgY29ybmVycyB0 b2dldGhlci4KICAgICAgICAgaWYgKCFjbGlwUmVjdC5yYWRpaSgpLnRvcExlZnQoKS5pc0VtcHR5 KCkgfHwgIWNsaXBSZWN0LnJhZGlpKCkuYm90dG9tUmlnaHQoKS5pc0VtcHR5KCkpIHsKQEAgLTY0 MCw3ICs2NDAsOSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEZpbGxMYXllckV4 dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwogICAgIH0KIAogICAgIGJvb2wg Y29sb3JWaXNpYmxlID0gYmdDb2xvci5pc1ZhbGlkKCkgJiYgYmdDb2xvci5hbHBoYSgpOwotICAg IAorICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZh Y3RvcigpOworICAgIEZsb2F0UmVjdCBwaXhlbFNuYXBwZWRSZWN0ID0gcGl4ZWxTbmFwcGVkRm9y UGFpbnRpbmcocmVjdCwgZGV2aWNlU2NhbGVGYWN0b3IpOworCiAgICAgLy8gRmFzdCBwYXRoIGZv ciBkcmF3aW5nIHNpbXBsZSBjb2xvciBiYWNrZ3JvdW5kcy4KICAgICBpZiAoIWlzUm9vdCAmJiAh Y2xpcHBlZFdpdGhMb2NhbFNjcm9sbGluZyAmJiAhc2hvdWxkUGFpbnRCYWNrZ3JvdW5kSW1hZ2Ug JiYgaXNCb3JkZXJGaWxsICYmICFiZ0xheWVyLT5uZXh0KCkpIHsKICAgICAgICAgaWYgKCFjb2xv clZpc2libGUpCkBAIC02NTIsMTcgKzY1NCwxOCBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0 OjpwYWludEZpbGxMYXllckV4dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwog ICAgICAgICAgICAgYXBwbHlCb3hTaGFkb3dGb3JCYWNrZ3JvdW5kKGNvbnRleHQsICZzdHlsZSgp KTsKIAogICAgICAgICBpZiAoaGFzUm91bmRlZEJvcmRlciAmJiBibGVlZEF2b2lkYW5jZSAhPSBC YWNrZ3JvdW5kQmxlZWRVc2VUcmFuc3BhcmVuY3lMYXllcikgewotICAgICAgICAgICAgUm91bmRl ZFJlY3QgYm9yZGVyID0gYmFja2dyb3VuZFJvdW5kZWRSZWN0QWRqdXN0ZWRGb3JCbGVlZEF2b2lk YW5jZSgqY29udGV4dCwgcmVjdCwgYmxlZWRBdm9pZGFuY2UsIGJveCwgYm94U2l6ZSwgaW5jbHVk ZUxlZnRFZGdlLCBpbmNsdWRlUmlnaHRFZGdlKTsKLSAgICAgICAgICAgIGlmIChib3JkZXIuaXNS ZW5kZXJhYmxlKCkpCi0gICAgICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJvdW5kZWRSZWN0KEZs b2F0Um91bmRlZFJlY3QoYm9yZGVyKSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNlKCkpOwor ICAgICAgICAgICAgRmxvYXRSb3VuZGVkUmVjdCBwaXhlbFNuYXBwZWRCb3JkZXIgPSBiYWNrZ3Jv dW5kUm91bmRlZFJlY3RBZGp1c3RlZEZvckJsZWVkQXZvaWRhbmNlKCpjb250ZXh0LCByZWN0LCBi bGVlZEF2b2lkYW5jZSwgYm94LCBib3hTaXplLAorICAgICAgICAgICAgICAgIGluY2x1ZGVMZWZ0 RWRnZSwgaW5jbHVkZVJpZ2h0RWRnZSkucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQYWludGlu ZyhkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICBpZiAocGl4ZWxTbmFwcGVkQm9yZGVy LmlzUmVuZGVyYWJsZSgpKQorICAgICAgICAgICAgICAgIGNvbnRleHQtPmZpbGxSb3VuZGVkUmVj dChwaXhlbFNuYXBwZWRCb3JkZXIsIGJnQ29sb3IsIHN0eWxlKCkuY29sb3JTcGFjZSgpKTsKICAg ICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIGNvbnRleHQtPnNhdmUoKTsKLSAgICAg ICAgICAgICAgICBjbGlwUm91bmRlZElubmVyUmVjdChjb250ZXh0LCByZWN0LCBib3JkZXIpOwot ICAgICAgICAgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KGJvcmRlci5yZWN0KCksIGJnQ29sb3Is IHN0eWxlKCkuY29sb3JTcGFjZSgpKTsKKyAgICAgICAgICAgICAgICBjbGlwUm91bmRlZElubmVy UmVjdChjb250ZXh0LCBwaXhlbFNuYXBwZWRSZWN0LCBwaXhlbFNuYXBwZWRCb3JkZXIpOworICAg ICAgICAgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KHBpeGVsU25hcHBlZEJvcmRlci5yZWN0KCks IGJnQ29sb3IsIHN0eWxlKCkuY29sb3JTcGFjZSgpKTsKICAgICAgICAgICAgICAgICBjb250ZXh0 LT5yZXN0b3JlKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg Y29udGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcocmVjdCwgZG9jdW1lbnQo KS5kZXZpY2VTY2FsZUZhY3RvcigpKSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNlKCkpOwor ICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFwcGVkUmVjdCwgYmdDb2xvciwg c3R5bGUoKS5jb2xvclNwYWNlKCkpOwogCiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02ODAs NyArNjgzLDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRl bmRlZChjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY28KICAgICAgICAgfSBlbHNlIGlmIChi Z0xheWVyLT5jbGlwKCkgPT0gUGFkZGluZ0ZpbGxCb3gpCiAgICAgICAgICAgICBib3JkZXIgPSBz dHlsZSgpLmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihib3JkZXIucmVjdCgpLCBpbmNsdWRlTGVm dEVkZ2UsIGluY2x1ZGVSaWdodEVkZ2UpOwogCi0gICAgICAgIGNsaXBSb3VuZGVkSW5uZXJSZWN0 KGNvbnRleHQsIHJlY3QsIGJvcmRlcik7CisgICAgICAgIGNsaXBSb3VuZGVkSW5uZXJSZWN0KGNv bnRleHQsIHBpeGVsU25hcHBlZFJlY3QsIGJvcmRlci5waXhlbFNuYXBwZWRSb3VuZGVkUmVjdEZv clBhaW50aW5nKGRldmljZVNjYWxlRmFjdG9yKSk7CiAgICAgfQogICAgIAogICAgIExheW91dFVu aXQgYkxlZnQgPSBpbmNsdWRlTGVmdEVkZ2UgPyBib3JkZXJMZWZ0KCkgOiBMYXlvdXRVbml0Ojpm cm9tUGl4ZWwoMCk7CkBAIC0xODcyLDYgKzE4NzUsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2Jq ZWN0OjpwYWludEJvcmRlcihjb25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlY3Qm CiAgICAgaWYgKGhhdmVBbGxTb2xpZEVkZ2VzICYmIG91dGVyQm9yZGVyLmlzUm91bmRlZCgpICYm IGFsbENvcm5lcnNDbGlwcGVkT3V0KG91dGVyQm9yZGVyLCBpbmZvLnJlY3QpKQogICAgICAgICBv dXRlckJvcmRlci5zZXRSYWRpaShSb3VuZGVkUmVjdDo6UmFkaWkoKSk7CiAKKyAgICBmbG9hdCBk ZXZpY2VTY2FsZUZhY3RvciA9IGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKICAgICAv LyBpc1JlbmRlcmFibGUoKSBjaGVjayBhdm9pZHMgaXNzdWUgZGVzY3JpYmVkIGluIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODc4NwogICAgIGlmICgoaGF2ZUFsbFNv bGlkRWRnZXMgfHwgaGF2ZUFsbERvdWJsZUVkZ2VzKSAmJiBhbGxFZGdlc1NoYXJlQ29sb3IgJiYg aW5uZXJCb3JkZXIuaXNSZW5kZXJhYmxlKCkpIHsKICAgICAgICAgLy8gRmFzdCBwYXRoIGZvciBk cmF3aW5nIGFsbCBzb2xpZCBlZGdlcyBhbmQgYWxsIHVucm91bmRlZCBkb3VibGUgZWRnZXMKQEAg LTE4NzksMTAgKzE4ODMsMTEgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3Jk ZXIoY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBMYXlvdXRSZWN0JgogICAgICAgICAgICAg JiYgKGhhdmVBbGxTb2xpZEVkZ2VzIHx8ICghb3V0ZXJCb3JkZXIuaXNSb3VuZGVkKCkgJiYgIWlu bmVyQm9yZGVyLmlzUm91bmRlZCgpKSkpIHsKICAgICAgICAgICAgIFBhdGggcGF0aDsKICAgICAg ICAgICAgIAotICAgICAgICAgICAgaWYgKG91dGVyQm9yZGVyLmlzUm91bmRlZCgpICYmIGJsZWVk QXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQotICAgICAg ICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3Qob3V0ZXJCb3JkZXIpOworICAgICAgICAgICAg RmxvYXRSb3VuZGVkUmVjdCBwaXhlbFNuYXBwZWRSb3VuZGVkUmVjdCA9IG91dGVyQm9yZGVyLnBp eGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3IpOworICAg ICAgICAgICAgaWYgKHBpeGVsU25hcHBlZFJvdW5kZWRSZWN0LmlzUm91bmRlZCgpICYmIGJsZWVk QXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQorICAgICAg ICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QocGl4ZWxTbmFwcGVkUm91bmRlZFJlY3QpOwog ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChvdXRlckJvcmRl ci5yZWN0KCkpOworICAgICAgICAgICAgICAgIHBhdGguYWRkUmVjdChwaXhlbFNuYXBwZWRSb3Vu ZGVkUmVjdC5yZWN0KCkpOwogCiAgICAgICAgICAgICBpZiAoaGF2ZUFsbERvdWJsZUVkZ2VzKSB7 CiAgICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBpbm5lclRoaXJkUmVjdCA9IG91dGVyQm9yZGVy LnJlY3QoKTsKQEAgLTE5MDcsMjYgKzE5MTIsMjcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVj dDo6cGFpbnRCb3JkZXIoY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBMYXlvdXRSZWN0Jgog ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAg ICAgUm91bmRlZFJlY3Qgb3V0ZXJUaGlyZCA9IG91dGVyQm9yZGVyOwotICAgICAgICAgICAgICAg IFJvdW5kZWRSZWN0IGlubmVyVGhpcmQgPSBpbm5lckJvcmRlcjsKLSAgICAgICAgICAgICAgICBp bm5lclRoaXJkLnNldFJlY3QoaW5uZXJUaGlyZFJlY3QpOwotICAgICAgICAgICAgICAgIG91dGVy VGhpcmQuc2V0UmVjdChvdXRlclRoaXJkUmVjdCk7CisgICAgICAgICAgICAgICAgRmxvYXRSb3Vu ZGVkUmVjdCBwaXhlbFNuYXBwZWRPdXRlclRoaXJkID0gb3V0ZXJCb3JkZXIucGl4ZWxTbmFwcGVk Um91bmRlZFJlY3RGb3JQYWludGluZyhkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICAg ICAgcGl4ZWxTbmFwcGVkT3V0ZXJUaGlyZC5zZXRSZWN0KHBpeGVsU25hcHBlZEZvclBhaW50aW5n KG91dGVyVGhpcmRSZWN0LCBkZXZpY2VTY2FsZUZhY3RvcikpOwogCi0gICAgICAgICAgICAgICAg aWYgKG91dGVyVGhpcmQuaXNSb3VuZGVkKCkgJiYgYmxlZWRBdm9pZGFuY2UgIT0gQmFja2dyb3Vu ZEJsZWVkVXNlVHJhbnNwYXJlbmN5TGF5ZXIpCi0gICAgICAgICAgICAgICAgICAgIHBhdGguYWRk Um91bmRlZFJlY3Qob3V0ZXJUaGlyZCk7CisgICAgICAgICAgICAgICAgaWYgKHBpeGVsU25hcHBl ZE91dGVyVGhpcmQuaXNSb3VuZGVkKCkgJiYgYmxlZWRBdm9pZGFuY2UgIT0gQmFja2dyb3VuZEJs ZWVkVXNlVHJhbnNwYXJlbmN5TGF5ZXIpCisgICAgICAgICAgICAgICAgICAgIHBhdGguYWRkUm91 bmRlZFJlY3QocGl4ZWxTbmFwcGVkT3V0ZXJUaGlyZCk7CiAgICAgICAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3Qob3V0ZXJUaGlyZC5yZWN0KCkpOworICAg ICAgICAgICAgICAgICAgICBwYXRoLmFkZFJlY3QocGl4ZWxTbmFwcGVkT3V0ZXJUaGlyZC5yZWN0 KCkpOwogCi0gICAgICAgICAgICAgICAgaWYgKGlubmVyVGhpcmQuaXNSb3VuZGVkKCkgJiYgYmxl ZWRBdm9pZGFuY2UgIT0gQmFja2dyb3VuZEJsZWVkVXNlVHJhbnNwYXJlbmN5TGF5ZXIpCi0gICAg ICAgICAgICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QoaW5uZXJUaGlyZCk7CisgICAgICAg ICAgICAgICAgRmxvYXRSb3VuZGVkUmVjdCBwaXhlbFNuYXBwZWRJbm5lclRoaXJkID0gaW5uZXJC b3JkZXIucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQYWludGluZyhkZXZpY2VTY2FsZUZhY3Rv cik7CisgICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkSW5uZXJUaGlyZC5zZXRSZWN0KHBpeGVs U25hcHBlZEZvclBhaW50aW5nKGlubmVyVGhpcmRSZWN0LCBkZXZpY2VTY2FsZUZhY3RvcikpOwor ICAgICAgICAgICAgICAgIGlmIChwaXhlbFNuYXBwZWRJbm5lclRoaXJkLmlzUm91bmRlZCgpICYm IGJsZWVkQXZvaWRhbmNlICE9IEJhY2tncm91bmRCbGVlZFVzZVRyYW5zcGFyZW5jeUxheWVyKQor ICAgICAgICAgICAgICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KHBpeGVsU25hcHBlZElubmVy VGhpcmQpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgcGF0aC5h ZGRSZWN0KGlubmVyVGhpcmQucmVjdCgpKTsKKyAgICAgICAgICAgICAgICAgICAgcGF0aC5hZGRS ZWN0KHBpeGVsU25hcHBlZElubmVyVGhpcmQucmVjdCgpKTsKICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgaWYgKGlubmVyQm9yZGVyLmlzUm91bmRlZCgpKQotICAgICAgICAgICAgICAgIHBh dGguYWRkUm91bmRlZFJlY3QoaW5uZXJCb3JkZXIpOworICAgICAgICAgICAgRmxvYXRSb3VuZGVk UmVjdCBzbmFwcGVkSW5uZXJCb3JkZXIgPSBpbm5lckJvcmRlci5waXhlbFNuYXBwZWRSb3VuZGVk UmVjdEZvclBhaW50aW5nKGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgICAgIGlmIChzbmFw cGVkSW5uZXJCb3JkZXIuaXNSb3VuZGVkKCkpCisgICAgICAgICAgICAgICAgcGF0aC5hZGRSb3Vu ZGVkUmVjdChzbmFwcGVkSW5uZXJCb3JkZXIpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgIHBhdGguYWRkUmVjdChpbm5lckJvcmRlci5yZWN0KCkpOworICAgICAgICAgICAgICAg IHBhdGguYWRkUmVjdChzbmFwcGVkSW5uZXJCb3JkZXIucmVjdCgpKTsKICAgICAgICAgICAgIAog ICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRGaWxsUnVsZShSVUxFX0VWRU5PREQpOwog ICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRGaWxsQ29sb3IoZWRnZXNbZmlyc3RWaXNp YmxlRWRnZV0uY29sb3IsIHN0eWxlLT5jb2xvclNwYWNlKCkpOwpAQCAtMTk2MSw3ICsxOTY3LDcg QEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIoY29uc3QgUGFpbnRJbmZv JiBpbmZvLCBjb25zdCBMYXlvdXRSZWN0JgogICAgICAgICAvLyBpc1JlbmRlcmFibGUoKSBjaGVj ayBhdm9pZHMgaXNzdWUgZGVzY3JpYmVkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zODc4NwogICAgICAgICAvLyBUaGUgaW5zaWRlIHdpbGwgYmUgY2xpcHBlZCBv dXQgbGF0ZXIgKGluIGNsaXBCb3JkZXJTaWRlRm9yQ29tcGxleElubmVyUGF0aCkKICAgICAgICAg aWYgKGlubmVyQm9yZGVyLmlzUmVuZGVyYWJsZSgpKQotICAgICAgICAgICAgZ3JhcGhpY3NDb250 ZXh0LT5jbGlwT3V0Um91bmRlZFJlY3QoRmxvYXRSb3VuZGVkUmVjdChpbm5lckJvcmRlcikpOwor ICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwT3V0Um91bmRlZFJlY3QoaW5uZXJCb3Jk ZXIucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQYWludGluZyhkZXZpY2VTY2FsZUZhY3Rvcikp OwogICAgIH0KIAogICAgIC8vIElmIG9ubHkgb25lIGVkZ2UgdmlzaWJsZSBhbnRpYWxpYXNpbmcg ZG9lc24ndCBjcmVhdGUgc2VhbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmgKaW5kZXggZGJmNWEzZmFiZTEzYjIyNmU5ODJmYjBhODg0NjkzNGZj N2I3YWNjMy4uYmNkZjhiZjBhYmFjYzM1MzMwYmU1YTIzZGM4OTcxYzI1YTgxZmE5MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKQEAgLTI3 OSw3ICsyNzksNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICBzdGF0aWMgYm9vbCBzaG91bGRBbnRpYWxp YXNMaW5lcyhHcmFwaGljc0NvbnRleHQqKTsKIAotICAgIHN0YXRpYyB2b2lkIGNsaXBSb3VuZGVk SW5uZXJSZWN0KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBSb3Vu ZGVkUmVjdCYgY2xpcFJlY3QpOworICAgIHN0YXRpYyB2b2lkIGNsaXBSb3VuZGVkSW5uZXJSZWN0 KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEZsb2F0Um91bmRlZFJl Y3QmIGNsaXBSZWN0KTsKIAogICAgIGJvb2wgaGFzQXV0b0hlaWdodE9yQ29udGFpbmluZ0Jsb2Nr V2l0aEF1dG9IZWlnaHQoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZXBsYWNlZC5jcHAKaW5kZXggMTk4OTM3ZjFjZmY2NzgxM2RmMzczNGM5OTM3MTBhYjU0ODFl OWZhZC4uMTgxYmQyYzYzMTBmYmRlZjBjNTY5MWNmZDE4YmFmMDlhMDY0NTdhZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC0yNCw2ICsyNCw3IEBA CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUmVuZGVyUmVwbGFjZWQuaCIKIAorI2lu Y2x1ZGUgIkZsb2F0Um91bmRlZFJlY3QuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUg IkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIklubGluZUVsZW1lbnRCb3guaCIKQEAgLTE2 OSw4ICsxNzAsOCBAQCB2b2lkIFJlbmRlclJlcGxhY2VkOjpwYWludChQYWludEluZm8mIHBhaW50 SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQogICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgIC8vIFB1c2ggYSBjbGlwIGlmIHdlIGhhdmUgYSBib3JkZXIgcmFkaXVzLCBzaW5j ZSB3ZSB3YW50IHRvIHJvdW5kIHRoZSBmb3JlZ3JvdW5kIGNvbnRlbnQgdGhhdCBnZXRzIHBhaW50 ZWQuCiAgICAgICAgICAgICBwYWludEluZm8uY29udGV4dC0+c2F2ZSgpOwotICAgICAgICAgICAg Um91bmRlZFJlY3Qgcm91bmRlZElubmVyUmVjdCA9IHN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9y ZGVyRm9yKHBhaW50UmVjdCwKLSAgICAgICAgICAgICAgICBwYWRkaW5nVG9wKCkgKyBib3JkZXJU b3AoKSwgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCksIHBhZGRpbmdMZWZ0KCkgKyBi b3JkZXJMZWZ0KCksIHBhZGRpbmdSaWdodCgpICsgYm9yZGVyUmlnaHQoKSwgdHJ1ZSwgdHJ1ZSk7 CisgICAgICAgICAgICBGbG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRJbm5lclJlY3QgPSBGbG9hdFJv dW5kZWRSZWN0KHN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9yZGVyRm9yKHBhaW50UmVjdCwKKyAg ICAgICAgICAgICAgICBwYWRkaW5nVG9wKCkgKyBib3JkZXJUb3AoKSwgcGFkZGluZ0JvdHRvbSgp ICsgYm9yZGVyQm90dG9tKCksIHBhZGRpbmdMZWZ0KCkgKyBib3JkZXJMZWZ0KCksIHBhZGRpbmdS aWdodCgpICsgYm9yZGVyUmlnaHQoKSwgdHJ1ZSwgdHJ1ZSkpOwogICAgICAgICAgICAgY2xpcFJv dW5kZWRJbm5lclJlY3QocGFpbnRJbmZvLmNvbnRleHQsIHBhaW50UmVjdCwgcm91bmRlZElubmVy UmVjdCk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJX aWRnZXQuY3BwCmluZGV4IDllNjAxM2VkZTU4NjBjYzY5ZTZjMzhhNzMwMmVjODZmYzcyYjA3NTUu LjliYzAyMmM2NDc1MzU5OTcyZjU5NzFjMjA1NGE5NjZhODkwYzc2MzYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5jbHVk ZSAiUmVuZGVyV2lkZ2V0LmgiCiAKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCisjaW5jbHVk ZSAiRmxvYXRSb3VuZGVkUmVjdC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSFRN TEZyYW1lT3duZXJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgpAQCAtMjc2 LDggKzI3Nyw4IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpwYWludChQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQogCiAgICAgICAgIC8vIFB1c2ggYSBj bGlwIGlmIHdlIGhhdmUgYSBib3JkZXIgcmFkaXVzLCBzaW5jZSB3ZSB3YW50IHRvIHJvdW5kIHRo ZSBmb3JlZ3JvdW5kIGNvbnRlbnQgdGhhdCBnZXRzIHBhaW50ZWQuCiAgICAgICAgIHBhaW50SW5m by5jb250ZXh0LT5zYXZlKCk7Ci0gICAgICAgIFJvdW5kZWRSZWN0IHJvdW5kZWRJbm5lclJlY3Qg PSBzdHlsZSgpLmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihib3JkZXJSZWN0LAotICAgICAgICAg ICAgcGFkZGluZ1RvcCgpICsgYm9yZGVyVG9wKCksIHBhZGRpbmdCb3R0b20oKSArIGJvcmRlckJv dHRvbSgpLCBwYWRkaW5nTGVmdCgpICsgYm9yZGVyTGVmdCgpLCBwYWRkaW5nUmlnaHQoKSArIGJv cmRlclJpZ2h0KCksIHRydWUsIHRydWUpOworICAgICAgICBGbG9hdFJvdW5kZWRSZWN0IHJvdW5k ZWRJbm5lclJlY3QgPSBGbG9hdFJvdW5kZWRSZWN0KHN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9y ZGVyRm9yKGJvcmRlclJlY3QsCisgICAgICAgICAgICBwYWRkaW5nVG9wKCkgKyBib3JkZXJUb3Ao KSwgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCksIHBhZGRpbmdMZWZ0KCkgKyBib3Jk ZXJMZWZ0KCksIHBhZGRpbmdSaWdodCgpICsgYm9yZGVyUmlnaHQoKSwgdHJ1ZSwgdHJ1ZSkpOwog ICAgICAgICBjbGlwUm91bmRlZElubmVyUmVjdChwYWludEluZm8uY29udGV4dCwgYm9yZGVyUmVj dCwgcm91bmRlZElubmVyUmVjdCk7CiAgICAgfQogCg==