169071 2017-03-02 01:22:24 -0800 Improve consistency of captions rendering on Mac 2017-03-02 10:07:40 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jonlee jonlee commit-queue eric.carlson oldest_to_newest 1282660 0 jonlee 2017-03-02 01:22:24 -0800 On Mac, caption rendering styles are not quite equivalent to what is previewed in the AX panel. 1282668 1 303184 jonlee 2017-03-02 01:58:34 -0800 Created attachment 303184 Patch 1282669 2 303185 jonlee 2017-03-02 02:04:12 -0800 Created attachment 303185 Patch 1282772 3 303185 commit-queue 2017-03-02 10:07:37 -0800 Comment on attachment 303185 Patch Clearing flags on attachment: 303185 Committed r213285: <http://trac.webkit.org/changeset/213285> 1282773 4 commit-queue 2017-03-02 10:07:40 -0800 All reviewed patches have been landed. Closing bug. 303184 2017-03-02 01:58:34 -0800 2017-03-02 02:04:09 -0800 Patch bug-169071-20170302015833.patch text/plain 10017 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgxOWQyM2YxYTVlOTE2 YTVjZjgzZTkxNzNjMzViOTM0M2NkZjVjZC4uMDI4ZDFhY2VmNTE4NmY2MmViZDk1OWU5YjY0ZDk2 MWQ5MGZkMjdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTAzLTAyICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIGNvbnNpc3RlbmN5IG9m IGNhcHRpb25zIHJlbmRlcmluZyBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2OTA3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5o OgorICAgICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRp b25zRWRnZUNvbG9yRm9yVGV4dENvbG9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNh cHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9y KTogRGVsZXRlZC4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwZW5kQ1NTKTogSGVscGVyIGZ1bmN0aW9uIHRv IGFkZCBhIENTUyBydWxlIHdpdGggYSBwcm92aWRlZCBTdHJpbmdCdWlsZGVyLgorICAgICAgICAo V2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OndpbmRvd1JvdW5kZWRDb3Ju ZXJSYWRpdXNDU1MpOiBSZWZhY3RvciB0byB1c2UKKyAgICAgICAgYXBwZW5kQ1NTLgorICAgICAg ICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNvbG9yUHJvcGVydHlD U1MpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRp YUFGOjpjYXB0aW9uc1RleHRFZGdlQ1NTKTogVXBkYXRlIHRleHQgZWRnZSBzdHlsZXMuCisgICAg ICAgIC0gQWRkIGEgYmx1ciB0byB0aGUgc2hhZG93CisgICAgICAgIC0gRHJvcCBzaGFkb3cgc3R5 bGUgaW5jbHVkZXMgMXB4IHRleHQgYm9yZGVyCisgICAgICAgIEFsc28gY29udmVydCB0aGUgc3Ry b2tlIHJ1bGVzIHRvIHVzaW5nIHRoZSBDU1MgcHJvcGVydHkgYW5kIHZhbHVlcyBpbnN0ZWFkIG9m IHN0cmFpZ2h0IHN0cmluZ3MuCisgICAgICAgIChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVu Y2VzTWVkaWFBRjo6Y2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUpOiBGbHktYnkgZml4IG9mIGEg dHlwby4KKwogMjAxNy0wMy0wMSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgog CiAgICAgICAgIFtpb3Mtc2ltdWxhdG9yXSBVbnNraXAgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2F1ZGlvL2F1ZGlvLWNvbnRyb2xzLW1ldHJpY3MuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAppbmRleCAxMTcx NDNiYmM3ODk0ZDBjNzkwYzkzMDcwNjQxYmViZTMyMjY2ZTc0Li5lNTY3ZWEwYWRiMjJmZWI2NGI5 YWIwMzU3MjUwNGU4NTMwZjUwY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nh cHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcApAQCAtMzI3LDY3ICszMjcsMzMgQEAg U3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc1RleHRDb2xvckNT UygpIGNvbnN0CiAKICAgICByZXR1cm4gY29sb3JQcm9wZXJ0eUNTUyhDU1NQcm9wZXJ0eUNvbG9y LCB0ZXh0Q29sb3IsIGltcG9ydGFudCk7CiB9Ci0gICAgCi1TdHJpbmcgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlc01lZGlhQUY6OndpbmRvd1JvdW5kZWRDb3JuZXJSYWRpdXNDU1MoKSBjb25zdAotewot ICAgIE1BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvciBiZWhhdmlvcjsKLSAgICBDR0Zsb2F0IHJh ZGl1cyA9IE1BQ2FwdGlvbkFwcGVhcmFuY2VHZXRXaW5kb3dSb3VuZGVkQ29ybmVyUmFkaXVzKGtN QUNhcHRpb25BcHBlYXJhbmNlRG9tYWluVXNlciwgJmJlaGF2aW9yKTsKLSAgICBpZiAoIXJhZGl1 cykKLSAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7Ci0KLSAgICBTdHJpbmdCdWlsZGVyIGJ1 aWxkZXI7Ci0gICAgYnVpbGRlci5hcHBlbmQoZ2V0UHJvcGVydHlOYW1lU3RyaW5nKENTU1Byb3Bl cnR5Qm9yZGVyUmFkaXVzKSk7Ci0gICAgYnVpbGRlci5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIjol LjAyZnB4IiwgcmFkaXVzKSk7Ci0gICAgaWYgKGJlaGF2aW9yID09IGtNQUNhcHRpb25BcHBlYXJh bmNlQmVoYXZpb3JVc2VWYWx1ZSkKLSAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIgIWlt cG9ydGFudCIpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCc7Jyk7Ci0KLSAgICByZXR1cm4gYnVpbGRl ci50b1N0cmluZygpOwotfQotICAgIAotQ29sb3IgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUY6OmNhcHRpb25zRWRnZUNvbG9yRm9yVGV4dENvbG9yKGNvbnN0IENvbG9yJiB0ZXh0Q29sb3Ip IGNvbnN0Ci17Ci0gICAgaW50IGRpc3RhbmNlRnJvbVdoaXRlID0gZGlmZmVyZW5jZVNxdWFyZWQo dGV4dENvbG9yLCBDb2xvcjo6d2hpdGUpOwotICAgIGludCBkaXN0YW5jZUZyb21CbGFjayA9IGRp ZmZlcmVuY2VTcXVhcmVkKHRleHRDb2xvciwgQ29sb3I6OmJsYWNrKTsKLSAgICAKLSAgICBpZiAo ZGlzdGFuY2VGcm9tV2hpdGUgPCBkaXN0YW5jZUZyb21CbGFjaykKLSAgICAgICAgcmV0dXJuIHRl eHRDb2xvci5kYXJrKCk7Ci0gICAgCi0gICAgcmV0dXJuIHRleHRDb2xvci5saWdodCgpOwotfQog Ci1TdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNzc1Byb3BlcnR5V2l0aFRl eHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlJRCBpZCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3Qg Q29sb3ImIHRleHRDb2xvciwgYm9vbCBpbXBvcnRhbnQpIGNvbnN0CitzdGF0aWMgdm9pZCBhcHBl bmRDU1MoU3RyaW5nQnVpbGRlciYgYnVpbGRlciwgQ1NTUHJvcGVydHlJRCBpZCwgY29uc3QgU3Ry aW5nJiB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQpCiB7Ci0gICAgU3RyaW5nQnVpbGRlciBidWlsZGVy OwotICAgIAogICAgIGJ1aWxkZXIuYXBwZW5kKGdldFByb3BlcnR5TmFtZVN0cmluZyhpZCkpOwog ICAgIGJ1aWxkZXIuYXBwZW5kKCc6Jyk7CiAgICAgYnVpbGRlci5hcHBlbmQodmFsdWUpOwotICAg IGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAgYnVpbGRlci5hcHBlbmQoY2FwdGlvbnNFZGdlQ29s b3JGb3JUZXh0Q29sb3IodGV4dENvbG9yKS5zZXJpYWxpemVkKCkpOwogICAgIGlmIChpbXBvcnRh bnQpCiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiICFpbXBvcnRhbnQiKTsKICAgICBi dWlsZGVyLmFwcGVuZCgnOycpOwotICAgIGlmIChpZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRT dHJva2UpIHsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoIiBwYWludC1vcmRlcjogc3Ryb2tlOyIp OwotICAgICAgICBidWlsZGVyLmFwcGVuZCgiIHN0cm9rZS1saW5lam9pbjogcm91bmQ7Iik7Ci0g ICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIgc3Ryb2tlLWxpbmVjYXA6IHJvdW5kOyIpOwotICAgIH0K K30KICAgICAKK1N0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6d2luZG93Um91 bmRlZENvcm5lclJhZGl1c0NTUygpIGNvbnN0Cit7CisgICAgTUFDYXB0aW9uQXBwZWFyYW5jZUJl aGF2aW9yIGJlaGF2aW9yOworICAgIENHRmxvYXQgcmFkaXVzID0gTUFDYXB0aW9uQXBwZWFyYW5j ZUdldFdpbmRvd1JvdW5kZWRDb3JuZXJSYWRpdXMoa01BQ2FwdGlvbkFwcGVhcmFuY2VEb21haW5V c2VyLCAmYmVoYXZpb3IpOworICAgIGlmICghcmFkaXVzKQorICAgICAgICByZXR1cm4gZW1wdHlT dHJpbmcoKTsKKworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICBhcHBlbmRDU1MoYnVp bGRlciwgQ1NTUHJvcGVydHlCb3JkZXJSYWRpdXMsIFN0cmluZzo6Zm9ybWF0KCIlLjAyZnB4Iiwg cmFkaXVzKSwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVl KTsKICAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOwogfQogCiBTdHJpbmcgQ2FwdGlvblVz ZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNvbG9yUHJvcGVydHlDU1MoQ1NTUHJvcGVydHlJRCBpZCwg Y29uc3QgQ29sb3ImIGNvbG9yLCBib29sIGltcG9ydGFudCkgY29uc3QKIHsKICAgICBTdHJpbmdC dWlsZGVyIGJ1aWxkZXI7Ci0gICAgCi0gICAgYnVpbGRlci5hcHBlbmQoZ2V0UHJvcGVydHlOYW1l U3RyaW5nKGlkKSk7Ci0gICAgYnVpbGRlci5hcHBlbmQoJzonKTsKLSAgICBidWlsZGVyLmFwcGVu ZChjb2xvci5zZXJpYWxpemVkKCkpOwotICAgIGlmIChpbXBvcnRhbnQpCi0gICAgICAgIGJ1aWxk ZXIuYXBwZW5kTGl0ZXJhbCgiICFpbXBvcnRhbnQiKTsKLSAgICBidWlsZGVyLmFwcGVuZCgnOycp OwotICAgIAorICAgIGFwcGVuZENTUyhidWlsZGVyLCBpZCwgY29sb3Iuc2VyaWFsaXplZCgpLCBp bXBvcnRhbnQpOwogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7CiB9CiAKQEAgLTQxNywz OCArMzgzLDM3IEBAIFN0cmluZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6c3Ryb2tl V2lkdGgoKSBjb25zdAogCiBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNh cHRpb25zVGV4dEVkZ2VDU1MoKSBjb25zdAogewotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxj b25zdCBTdHJpbmc+IGVkZ2VTdHlsZVJhaXNlZChBU0NJSUxpdGVyYWwoIiAtLjA1ZW0gLS4wNWVt IDAgIikpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VTdHls ZURlcHJlc3NlZChBU0NJSUxpdGVyYWwoIiAuMDVlbSAuMDVlbSAwICIpKTsKLSAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVEcm9wU2hhZG93KEFTQ0lJTGl0 ZXJhbCgiIC4wNzVlbSAuMDc1ZW0gMCAiKSk7Ci0KLSAgICBib29sIHVudXNlZDsKLSAgICBDb2xv ciBjb2xvciA9IGNhcHRpb25zVGV4dENvbG9yKHVudXNlZCk7Ci0gICAgaWYgKCFjb2xvci5pc1Zh bGlkKCkpCi0gICAgICAgIGNvbG9yID0gQ29sb3IgeyBDb2xvcjo6YmxhY2sgfTsKLSAgICBjb2xv ciA9IGNhcHRpb25zRWRnZUNvbG9yRm9yVGV4dENvbG9yKGNvbG9yKTsKKyAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVSYWlzZWQoQVNDSUlMaXRlcmFsKCIg LS4xZW0gLS4xZW0gLjE2ZW0gIikpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBT dHJpbmc+IGVkZ2VTdHlsZURlcHJlc3NlZChBU0NJSUxpdGVyYWwoIiAuMWVtIC4xZW0gLjE2ZW0g IikpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdHJpbmc+IGVkZ2VTdHlsZURy b3BTaGFkb3coQVNDSUlMaXRlcmFsKCIgMCAuMWVtIC4xNmVtICIpKTsKIAogICAgIE1BQ2FwdGlv bkFwcGVhcmFuY2VCZWhhdmlvciBiZWhhdmlvcjsKICAgICBNQUNhcHRpb25BcHBlYXJhbmNlVGV4 dEVkZ2VTdHlsZSB0ZXh0RWRnZVN0eWxlID0gTUFDYXB0aW9uQXBwZWFyYW5jZUdldFRleHRFZGdl U3R5bGUoa01BQ2FwdGlvbkFwcGVhcmFuY2VEb21haW5Vc2VyLCAmYmVoYXZpb3IpOwotICAgIHN3 aXRjaCAodGV4dEVkZ2VTdHlsZSkgewotICAgIGNhc2Uga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0 RWRnZVN0eWxlVW5kZWZpbmVkOgotICAgIGNhc2Uga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRn ZVN0eWxlTm9uZToKLSAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7Ci0gICAgICAgICAgICAK LSAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHlsZVJhaXNlZDoKLSAgICAg ICAgcmV0dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlUZXh0U2hh ZG93LCBlZGdlU3R5bGVSYWlzZWQsIGNvbG9yLCBiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFy YW5jZUJlaGF2aW9yVXNlVmFsdWUpOwotICAgIGNhc2Uga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0 RWRnZVN0eWxlRGVwcmVzc2VkOgotICAgICAgICByZXR1cm4gY3NzUHJvcGVydHlXaXRoVGV4dEVk Z2VDb2xvcihDU1NQcm9wZXJ0eVRleHRTaGFkb3csIGVkZ2VTdHlsZURlcHJlc3NlZCwgY29sb3Is IGJlaGF2aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7Ci0gICAg Y2FzZSBrTUFDYXB0aW9uQXBwZWFyYW5jZVRleHRFZGdlU3R5bGVEcm9wU2hhZG93OgotICAgICAg ICByZXR1cm4gY3NzUHJvcGVydHlXaXRoVGV4dEVkZ2VDb2xvcihDU1NQcm9wZXJ0eVRleHRTaGFk b3csIGVkZ2VTdHlsZURyb3BTaGFkb3csIGNvbG9yLCBiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBw ZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpOwotICAgIGNhc2Uga01BQ2FwdGlvbkFwcGVhcmFuY2VU ZXh0RWRnZVN0eWxlVW5pZm9ybToKLSAgICAgICAgcmV0dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRF ZGdlQ29sb3IoQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tlLCBzdHJva2VXaWR0aCgpLCBjb2xv ciwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlKTsKICAg ICAKLSAgICBkZWZhdWx0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAg YnJlYWs7CisgICAgaWYgKHRleHRFZGdlU3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0 RWRnZVN0eWxlVW5kZWZpbmVkIHx8IHRleHRFZGdlU3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFu Y2VUZXh0RWRnZVN0eWxlTm9uZSkKKyAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisKKyAg ICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgYm9vbCBpbXBvcnRhbnQgPSBiZWhhdmlvciA9 PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWU7CisgICAgaWYgKHRleHRFZGdl U3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlUmFpc2VkKQorICAgICAg ICBhcHBlbmRDU1MoYnVpbGRlciwgQ1NTUHJvcGVydHlUZXh0U2hhZG93LCBtYWtlU3RyaW5nKGVk Z2VTdHlsZVJhaXNlZC5nZXQoKSwgIiBibGFjayIpLCBpbXBvcnRhbnQpOworICAgIGVsc2UgaWYg KHRleHRFZGdlU3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlRGVwcmVz c2VkKQorICAgICAgICBhcHBlbmRDU1MoYnVpbGRlciwgQ1NTUHJvcGVydHlUZXh0U2hhZG93LCBt YWtlU3RyaW5nKGVkZ2VTdHlsZURlcHJlc3NlZC5nZXQoKSwgIiBibGFjayIpLCBpbXBvcnRhbnQp OworICAgIGVsc2UgaWYgKHRleHRFZGdlU3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0 RWRnZVN0eWxlRHJvcFNoYWRvdykKKyAgICAgICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3Bl cnR5VGV4dFNoYWRvdywgbWFrZVN0cmluZyhlZGdlU3R5bGVEcm9wU2hhZG93LmdldCgpLCAiIGJs YWNrIiksIGltcG9ydGFudCk7CisKKyAgICBpZiAodGV4dEVkZ2VTdHlsZSA9PSBrTUFDYXB0aW9u QXBwZWFyYW5jZVRleHRFZGdlU3R5bGVEcm9wU2hhZG93IHx8IHRleHRFZGdlU3R5bGUgPT0ga01B Q2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlVW5pZm9ybSkgeworICAgICAgICBpZiAodGV4 dEVkZ2VTdHlsZSA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZVRleHRFZGdlU3R5bGVEcm9wU2hhZG93 KQorICAgICAgICAgICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5V2Via2l0VGV4dFN0 cm9rZSwgIi4wM2VtIGJsYWNrIiwgaW1wb3J0YW50KTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5V2Via2l0VGV4dFN0cm9rZSwgbWFrZVN0 cmluZyhzdHJva2VXaWR0aCgpLCAiIGJsYWNrIiksIGltcG9ydGFudCk7CisKKyAgICAgICAgYXBw ZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5UGFpbnRPcmRlciwgZ2V0VmFsdWVOYW1lKENTU1Zh bHVlU3Ryb2tlKSwgaW1wb3J0YW50KTsKKyAgICAgICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1By b3BlcnR5U3Ryb2tlTGluZWpvaW4sIGdldFZhbHVlTmFtZShDU1NWYWx1ZVJvdW5kKSwgaW1wb3J0 YW50KTsKKyAgICAgICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5U3Ryb2tlTGluZWNh cCwgZ2V0VmFsdWVOYW1lKENTU1ZhbHVlUm91bmQpLCBpbXBvcnRhbnQpOwogICAgIH0KICAgICAK LSAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKyAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygp OwogfQogCiBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zRGVm YXVsdEZvbnRDU1MoKSBjb25zdApAQCAtNjIwLDcgKzU4NSw3IEBAIFN0cmluZyBDYXB0aW9uVXNl clByZWZlcmVuY2VzTWVkaWFBRjo6Y2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoKSBjb25zdAog ICAgIH0KICNlbmRpZiAvLyBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlfRlJBTUVXT1JLKQogCi0g ICAgTE9HKE1lZGlhLCAiQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zU3R5 bGVTaGVldE92ZXJyaWRlU2V0dGluZyBzeXRsZSB0bzpcbiVzIiwgY2FwdGlvbnNPdmVycmlkZVN0 eWxlU2hlZXQudG9TdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coTWVkaWEsICJDYXB0 aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGVTZXR0 aW5nIHN0eWxlIHRvOlxuJXMiLCBjYXB0aW9uc092ZXJyaWRlU3R5bGVTaGVldC50b1N0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgcmV0dXJuIGNhcHRpb25zT3ZlcnJpZGVTdHlsZVNoZWV0 LnRvU3RyaW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25V c2VyUHJlZmVyZW5jZXNNZWRpYUFGLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2Vy UHJlZmVyZW5jZXNNZWRpYUFGLmgKaW5kZXggNzYxNmY1MTk3N2IyMzYyZWM0YTJjMGEyNmU5Y2Jm ZGE1NjhlMGQxMi4uZDkwMjdjNzc2MjcwYmQ1MjZlMjNiOTBkZjVlNjY3NTFiMjUxMzc3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFB Ri5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUYuaApAQCAtNzksMTEgKzc5LDkgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgY2FwdGlvbnNUZXh0 Q29sb3JDU1MoKSBjb25zdDsKICAgICBDb2xvciBjYXB0aW9uc1RleHRDb2xvcihib29sJikgY29u c3Q7CiAgICAgU3RyaW5nIGNhcHRpb25zRGVmYXVsdEZvbnRDU1MoKSBjb25zdDsKLSAgICBDb2xv ciBjYXB0aW9uc0VkZ2VDb2xvckZvclRleHRDb2xvcihjb25zdCBDb2xvciYpIGNvbnN0OwogICAg IFN0cmluZyB3aW5kb3dSb3VuZGVkQ29ybmVyUmFkaXVzQ1NTKCkgY29uc3Q7CiAgICAgU3RyaW5n IHN0cm9rZVdpZHRoKCkgY29uc3Q7CiAgICAgU3RyaW5nIGNhcHRpb25zVGV4dEVkZ2VDU1MoKSBj b25zdDsKLSAgICBTdHJpbmcgY3NzUHJvcGVydHlXaXRoVGV4dEVkZ2VDb2xvcihDU1NQcm9wZXJ0 eUlELCBjb25zdCBTdHJpbmcmLCBjb25zdCBDb2xvciYsIGJvb2wpIGNvbnN0OwogICAgIFN0cmlu ZyBjb2xvclByb3BlcnR5Q1NTKENTU1Byb3BlcnR5SUQsIGNvbnN0IENvbG9yJiwgYm9vbCkgY29u c3Q7CiAgICAgVGltZXIgbV91cGRhdGVTdHlsZVNoZWV0VGltZXI7CiAK 303185 2017-03-02 02:04:12 -0800 2017-03-02 10:07:37 -0800 Patch bug-169071-20170302020411.patch text/plain 10069 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgxOWQyM2YxYTVlOTE2 YTVjZjgzZTkxNzNjMzViOTM0M2NkZjVjZC4uNTk3YTg4YTlmZGIyZWYzOGRkYzg3YWFjNWJmZmMx YmMwODNhNTJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAzLTAyICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIGNvbnNpc3RlbmN5IG9m IGNhcHRpb25zIHJlbmRlcmluZyBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2OTA3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5o OgorICAgICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRp b25zRWRnZUNvbG9yRm9yVGV4dENvbG9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNh cHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9y KTogRGVsZXRlZC4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwZW5kQ1NTKTogSGVscGVyIGZ1bmN0aW9uIHRv IGFkZCBhIENTUyBydWxlIHdpdGggYSBwcm92aWRlZCBTdHJpbmdCdWlsZGVyLgorICAgICAgICAo V2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OndpbmRvd1JvdW5kZWRDb3Ju ZXJSYWRpdXNDU1MpOiBSZWZhY3RvciB0byB1c2UKKyAgICAgICAgYXBwZW5kQ1NTLgorICAgICAg ICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNvbG9yUHJvcGVydHlD U1MpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRp YUFGOjpjYXB0aW9uc1RleHRFZGdlQ1NTKTogVXBkYXRlIHRleHQgZWRnZSBzdHlsZXMuCisgICAg ICAgIC0gQWRkIGEgYmx1ciB0byB0aGUgc2hhZG93CisgICAgICAgIC0gRHJvcCBzaGFkb3cgc3R5 bGUgaW5jbHVkZXMgMXB4IHRleHQgYm9yZGVyCisgICAgICAgIC0gQWx3YXlzIHVzZSBibGFjayBm b3IgdGhlIHRleHQgZWRnZSBjb2xvcgorICAgICAgICBBbHNvIGNvbnZlcnQgdGhlIHN0cm9rZSBy dWxlcyB0byB1c2luZyB0aGUgQ1NTIHByb3BlcnR5IGFuZCB2YWx1ZXMgaW5zdGVhZCBvZiBzdHJh aWdodCBzdHJpbmdzLgorICAgICAgICAoV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01l ZGlhQUY6OmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKTogRmx5LWJ5IGZpeCBvZiBhIHR5cG8u CisKIDIwMTctMDMtMDEgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaW9zLXNpbXVsYXRvcl0gVW5za2lwIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9h dWRpby9hdWRpby1jb250cm9scy1tZXRyaWNzLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKaW5kZXggMTE3MTQzYmJj Nzg5NGQwYzc5MGM5MzA3MDY0MWJlYmUzMjI2NmU3NC4uZTU2N2VhMGFkYjIyZmViNjRiOWFiMDM1 NzI1MDRlODUzMGY1MGNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9u VXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0 aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKQEAgLTMyNyw2NyArMzI3LDMzIEBAIFN0cmlu ZyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRjo6Y2FwdGlvbnNUZXh0Q29sb3JDU1MoKSBj b25zdAogCiAgICAgcmV0dXJuIGNvbG9yUHJvcGVydHlDU1MoQ1NTUHJvcGVydHlDb2xvciwgdGV4 dENvbG9yLCBpbXBvcnRhbnQpOwogfQotICAgIAotU3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5j ZXNNZWRpYUFGOjp3aW5kb3dSb3VuZGVkQ29ybmVyUmFkaXVzQ1NTKCkgY29uc3QKLXsKLSAgICBN QUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3IgYmVoYXZpb3I7Ci0gICAgQ0dGbG9hdCByYWRpdXMg PSBNQUNhcHRpb25BcHBlYXJhbmNlR2V0V2luZG93Um91bmRlZENvcm5lclJhZGl1cyhrTUFDYXB0 aW9uQXBwZWFyYW5jZURvbWFpblVzZXIsICZiZWhhdmlvcik7Ci0gICAgaWYgKCFyYWRpdXMpCi0g ICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwotCi0gICAgU3RyaW5nQnVpbGRlciBidWlsZGVy OwotICAgIGJ1aWxkZXIuYXBwZW5kKGdldFByb3BlcnR5TmFtZVN0cmluZyhDU1NQcm9wZXJ0eUJv cmRlclJhZGl1cykpOwotICAgIGJ1aWxkZXIuYXBwZW5kKFN0cmluZzo6Zm9ybWF0KCI6JS4wMmZw eCIsIHJhZGl1cykpOwotICAgIGlmIChiZWhhdmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJl aGF2aW9yVXNlVmFsdWUpCi0gICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiICFpbXBvcnRh bnQiKTsKLSAgICBidWlsZGVyLmFwcGVuZCgnOycpOwotCi0gICAgcmV0dXJuIGJ1aWxkZXIudG9T dHJpbmcoKTsKLX0KLSAgICAKLUNvbG9yIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpj YXB0aW9uc0VkZ2VDb2xvckZvclRleHRDb2xvcihjb25zdCBDb2xvciYgdGV4dENvbG9yKSBjb25z dAotewotICAgIGludCBkaXN0YW5jZUZyb21XaGl0ZSA9IGRpZmZlcmVuY2VTcXVhcmVkKHRleHRD b2xvciwgQ29sb3I6OndoaXRlKTsKLSAgICBpbnQgZGlzdGFuY2VGcm9tQmxhY2sgPSBkaWZmZXJl bmNlU3F1YXJlZCh0ZXh0Q29sb3IsIENvbG9yOjpibGFjayk7Ci0gICAgCi0gICAgaWYgKGRpc3Rh bmNlRnJvbVdoaXRlIDwgZGlzdGFuY2VGcm9tQmxhY2spCi0gICAgICAgIHJldHVybiB0ZXh0Q29s b3IuZGFyaygpOwotICAgIAotICAgIHJldHVybiB0ZXh0Q29sb3IubGlnaHQoKTsKLX0KIAotU3Ry aW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjc3NQcm9wZXJ0eVdpdGhUZXh0RWRn ZUNvbG9yKENTU1Byb3BlcnR5SUQgaWQsIGNvbnN0IFN0cmluZyYgdmFsdWUsIGNvbnN0IENvbG9y JiB0ZXh0Q29sb3IsIGJvb2wgaW1wb3J0YW50KSBjb25zdAorc3RhdGljIHZvaWQgYXBwZW5kQ1NT KFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIENTU1Byb3BlcnR5SUQgaWQsIGNvbnN0IFN0cmluZyYg dmFsdWUsIGJvb2wgaW1wb3J0YW50KQogewotICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKLSAg ICAKICAgICBidWlsZGVyLmFwcGVuZChnZXRQcm9wZXJ0eU5hbWVTdHJpbmcoaWQpKTsKICAgICBi dWlsZGVyLmFwcGVuZCgnOicpOwogICAgIGJ1aWxkZXIuYXBwZW5kKHZhbHVlKTsKLSAgICBidWls ZGVyLmFwcGVuZCgnICcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKGNhcHRpb25zRWRnZUNvbG9yRm9y VGV4dENvbG9yKHRleHRDb2xvcikuc2VyaWFsaXplZCgpKTsKICAgICBpZiAoaW1wb3J0YW50KQog ICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiAhaW1wb3J0YW50Iik7CiAgICAgYnVpbGRl ci5hcHBlbmQoJzsnKTsKLSAgICBpZiAoaWQgPT0gQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tl KSB7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIgcGFpbnQtb3JkZXI6IHN0cm9rZTsiKTsKLSAg ICAgICAgYnVpbGRlci5hcHBlbmQoIiBzdHJva2UtbGluZWpvaW46IHJvdW5kOyIpOwotICAgICAg ICBidWlsZGVyLmFwcGVuZCgiIHN0cm9rZS1saW5lY2FwOiByb3VuZDsiKTsKLSAgICB9Cit9CiAg ICAgCitTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OndpbmRvd1JvdW5kZWRD b3JuZXJSYWRpdXNDU1MoKSBjb25zdAoreworICAgIE1BQ2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlv ciBiZWhhdmlvcjsKKyAgICBDR0Zsb2F0IHJhZGl1cyA9IE1BQ2FwdGlvbkFwcGVhcmFuY2VHZXRX aW5kb3dSb3VuZGVkQ29ybmVyUmFkaXVzKGtNQUNhcHRpb25BcHBlYXJhbmNlRG9tYWluVXNlciwg JmJlaGF2aW9yKTsKKyAgICBpZiAoIXJhZGl1cykKKyAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5n KCk7CisKKyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgYXBwZW5kQ1NTKGJ1aWxkZXIs IENTU1Byb3BlcnR5Qm9yZGVyUmFkaXVzLCBTdHJpbmc6OmZvcm1hdCgiJS4wMmZweCIsIHJhZGl1 cyksIGJlaGF2aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7CiAg ICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAogU3RyaW5nIENhcHRpb25Vc2VyUHJl ZmVyZW5jZXNNZWRpYUFGOjpjb2xvclByb3BlcnR5Q1NTKENTU1Byb3BlcnR5SUQgaWQsIGNvbnN0 IENvbG9yJiBjb2xvciwgYm9vbCBpbXBvcnRhbnQpIGNvbnN0CiB7CiAgICAgU3RyaW5nQnVpbGRl ciBidWlsZGVyOwotICAgIAotICAgIGJ1aWxkZXIuYXBwZW5kKGdldFByb3BlcnR5TmFtZVN0cmlu ZyhpZCkpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCc6Jyk7Ci0gICAgYnVpbGRlci5hcHBlbmQoY29s b3Iuc2VyaWFsaXplZCgpKTsKLSAgICBpZiAoaW1wb3J0YW50KQotICAgICAgICBidWlsZGVyLmFw cGVuZExpdGVyYWwoIiAhaW1wb3J0YW50Iik7Ci0gICAgYnVpbGRlci5hcHBlbmQoJzsnKTsKLSAg ICAKKyAgICBhcHBlbmRDU1MoYnVpbGRlciwgaWQsIGNvbG9yLnNlcmlhbGl6ZWQoKSwgaW1wb3J0 YW50KTsKICAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOwogfQogCkBAIC00MTcsMzggKzM4 MywzNyBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnN0cm9rZVdpZHRo KCkgY29uc3QKIAogU3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9u c1RleHRFZGdlQ1NTKCkgY29uc3QKIHsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3Qg U3RyaW5nPiBlZGdlU3R5bGVSYWlzZWQoQVNDSUlMaXRlcmFsKCIgLS4wNWVtIC0uMDVlbSAwICIp KTsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVEZXBy ZXNzZWQoQVNDSUlMaXRlcmFsKCIgLjA1ZW0gLjA1ZW0gMCAiKSk7Ci0gICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPGNvbnN0IFN0cmluZz4gZWRnZVN0eWxlRHJvcFNoYWRvdyhBU0NJSUxpdGVyYWwo IiAuMDc1ZW0gLjA3NWVtIDAgIikpOwotCi0gICAgYm9vbCB1bnVzZWQ7Ci0gICAgQ29sb3IgY29s b3IgPSBjYXB0aW9uc1RleHRDb2xvcih1bnVzZWQpOwotICAgIGlmICghY29sb3IuaXNWYWxpZCgp KQotICAgICAgICBjb2xvciA9IENvbG9yIHsgQ29sb3I6OmJsYWNrIH07Ci0gICAgY29sb3IgPSBj YXB0aW9uc0VkZ2VDb2xvckZvclRleHRDb2xvcihjb2xvcik7CisgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPGNvbnN0IFN0cmluZz4gZWRnZVN0eWxlUmFpc2VkKEFTQ0lJTGl0ZXJhbCgiIC0uMWVt IC0uMWVtIC4xNmVtICIpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5n PiBlZGdlU3R5bGVEZXByZXNzZWQoQVNDSUlMaXRlcmFsKCIgLjFlbSAuMWVtIC4xNmVtICIpKTsK KyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBlZGdlU3R5bGVEcm9wU2hh ZG93KEFTQ0lJTGl0ZXJhbCgiIDAgLjFlbSAuMTZlbSAiKSk7CiAKICAgICBNQUNhcHRpb25BcHBl YXJhbmNlQmVoYXZpb3IgYmVoYXZpb3I7CiAgICAgTUFDYXB0aW9uQXBwZWFyYW5jZVRleHRFZGdl U3R5bGUgdGV4dEVkZ2VTdHlsZSA9IE1BQ2FwdGlvbkFwcGVhcmFuY2VHZXRUZXh0RWRnZVN0eWxl KGtNQUNhcHRpb25BcHBlYXJhbmNlRG9tYWluVXNlciwgJmJlaGF2aW9yKTsKLSAgICBzd2l0Y2gg KHRleHRFZGdlU3R5bGUpIHsKLSAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VT dHlsZVVuZGVmaW5lZDoKLSAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHls ZU5vbmU6Ci0gICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwotICAgICAgICAgICAgCi0gICAg Y2FzZSBrTUFDYXB0aW9uQXBwZWFyYW5jZVRleHRFZGdlU3R5bGVSYWlzZWQ6Ci0gICAgICAgIHJl dHVybiBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNvbG9yKENTU1Byb3BlcnR5VGV4dFNoYWRvdywg ZWRnZVN0eWxlUmFpc2VkLCBjb2xvciwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VC ZWhhdmlvclVzZVZhbHVlKTsKLSAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VT dHlsZURlcHJlc3NlZDoKLSAgICAgICAgcmV0dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29s b3IoQ1NTUHJvcGVydHlUZXh0U2hhZG93LCBlZGdlU3R5bGVEZXByZXNzZWQsIGNvbG9yLCBiZWhh dmlvciA9PSBrTUFDYXB0aW9uQXBwZWFyYW5jZUJlaGF2aW9yVXNlVmFsdWUpOwotICAgIGNhc2Ug a01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlRHJvcFNoYWRvdzoKLSAgICAgICAgcmV0 dXJuIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlUZXh0U2hhZG93LCBl ZGdlU3R5bGVEcm9wU2hhZG93LCBjb2xvciwgYmVoYXZpb3IgPT0ga01BQ2FwdGlvbkFwcGVhcmFu Y2VCZWhhdmlvclVzZVZhbHVlKTsKLSAgICBjYXNlIGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVk Z2VTdHlsZVVuaWZvcm06Ci0gICAgICAgIHJldHVybiBjc3NQcm9wZXJ0eVdpdGhUZXh0RWRnZUNv bG9yKENTU1Byb3BlcnR5V2Via2l0VGV4dFN0cm9rZSwgc3Ryb2tlV2lkdGgoKSwgY29sb3IsIGJl aGF2aW9yID09IGtNQUNhcHRpb25BcHBlYXJhbmNlQmVoYXZpb3JVc2VWYWx1ZSk7CiAgICAgCi0g ICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFr OworICAgIGlmICh0ZXh0RWRnZVN0eWxlID09IGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VT dHlsZVVuZGVmaW5lZCB8fCB0ZXh0RWRnZVN0eWxlID09IGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4 dEVkZ2VTdHlsZU5vbmUpCisgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOworCisgICAgU3Ry aW5nQnVpbGRlciBidWlsZGVyOworICAgIGJvb2wgaW1wb3J0YW50ID0gYmVoYXZpb3IgPT0ga01B Q2FwdGlvbkFwcGVhcmFuY2VCZWhhdmlvclVzZVZhbHVlOworICAgIGlmICh0ZXh0RWRnZVN0eWxl ID09IGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHlsZVJhaXNlZCkKKyAgICAgICAgYXBw ZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5VGV4dFNoYWRvdywgbWFrZVN0cmluZyhlZGdlU3R5 bGVSYWlzZWQuZ2V0KCksICIgYmxhY2siKSwgaW1wb3J0YW50KTsKKyAgICBlbHNlIGlmICh0ZXh0 RWRnZVN0eWxlID09IGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VTdHlsZURlcHJlc3NlZCkK KyAgICAgICAgYXBwZW5kQ1NTKGJ1aWxkZXIsIENTU1Byb3BlcnR5VGV4dFNoYWRvdywgbWFrZVN0 cmluZyhlZGdlU3R5bGVEZXByZXNzZWQuZ2V0KCksICIgYmxhY2siKSwgaW1wb3J0YW50KTsKKyAg ICBlbHNlIGlmICh0ZXh0RWRnZVN0eWxlID09IGtNQUNhcHRpb25BcHBlYXJhbmNlVGV4dEVkZ2VT dHlsZURyb3BTaGFkb3cpCisgICAgICAgIGFwcGVuZENTUyhidWlsZGVyLCBDU1NQcm9wZXJ0eVRl eHRTaGFkb3csIG1ha2VTdHJpbmcoZWRnZVN0eWxlRHJvcFNoYWRvdy5nZXQoKSwgIiBibGFjayIp LCBpbXBvcnRhbnQpOworCisgICAgaWYgKHRleHRFZGdlU3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVh cmFuY2VUZXh0RWRnZVN0eWxlRHJvcFNoYWRvdyB8fCB0ZXh0RWRnZVN0eWxlID09IGtNQUNhcHRp b25BcHBlYXJhbmNlVGV4dEVkZ2VTdHlsZVVuaWZvcm0pIHsKKyAgICAgICAgaWYgKHRleHRFZGdl U3R5bGUgPT0ga01BQ2FwdGlvbkFwcGVhcmFuY2VUZXh0RWRnZVN0eWxlRHJvcFNoYWRvdykKKyAg ICAgICAgICAgIGFwcGVuZENTUyhidWlsZGVyLCBDU1NQcm9wZXJ0eVdlYmtpdFRleHRTdHJva2Us ICIuMDNlbSBibGFjayIsIGltcG9ydGFudCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGFw cGVuZENTUyhidWlsZGVyLCBDU1NQcm9wZXJ0eVdlYmtpdFRleHRTdHJva2UsIG1ha2VTdHJpbmco c3Ryb2tlV2lkdGgoKSwgIiBibGFjayIpLCBpbXBvcnRhbnQpOworCisgICAgICAgIGFwcGVuZENT UyhidWlsZGVyLCBDU1NQcm9wZXJ0eVBhaW50T3JkZXIsIGdldFZhbHVlTmFtZShDU1NWYWx1ZVN0 cm9rZSksIGltcG9ydGFudCk7CisgICAgICAgIGFwcGVuZENTUyhidWlsZGVyLCBDU1NQcm9wZXJ0 eVN0cm9rZUxpbmVqb2luLCBnZXRWYWx1ZU5hbWUoQ1NTVmFsdWVSb3VuZCksIGltcG9ydGFudCk7 CisgICAgICAgIGFwcGVuZENTUyhidWlsZGVyLCBDU1NQcm9wZXJ0eVN0cm9rZUxpbmVjYXAsIGdl dFZhbHVlTmFtZShDU1NWYWx1ZVJvdW5kKSwgaW1wb3J0YW50KTsKICAgICB9CiAgICAgCi0gICAg cmV0dXJuIGVtcHR5U3RyaW5nKCk7CisgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0K IAogU3RyaW5nIENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc0RlZmF1bHRG b250Q1NTKCkgY29uc3QKQEAgLTYyMCw3ICs1ODUsNyBAQCBTdHJpbmcgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKCkgY29uc3QKICAgICB9 CiAjZW5kaWYgLy8gSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKIAotICAgIExP RyhNZWRpYSwgIkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uc1N0eWxlU2hl ZXRPdmVycmlkZVNldHRpbmcgc3l0bGUgdG86XG4lcyIsIGNhcHRpb25zT3ZlcnJpZGVTdHlsZVNo ZWV0LnRvU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgTE9HKE1lZGlhLCAiQ2FwdGlvblVz ZXJQcmVmZXJlbmNlc01lZGlhQUY6OmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlU2V0dGluZyBz dHlsZSB0bzpcbiVzIiwgY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQudG9TdHJpbmcoKS51dGY4 KCkuZGF0YSgpKTsKIAogICAgIHJldHVybiBjYXB0aW9uc092ZXJyaWRlU3R5bGVTaGVldC50b1N0 cmluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclBy ZWZlcmVuY2VzTWVkaWFBRi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZl cmVuY2VzTWVkaWFBRi5oCmluZGV4IDc2MTZmNTE5NzdiMjM2MmVjNGEyYzBhMjZlOWNiZmRhNTY4 ZTBkMTIuLmQ5MDI3Yzc3NjI3MGJkNTI2ZTIzYjkwZGY1ZTY2NzUxYjI1MTM3NzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmgK QEAgLTc5LDExICs3OSw5IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIGNhcHRpb25zVGV4dENvbG9y Q1NTKCkgY29uc3Q7CiAgICAgQ29sb3IgY2FwdGlvbnNUZXh0Q29sb3IoYm9vbCYpIGNvbnN0Owog ICAgIFN0cmluZyBjYXB0aW9uc0RlZmF1bHRGb250Q1NTKCkgY29uc3Q7Ci0gICAgQ29sb3IgY2Fw dGlvbnNFZGdlQ29sb3JGb3JUZXh0Q29sb3IoY29uc3QgQ29sb3ImKSBjb25zdDsKICAgICBTdHJp bmcgd2luZG93Um91bmRlZENvcm5lclJhZGl1c0NTUygpIGNvbnN0OwogICAgIFN0cmluZyBzdHJv a2VXaWR0aCgpIGNvbnN0OwogICAgIFN0cmluZyBjYXB0aW9uc1RleHRFZGdlQ1NTKCkgY29uc3Q7 Ci0gICAgU3RyaW5nIGNzc1Byb3BlcnR5V2l0aFRleHRFZGdlQ29sb3IoQ1NTUHJvcGVydHlJRCwg Y29uc3QgU3RyaW5nJiwgY29uc3QgQ29sb3ImLCBib29sKSBjb25zdDsKICAgICBTdHJpbmcgY29s b3JQcm9wZXJ0eUNTUyhDU1NQcm9wZXJ0eUlELCBjb25zdCBDb2xvciYsIGJvb2wpIGNvbnN0Owog ICAgIFRpbWVyIG1fdXBkYXRlU3R5bGVTaGVldFRpbWVyOwogCg==