128272 2014-02-05 13:55:20 -0800 DocumentLoader::timing() should return a reference. 2015-01-21 14:33:51 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim japhet jer.noble kangil.han philipj sergio oldest_to_newest 977076 0 kling 2014-02-05 13:55:20 -0800 DocumentLoader::timing() should return a reference. 977077 1 223263 kling 2014-02-05 13:56:19 -0800 Created attachment 223263 Patch 1063141 2 245077 kling 2015-01-21 12:32:34 -0800 Created attachment 245077 Patch 1063182 3 245077 commit-queue 2015-01-21 14:33:47 -0800 Comment on attachment 245077 Patch Clearing flags on attachment: 245077 Committed r178859: <http://trac.webkit.org/changeset/178859> 1063183 4 commit-queue 2015-01-21 14:33:51 -0800 All reviewed patches have been landed. Closing bug. 223263 2014-02-05 13:56:19 -0800 2015-01-21 12:32:34 -0800 Patch bug-128272.diff text/plain 13770 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTgxYjYxLi4zMDVlODAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkg QEAKIDIwMTQtMDItMDUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIERvY3VtZW50TG9hZGVyOjp0aW1pbmcoKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJlbmNlLgor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4MjcyPgorCisgICAgICAgIFRoZXJlIGlz IGFsd2F5cyBhIERvY3VtZW50TG9hZGVyVGltaW5nIG9iamVjdCwgc28gcmV0dXJuIGl0IGJ5Cisg ICAgICAgIHJlZmVyZW5jZSBzaW5jZSBpdCBjYW4gbmV2ZXIgYmUgbnVsbC4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9TY3JpcHRlZEFuaW1h dGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0ZWRBbmltYXRpb25D b250cm9sbGVyOjpzZXJ2aWNlU2NyaXB0ZWRBbmltYXRpb25zKToKKyAgICAgICAgKiBodG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yVGltaW5nKToKKyAgICAg ICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnRMb2FkZXI6OmZpbmlzaGVkTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExv YWRlcjo6d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVy Ojpjb250aW51ZUFmdGVyTmF2aWdhdGlvblBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgKiBsb2FkZXIv RG9jdW1lbnRMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjp0aW1p bmcpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZFByb3Zpc2lvbmFsSXRlbUZyb21DYWNoZWRQYWdlKToKKyAgICAgICAgKiBwYWdlL0RP TVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmRpc3BhdGNoTG9hZEV2 ZW50KToKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBlcmZvcm1hbmNlOjpub3cpOgorICAgICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VSZXNvdXJjZVRp bWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjptb25vdG9uaWNUaW1lVG9Eb2N1bWVudE1pbGxp c2Vjb25kcyk6CisKKzIwMTQtMDItMDUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29t PgorCiAgICAgICAgIEZyYW1lTG9hZGVyOjpzdGF0ZU1hY2hpbmUoKSBzaG91bGQgcmV0dXJuIGEg cmVmZXJlbmNlLgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4MjYzPgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCmlu ZGV4IGNhNTgyYWQuLjEzNzk0ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC0xMzAsOCArMTMwLDggQEAgdm9pZCBTY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXI6OnNlcnZpY2VTY3JpcHRlZEFuaW1hdGlvbnMoZG91Ymxl IG1vbm90b25pY1RpbWUKICAgICBpZiAoIW1fY2FsbGJhY2tzLnNpemUoKSB8fCBtX3N1c3BlbmRD b3VudCB8fCAobV9kb2N1bWVudC0+c2V0dGluZ3MoKSAmJiAhbV9kb2N1bWVudC0+c2V0dGluZ3Mo KS0+cmVxdWVzdEFuaW1hdGlvbkZyYW1lRW5hYmxlZCgpKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgZG91YmxlIGhpZ2hSZXNOb3dNcyA9IDEwMDAuMCAqIG1fZG9jdW1lbnQtPmxvYWRlcigpLT50 aW1pbmcoKS0+bW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1lbnRUaW1lKG1vbm90b25pY1Rp bWVOb3cpOwotICAgIGRvdWJsZSBsZWdhY3lIaWdoUmVzTm93TXMgPSAxMDAwLjAgKiBtX2RvY3Vt ZW50LT5sb2FkZXIoKS0+dGltaW5nKCktPm1vbm90b25pY1RpbWVUb1BzZXVkb1dhbGxUaW1lKG1v bm90b25pY1RpbWVOb3cpOworICAgIGRvdWJsZSBoaWdoUmVzTm93TXMgPSAxMDAwLjAgKiBtX2Rv Y3VtZW50LT5sb2FkZXIoKS0+dGltaW5nKCkubW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1l bnRUaW1lKG1vbm90b25pY1RpbWVOb3cpOworICAgIGRvdWJsZSBsZWdhY3lIaWdoUmVzTm93TXMg PSAxMDAwLjAgKiBtX2RvY3VtZW50LT5sb2FkZXIoKS0+dGltaW5nKCkubW9ub3RvbmljVGltZVRv UHNldWRvV2FsbFRpbWUobW9ub3RvbmljVGltZU5vdyk7CiAKICAgICAvLyBGaXJzdCwgZ2VuZXJh dGUgYSBsaXN0IG9mIGNhbGxiYWNrcyB0byBjb25zaWRlci4gIENhbGxiYWNrcyByZWdpc3RlcmVk IGZyb20gdGhpcyBwb2ludAogICAgIC8vIG9uIGFyZSBjb25zaWRlcmVkIG9ubHkgZm9yIHRoZSAi bmV4dCIgZnJhbWUsIG5vdCB0aGlzIG9uZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCmluZGV4IGFkM2E5MzIuLjkzYWQ0ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNTY1NCw3ICs1NjU0LDcgQEAgUmVmUHRyPFZpZGVvUGxh eWJhY2tRdWFsaXR5PiBIVE1MTWVkaWFFbGVtZW50OjpnZXRWaWRlb1BsYXliYWNrUXVhbGl0eSgp CiAgICAgZG91YmxlIG5vdyA9IHBlcmZvcm1hbmNlID8gcGVyZm9ybWFuY2UtPm5vdygpIDogMDsK ICNlbHNlCiAgICAgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciA9IGRvY3VtZW50KCkubG9hZGVyKCk7 Ci0gICAgZG91YmxlIG5vdyA9IGxvYWRlciA/IDEwMDAuMCAqIGxvYWRlci0+dGltaW5nKCktPm1v bm90b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZShtb25vdG9uaWNhbGx5SW5jcmVhc2lu Z1RpbWUoKSkgOiAwOworICAgIGRvdWJsZSBub3cgPSBsb2FkZXIgPyAxMDAwLjAgKiBsb2FkZXIt PnRpbWluZygpLm1vbm90b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZShtb25vdG9uaWNh bGx5SW5jcmVhc2luZ1RpbWUoKSkgOiAwOwogI2VuZGlmCiAKICAgICBpZiAoIW1fcGxheWVyKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCmluZGV4IDY1ZjhkYjEuLjYzODM4NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTEwNCw3ICsxMDQsNyBAQCBz dGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhj b25zdCBIVFRQSGVhZGVyTWFwJiBoZQogc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBl QnVpbGRlcjo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc+IGJ1aWxkT2JqZWN0Rm9yVGltaW5nKGNv bnN0IFJlc291cmNlTG9hZFRpbWluZyYgdGltaW5nLCBEb2N1bWVudExvYWRlciogbG9hZGVyKQog ewogICAgIHJldHVybiBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpOZXR3b3JrOjpSZXNvdXJjZVRp bWluZzo6Y3JlYXRlKCkKLSAgICAgICAgLnNldFJlcXVlc3RUaW1lKGxvYWRlci0+dGltaW5nKCkt Pm1vbm90b25pY1RpbWVUb1BzZXVkb1dhbGxUaW1lKHRpbWluZy5jb252ZXJ0UmVzb3VyY2VMb2Fk VGltZVRvTW9ub3RvbmljVGltZSgwKSkpCisgICAgICAgIC5zZXRSZXF1ZXN0VGltZShsb2FkZXIt PnRpbWluZygpLm1vbm90b25pY1RpbWVUb1BzZXVkb1dhbGxUaW1lKHRpbWluZy5jb252ZXJ0UmVz b3VyY2VMb2FkVGltZVRvTW9ub3RvbmljVGltZSgwKSkpCiAgICAgICAgIC5zZXRQcm94eVN0YXJ0 KHRpbWluZy5wcm94eVN0YXJ0KQogICAgICAgICAuc2V0UHJveHlFbmQodGltaW5nLnByb3h5RW5k KQogICAgICAgICAuc2V0RG5zU3RhcnQodGltaW5nLmRuc1N0YXJ0KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggZmY1NTZjNS4uNWQzYzI4OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC00MjIsNyArNDIyLDcgQEAgdm9p ZCBEb2N1bWVudExvYWRlcjo6ZmluaXNoZWRMb2FkaW5nKGRvdWJsZSBmaW5pc2hUaW1lKQogICAg ICAgICByZXNwb25zZUVuZFRpbWUgPSBtX3RpbWVPZkxhc3REYXRhUmVjZWl2ZWQ7CiAgICAgaWYg KCFyZXNwb25zZUVuZFRpbWUpCiAgICAgICAgIHJlc3BvbnNlRW5kVGltZSA9IG1vbm90b25pY2Fs bHlJbmNyZWFzaW5nVGltZSgpOwotICAgIHRpbWluZygpLT5zZXRSZXNwb25zZUVuZChyZXNwb25z ZUVuZFRpbWUpOworICAgIHRpbWluZygpLnNldFJlc3BvbnNlRW5kKHJlc3BvbnNlRW5kVGltZSk7 CiAKICAgICBjb21taXRJZlJlYWR5KCk7CiAgICAgaWYgKCFmcmFtZUxvYWRlcigpKQpAQCAtNTEx LDcgKzUxMSw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJj ZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGNvbnN0IFJlc291cmNlCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBBU1NFUlQodGltaW5nKCktPmZldGNoU3RhcnQoKSk7CisgICAgQVNTRVJUKHRp bWluZygpLmZldGNoU3RhcnQoKSk7CiAgICAgaWYgKCFyZWRpcmVjdFJlc3BvbnNlLmlzTnVsbCgp KSB7CiAgICAgICAgIC8vIElmIHRoZSByZWRpcmVjdGluZyB1cmwgaXMgbm90IGFsbG93ZWQgdG8g ZGlzcGxheSBjb250ZW50IGZyb20gdGhlIHRhcmdldCBvcmlnaW4sCiAgICAgICAgIC8vIHRoZW4g YmxvY2sgdGhlIHJlZGlyZWN0LgpAQCAtNTIxLDcgKzUyMSw3IEBAIHZvaWQgRG9jdW1lbnRMb2Fk ZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGNvbnN0IFJl c291cmNlCiAgICAgICAgICAgICBjYW5jZWxNYWluUmVzb3VyY2VMb2FkKGZyYW1lTG9hZGVyKCkt PmNhbmNlbGxlZEVycm9yKG5ld1JlcXVlc3QpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQotICAgICAgICB0aW1pbmcoKS0+YWRkUmVkaXJlY3QocmVkaXJlY3RSZXNwb25zZS51cmwo KSwgbmV3UmVxdWVzdC51cmwoKSk7CisgICAgICAgIHRpbWluZygpLmFkZFJlZGlyZWN0KHJlZGly ZWN0UmVzcG9uc2UudXJsKCksIG5ld1JlcXVlc3QudXJsKCkpOwogICAgIH0KIAogICAgIC8vIFVw ZGF0ZSBjb29raWUgcG9saWN5IGJhc2UgVVJMIGFzIFVSTCBjaGFuZ2VzLCBleGNlcHQgZm9yIHN1 YmZyYW1lcywgd2hpY2ggdXNlIHRoZQpAQCAtNTcyLDcgKzU3Miw3IEBAIHZvaWQgRG9jdW1lbnRM b2FkZXI6OmNvbnRpbnVlQWZ0ZXJOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIGJvb2wKICAgICAgICAgc3RvcExvYWRpbmdGb3JQb2xpY3lDaGFuZ2UoKTsKICAgICBlbHNl IGlmIChtX3N1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSkgewogICAgICAgICAvLyBBIHJlZGlyZWN0 IHJlc3VsdGVkIGluIGxvYWRpbmcgc3Vic3RpdHV0ZSBkYXRhLgotICAgICAgICBBU1NFUlQodGlt aW5nKCktPnJlZGlyZWN0Q291bnQoKSk7CisgICAgICAgIEFTU0VSVCh0aW1pbmcoKS5yZWRpcmVj dENvdW50KCkpOwogCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gcmVtb3ZlIG91ciByZWZlcmVuY2Ug dG8gdGhlIENhY2hlZFJlc291cmNlIGluIGZhdm9yIG9mIGEgU3Vic3RpdHV0ZURhdGEgbG9hZC4K ICAgICAgICAgLy8gVGhpcyB3aWxsIHByb2JhYmx5IHRyaWdnZXIgdGhlIGNhbmNlbGxhdGlvbiBv ZiB0aGUgQ2FjaGVkUmVzb3VyY2UncyB1bmRlcmx5aW5nIFJlc291cmNlTG9hZGVyLCB0aG91Z2gg dGhlcmUgaXMgYQpAQCAtMTM5Myw3ICsxMzkzLDcgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6bWF5 YmVMb2FkRW1wdHkoKQogdm9pZCBEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291 cmNlKCkKIHsKICAgICBtX21haW5Eb2N1bWVudEVycm9yID0gUmVzb3VyY2VFcnJvcigpOwotICAg IHRpbWluZygpLT5tYXJrTmF2aWdhdGlvblN0YXJ0KCk7CisgICAgdGltaW5nKCkubWFya05hdmln YXRpb25TdGFydCgpOwogICAgIEFTU0VSVCghbV9tYWluUmVzb3VyY2UpOwogICAgIEFTU0VSVCgh bV9sb2FkaW5nTWFpblJlc291cmNlKTsKICAgICBtX2xvYWRpbmdNYWluUmVzb3VyY2UgPSB0cnVl OwpAQCAtMTQwNyw5ICsxNDA3LDkgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5n TWFpblJlc291cmNlKCkKICAgICAvLyBiZWNhdXNlIHdlIHBhc3MgYSB3cm9uZyBsb2FkVHlwZSAo c2VlIEZJWE1FIGluIGFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KCkpLgogICAg IGZyYW1lTG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KG1fcmVx dWVzdCk7CiAKLSAgICBBU1NFUlQodGltaW5nKCktPm5hdmlnYXRpb25TdGFydCgpKTsKLSAgICBB U1NFUlQoIXRpbWluZygpLT5mZXRjaFN0YXJ0KCkpOwotICAgIHRpbWluZygpLT5tYXJrRmV0Y2hT dGFydCgpOworICAgIEFTU0VSVCh0aW1pbmcoKS5uYXZpZ2F0aW9uU3RhcnQoKSk7CisgICAgQVNT RVJUKCF0aW1pbmcoKS5mZXRjaFN0YXJ0KCkpOworICAgIHRpbWluZygpLm1hcmtGZXRjaFN0YXJ0 KCk7CiAgICAgd2lsbFNlbmRSZXF1ZXN0KG1fcmVxdWVzdCwgUmVzb3VyY2VSZXNwb25zZSgpKTsK IAogICAgIC8vIHdpbGxTZW5kUmVxdWVzdCgpIG1heSBsZWFkIHRvIG91ciBGcmFtZSBiZWluZyBk ZXRhY2hlZCBvciBjYW5jZWxsaW5nIHRoZSBsb2FkIHZpYSBudWxsaW5nIHRoZSBSZXNvdXJjZVJl cXVlc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCmluZGV4IDg2NmZkN2Mu LjU2NTNlYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCkBAIC0yNTEs NyArMjUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHJlY29yZE1lbW9y eUNhY2hlTG9hZEZvckZ1dHVyZUNsaWVudE5vdGlmaWNhdGlvbihjb25zdCBSZXNvdXJjZVJlcXVl c3QmKTsKICAgICAgICAgdm9pZCB0YWtlTWVtb3J5Q2FjaGVMb2Fkc0ZvckNsaWVudE5vdGlmaWNh dGlvbihWZWN0b3I8UmVzb3VyY2VSZXF1ZXN0PiYgbG9hZHMpOwogCi0gICAgICAgIERvY3VtZW50 TG9hZFRpbWluZyogdGltaW5nKCkgeyByZXR1cm4gJm1fZG9jdW1lbnRMb2FkVGltaW5nOyB9Cisg ICAgICAgIERvY3VtZW50TG9hZFRpbWluZyYgdGltaW5nKCkgeyByZXR1cm4gbV9kb2N1bWVudExv YWRUaW1pbmc7IH0KICAgICAgICAgdm9pZCByZXNldFRpbWluZygpIHsgbV9kb2N1bWVudExvYWRU aW1pbmcgPSBEb2N1bWVudExvYWRUaW1pbmcoKTsgfQogCiAgICAgICAgIC8vIFRoZSBXZWJLaXQg bGF5ZXIgY2FsbHMgdGhpcyBmdW5jdGlvbiB3aGVuIGl0J3MgcmVhZHkgZm9yIHRoZSBkYXRhIHRv CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBiMWE3ZTA5Li43MTdjZGI3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTQ1MywxMiArNDUzLDEx IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nKFVubG9hZEV2ZW50UG9saWN5IHVubG9h ZEV2ZW50UG9saWN5KQogICAgICAgICAgICAgICAgICAgICAgICAgLy8gdGltZSBpbnRvIGZyZWVk IG1lbW9yeS4KICAgICAgICAgICAgICAgICAgICAgICAgIFJlZlB0cjxEb2N1bWVudExvYWRlcj4g ZG9jdW1lbnRMb2FkZXIgPSBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXI7CiAgICAgICAgICAg ICAgICAgICAgICAgICBtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCA9IFVubG9h ZERpc21pc3NhbDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkb2N1bWVudExvYWRlciAm JiAhZG9jdW1lbnRMb2FkZXItPnRpbWluZygpLT51bmxvYWRFdmVudFN0YXJ0KCkgJiYgIWRvY3Vt ZW50TG9hZGVyLT50aW1pbmcoKS0+dW5sb2FkRXZlbnRFbmQoKSkgewotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIERvY3VtZW50TG9hZFRpbWluZyogdGltaW5nID0gZG9jdW1lbnRMb2FkZXIt PnRpbWluZygpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCh0aW1pbmctPm5h dmlnYXRpb25TdGFydCgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1pbmctPm1h cmtVbmxvYWRFdmVudFN0YXJ0KCk7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZG9jdW1l bnRMb2FkZXIgJiYgIWRvY3VtZW50TG9hZGVyLT50aW1pbmcoKS51bmxvYWRFdmVudFN0YXJ0KCkg JiYgIWRvY3VtZW50TG9hZGVyLT50aW1pbmcoKS51bmxvYWRFdmVudEVuZCgpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGRvY3VtZW50TG9hZGVyLT50aW1pbmcoKS5uYXZp Z2F0aW9uU3RhcnQoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnRMb2Fk ZXItPnRpbWluZygpLm1hcmtVbmxvYWRFdmVudFN0YXJ0KCk7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hFdmVudCh1 bmxvYWRFdmVudCwgbV9mcmFtZS5kb2N1bWVudCgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0aW1pbmctPm1hcmtVbmxvYWRFdmVudEVuZCgpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGRvY3VtZW50TG9hZGVyLT50aW1pbmcoKS5tYXJrVW5sb2FkRXZlbnRFbmQoKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fZnJhbWUuZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPmRpc3BhdGNoRXZlbnQodW5sb2FkRXZl bnQsIG1fZnJhbWUuZG9jdW1lbnQoKSk7CiAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTE3ODgs NyArMTc4Nyw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAg ICAgaWYgKHBkbCAmJiBtX2RvY3VtZW50TG9hZGVyKSB7CiAgICAgICAgIC8vIENoZWNrIGlmIHRo ZSBkZXN0aW5hdGlvbiBwYWdlIGlzIGFsbG93ZWQgdG8gYWNjZXNzIHRoZSBwcmV2aW91cyBwYWdl J3MgdGltaW5nIGluZm9ybWF0aW9uLgogICAgICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNl Y3VyaXR5T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShwZGwtPnJlcXVlc3QoKS51cmwo KSk7Ci0gICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPnRpbWluZygpLT5zZXRIYXNTYW1lT3JpZ2lu QXNQcmV2aW91c0RvY3VtZW50KHNlY3VyaXR5T3JpZ2luLT5jYW5SZXF1ZXN0KG1fcHJldmlvdXNV UkwpKTsKKyAgICAgICAgbV9kb2N1bWVudExvYWRlci0+dGltaW5nKCkuc2V0SGFzU2FtZU9yaWdp bkFzUHJldmlvdXNEb2N1bWVudChzZWN1cml0eU9yaWdpbi0+Y2FuUmVxdWVzdChtX3ByZXZpb3Vz VVJMKSk7CiAgICAgfQogCiAgICAgLy8gQ2FsbCBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmlu aXNoZWQoKSBoZXJlIHNvIHRoYXQgdGhlIGZyYW1lIGxvYWQgZGVsZWdhdGUgaXMgbm90aWZpZWQg dGhhdCB0aGUgcmVkaXJlY3QncwpAQCAtMzA4Niw5ICszMDg1LDkgQEAgdm9pZCBGcmFtZUxvYWRl cjo6bG9hZFByb3Zpc2lvbmFsSXRlbUZyb21DYWNoZWRQYWdlKCkKICAgICBtX2xvYWRpbmdGcm9t Q2FjaGVkUGFnZSA9IHRydWU7CiAKICAgICAvLyBTaG91bGQgaGF2ZSB0aW1pbmcgZGF0YSBmcm9t IHByZXZpb3VzIHRpbWUocykgdGhlIHBhZ2Ugd2FzIHNob3duLgotICAgIEFTU0VSVChwcm92aXNp b25hbExvYWRlci0+dGltaW5nKCktPm5hdmlnYXRpb25TdGFydCgpKTsKKyAgICBBU1NFUlQocHJv dmlzaW9uYWxMb2FkZXItPnRpbWluZygpLm5hdmlnYXRpb25TdGFydCgpKTsKICAgICBwcm92aXNp b25hbExvYWRlci0+cmVzZXRUaW1pbmcoKTsKLSAgICBwcm92aXNpb25hbExvYWRlci0+dGltaW5n KCktPm1hcmtOYXZpZ2F0aW9uU3RhcnQoKTsKKyAgICBwcm92aXNpb25hbExvYWRlci0+dGltaW5n KCkubWFya05hdmlnYXRpb25TdGFydCgpOwogCiAgICAgcHJvdmlzaW9uYWxMb2FkZXItPnNldENv bW1pdHRlZCh0cnVlKTsKICAgICBjb21taXRQcm92aXNpb25hbExvYWQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RE9NV2luZG93LmNwcAppbmRleCA3NTMzYjAwLi4yYTYyYTg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuY3BwCkBAIC0xNzg0LDE0ICsxNzg0LDEzIEBAIGJvb2wgRE9NV2luZG93OjpyZW1vdmVF dmVudExpc3RlbmVyKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3RlbmVy CiB2b2lkIERPTVdpbmRvdzo6ZGlzcGF0Y2hMb2FkRXZlbnQoKQogewogICAgIFJlZlB0cjxFdmVu dD4gbG9hZEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmxvYWRFdmVudCwgZmFsc2Us IGZhbHNlKSk7Ci0gICAgaWYgKG1fZnJhbWUgJiYgbV9mcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRM b2FkZXIoKSAmJiAhbV9mcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dGltaW5nKCkt PmxvYWRFdmVudFN0YXJ0KCkpIHsKKyAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5sb2FkZXIo KS5kb2N1bWVudExvYWRlcigpICYmICFtX2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigp LT50aW1pbmcoKS5sb2FkRXZlbnRTdGFydCgpKSB7CiAgICAgICAgIC8vIFRoZSBEb2N1bWVudExv YWRlciAoYW5kIHRodXMgaXRzIERvY3VtZW50TG9hZFRpbWluZykgbWlnaHQgZ2V0IGRlc3Ryb3ll ZCB3aGlsZSBkaXNwYXRjaGluZwogICAgICAgICAvLyB0aGUgZXZlbnQsIHNvIHByb3RlY3QgaXQg dG8gcHJldmVudCB3cml0aW5nIHRoZSBlbmQgdGltZSBpbnRvIGZyZWVkIG1lbW9yeS4KLSAgICAg ICAgUmVmUHRyPERvY3VtZW50TG9hZGVyPiBkb2N1bWVudExvYWRlciA9IG1fZnJhbWUtPmxvYWRl cigpLmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgICAgIERvY3VtZW50TG9hZFRpbWluZyogdGltaW5n ID0gZG9jdW1lbnRMb2FkZXItPnRpbWluZygpOwotICAgICAgICB0aW1pbmctPm1hcmtMb2FkRXZl bnRTdGFydCgpOworICAgICAgICBSZWY8RG9jdW1lbnRMb2FkZXI+IGRvY3VtZW50TG9hZGVyKCpt X2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpKTsKKyAgICAgICAgZG9jdW1lbnRMb2Fk ZXIuZ2V0KCkudGltaW5nKCkubWFya0xvYWRFdmVudFN0YXJ0KCk7CiAgICAgICAgIGRpc3BhdGNo RXZlbnQobG9hZEV2ZW50LCBkb2N1bWVudCgpKTsKLSAgICAgICAgdGltaW5nLT5tYXJrTG9hZEV2 ZW50RW5kKCk7CisgICAgICAgIGRvY3VtZW50TG9hZGVyLmdldCgpLnRpbWluZygpLm1hcmtMb2Fk RXZlbnRFbmQoKTsKICAgICB9IGVsc2UKICAgICAgICAgZGlzcGF0Y2hFdmVudChsb2FkRXZlbnQs IGRvY3VtZW50KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1h bmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2UuY3BwCmluZGV4IGI0Mzcy ZjYuLjhlOTY5ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2UuY3BwCkBAIC0yMjgsNyAr MjI4LDcgQEAgdm9pZCBQZXJmb3JtYW5jZTo6d2Via2l0Q2xlYXJNZWFzdXJlcyhjb25zdCBTdHJp bmcmIG1lYXN1cmVOYW1lKQogCiBkb3VibGUgUGVyZm9ybWFuY2U6Om5vdygpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIDEwMDAuMCAqIG1fZnJhbWUtPmRvY3VtZW50KCktPmxvYWRlcigpLT50aW1pbmco KS0+bW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1lbnRUaW1lKG1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgpKTsKKyAgICByZXR1cm4gMTAwMC4wICogbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ bG9hZGVyKCktPnRpbWluZygpLm1vbm90b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZSht b25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VSZXNvdXJjZVRp bWluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlUmVzb3VyY2VUaW1pbmcu Y3BwCmluZGV4IGJiNmJjNmEuLmVlZWI5Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGVyZm9ybWFuY2VSZXNvdXJjZVRpbWluZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9QZXJmb3JtYW5jZVJlc291cmNlVGltaW5nLmNwcApAQCAtNDgsNyArNDgsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBzdGF0aWMgZG91YmxlIG1vbm90b25pY1RpbWVUb0RvY3VtZW50TWlsbGlz ZWNvbmRzKERvY3VtZW50KiBkb2N1bWVudCwgZG91YmxlIHNlY29uZHMpCiB7CiAgICAgQVNTRVJU KHNlY29uZHMgPj0gMC4wKTsKLSAgICByZXR1cm4gZG9jdW1lbnQtPmxvYWRlcigpLT50aW1pbmco KS0+bW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1lbnRUaW1lKHNlY29uZHMpICogMTAwMC4w OworICAgIHJldHVybiBkb2N1bWVudC0+bG9hZGVyKCktPnRpbWluZygpLm1vbm90b25pY1RpbWVU b1plcm9CYXNlZERvY3VtZW50VGltZShzZWNvbmRzKSAqIDEwMDAuMDsKIH0KIAogc3RhdGljIGJv b2wgcGFzc2VzVGltaW5nQWxsb3dDaGVjayhjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25z ZSwgRG9jdW1lbnQqIHJlcXVlc3RpbmdEb2N1bWVudCkK 245077 2015-01-21 12:32:34 -0800 2015-01-21 14:33:47 -0800 Patch bug-128272-2.diff text/plain 16429 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MTM2OWNmLi4zOTlhNTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTUtMDEtMjEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIERvY3VtZW50TG9hZGVyOjp0aW1pbmcoKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJlbmNlLgor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4MjcyPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIGlzIGFsd2F5cyBhIERvY3VtZW50 TG9hZFRpbWluZyBvYmplY3QsIHNvIHJldHVybiBpdCBieQorICAgICAgICByZWZlcmVuY2Ugc2lu Y2UgaXQgY2FuIG5ldmVyIGJlIG51bGwuCisKKyAgICAgICAgKiBNb2R1bGVzL2dhbWVwYWQvTmF2 aWdhdG9yR2FtZXBhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3JHYW1lcGFkOjpm cm9tKToKKyAgICAgICAgKiBkb20vU2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlcjo6c2VydmljZVNjcmlw dGVkQW5pbWF0aW9ucyk6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpidWlsZE9iamVjdEZvclRpbWluZyk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpmaW5pc2hlZExvYWRp bmcpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OndpbGxTZW5kUmVxdWVzdCk6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlck5hdmlnYXRp b25Qb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGlu Z01haW5SZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmg6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6dGltaW5nKToKKyAgICAgICAgKiBsb2FkZXIv RnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnN0b3BMb2Fk aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExv YWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRQcm92aXNpb25hbEl0ZW1G cm9tQ2FjaGVkUGFnZSk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RE9NV2luZG93OjpkaXNwYXRjaExvYWRFdmVudCk6CisgICAgICAgICogcGFnZS9Q ZXJmb3JtYW5jZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZTo6bm93KToKKyAg ICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlTmF2aWdhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpQZXJmb3JtYW5jZU5hdmlnYXRpb246OnJlZGlyZWN0Q291bnQpOgorICAgICAgICAqIHBhZ2Uv UGVyZm9ybWFuY2VSZXNvdXJjZVRpbWluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjptb25vdG9u aWNUaW1lVG9Eb2N1bWVudE1pbGxpc2Vjb25kcyk6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3Jt YW5jZVJlc291cmNlVGltaW5nOjpyZXNvdXJjZVRpbWVUb0RvY3VtZW50TWlsbGlzZWNvbmRzKToK KyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBlcmZvcm1hbmNlVGltaW5nOjpkb2N1bWVudExvYWRUaW1pbmcpOgorCiAyMDE1LTAxLTIxICBN YW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIGZpcnN0 LWxldHRlciBwc2V1ZG8tZWxlbWVudCBmcm9tIGFuY2VzdG9ycyBpcyBub3QgYmVpbmcgaWdub3Jl ZCBpbiBncmlkcyBhbmQgZmxleGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2dhbWVwYWQvTmF2aWdhdG9yR2FtZXBhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2dhbWVwYWQvTmF2aWdhdG9yR2FtZXBhZC5jcHAKaW5kZXggM2M1NmUxMS4uNWQ3YjUzOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9nYW1lcGFkL05hdmlnYXRvckdhbWVwYWQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZ2FtZXBhZC9OYXZpZ2F0b3JHYW1lcGFk LmNwcApAQCAtNjYsNyArNjYsNyBAQCBOYXZpZ2F0b3JHYW1lcGFkKiBOYXZpZ2F0b3JHYW1lcGFk Ojpmcm9tKE5hdmlnYXRvciogbmF2aWdhdG9yKQogCiAgICAgICAgIGlmIChGcmFtZSogZnJhbWUg PSBuYXZpZ2F0b3ItPmZyYW1lKCkpIHsKICAgICAgICAgICAgIGlmIChEb2N1bWVudExvYWRlciog ZG9jdW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSkKLSAgICAg ICAgICAgICAgICBzdXBwbGVtZW50LT5tX25hdmlnYXRpb25TdGFydCA9IGRvY3VtZW50TG9hZGVy LT50aW1pbmcoKS0+bmF2aWdhdGlvblN0YXJ0KCk7CisgICAgICAgICAgICAgICAgc3VwcGxlbWVu dC0+bV9uYXZpZ2F0aW9uU3RhcnQgPSBkb2N1bWVudExvYWRlci0+dGltaW5nKCkubmF2aWdhdGlv blN0YXJ0KCk7CiAgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIHN1cHBsZW1lbnQ7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCmlu ZGV4IGRmNGQ0NDYuLmY5MDY5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC0xMzIsOCArMTMyLDggQEAgdm9pZCBTY3Jp cHRlZEFuaW1hdGlvbkNvbnRyb2xsZXI6OnNlcnZpY2VTY3JpcHRlZEFuaW1hdGlvbnMoZG91Ymxl IG1vbm90b25pY1RpbWUKICAgICBpZiAoIW1fY2FsbGJhY2tzLnNpemUoKSB8fCBtX3N1c3BlbmRD b3VudCB8fCAobV9kb2N1bWVudC0+c2V0dGluZ3MoKSAmJiAhbV9kb2N1bWVudC0+c2V0dGluZ3Mo KS0+cmVxdWVzdEFuaW1hdGlvbkZyYW1lRW5hYmxlZCgpKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgZG91YmxlIGhpZ2hSZXNOb3dNcyA9IDEwMDAuMCAqIG1fZG9jdW1lbnQtPmxvYWRlcigpLT50 aW1pbmcoKS0+bW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1lbnRUaW1lKG1vbm90b25pY1Rp bWVOb3cpOwotICAgIGRvdWJsZSBsZWdhY3lIaWdoUmVzTm93TXMgPSAxMDAwLjAgKiBtX2RvY3Vt ZW50LT5sb2FkZXIoKS0+dGltaW5nKCktPm1vbm90b25pY1RpbWVUb1BzZXVkb1dhbGxUaW1lKG1v bm90b25pY1RpbWVOb3cpOworICAgIGRvdWJsZSBoaWdoUmVzTm93TXMgPSAxMDAwLjAgKiBtX2Rv Y3VtZW50LT5sb2FkZXIoKS0+dGltaW5nKCkubW9ub3RvbmljVGltZVRvWmVyb0Jhc2VkRG9jdW1l bnRUaW1lKG1vbm90b25pY1RpbWVOb3cpOworICAgIGRvdWJsZSBsZWdhY3lIaWdoUmVzTm93TXMg PSAxMDAwLjAgKiBtX2RvY3VtZW50LT5sb2FkZXIoKS0+dGltaW5nKCkubW9ub3RvbmljVGltZVRv UHNldWRvV2FsbFRpbWUobW9ub3RvbmljVGltZU5vdyk7CiAKICAgICAvLyBGaXJzdCwgZ2VuZXJh dGUgYSBsaXN0IG9mIGNhbGxiYWNrcyB0byBjb25zaWRlci4gIENhbGxiYWNrcyByZWdpc3RlcmVk IGZyb20gdGhpcyBwb2ludAogICAgIC8vIG9uIGFyZSBjb25zaWRlcmVkIG9ubHkgZm9yIHRoZSAi bmV4dCIgZnJhbWUsIG5vdCB0aGlzIG9uZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCmluZGV4IDFmZTdiODEuLjViNmRmMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNTgxMSw3ICs1ODExLDcgQEAgUmVmUHRyPFZpZGVvUGxh eWJhY2tRdWFsaXR5PiBIVE1MTWVkaWFFbGVtZW50OjpnZXRWaWRlb1BsYXliYWNrUXVhbGl0eSgp CiAgICAgZG91YmxlIG5vdyA9IHBlcmZvcm1hbmNlID8gcGVyZm9ybWFuY2UtPm5vdygpIDogMDsK ICNlbHNlCiAgICAgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciA9IGRvY3VtZW50KCkubG9hZGVyKCk7 Ci0gICAgZG91YmxlIG5vdyA9IGxvYWRlciA/IDEwMDAuMCAqIGxvYWRlci0+dGltaW5nKCktPm1v bm90b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZShtb25vdG9uaWNhbGx5SW5jcmVhc2lu Z1RpbWUoKSkgOiAwOworICAgIGRvdWJsZSBub3cgPSBsb2FkZXIgPyAxMDAwLjAgKiBsb2FkZXIt PnRpbWluZygpLm1vbm90b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZShtb25vdG9uaWNh bGx5SW5jcmVhc2luZ1RpbWUoKSkgOiAwOwogI2VuZGlmCiAKICAgICBpZiAoIW1fcGxheWVyKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCmluZGV4IDVlMTY2YmMuLmIzOWRjNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTIwMCw3ICsyMDAsNyBAQCBz dGF0aWMgUmVmPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JIZWFkZXJzKGNvbnN0IEhU VFBIZWFkZXJNYXAmIGhlYWRlcnMpCiBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6Ok5l dHdvcms6OlJlc291cmNlVGltaW5nPiBidWlsZE9iamVjdEZvclRpbWluZyhjb25zdCBSZXNvdXJj ZUxvYWRUaW1pbmcmIHRpbWluZywgRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKICAgICByZXR1 cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc6OmNyZWF0ZSgp Ci0gICAgICAgIC5zZXROYXZpZ2F0aW9uU3RhcnQobG9hZGVyLT50aW1pbmcoKS0+bmF2aWdhdGlv blN0YXJ0KCkpCisgICAgICAgIC5zZXROYXZpZ2F0aW9uU3RhcnQobG9hZGVyLT50aW1pbmcoKS5u YXZpZ2F0aW9uU3RhcnQoKSkKICAgICAgICAgLnNldERvbWFpbkxvb2t1cFN0YXJ0KHRpbWluZy5k b21haW5Mb29rdXBTdGFydCkKICAgICAgICAgLnNldERvbWFpbkxvb2t1cEVuZCh0aW1pbmcuZG9t YWluTG9va3VwRW5kKQogICAgICAgICAuc2V0Q29ubmVjdFN0YXJ0KHRpbWluZy5jb25uZWN0U3Rh cnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCAxYmJjMzZi Li5jYWE1MTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAg LTQyMyw3ICs0MjMsNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpmaW5pc2hlZExvYWRpbmcoZG91 YmxlIGZpbmlzaFRpbWUpCiAgICAgICAgIHJlc3BvbnNlRW5kVGltZSA9IG1fdGltZU9mTGFzdERh dGFSZWNlaXZlZDsKICAgICBpZiAoIXJlc3BvbnNlRW5kVGltZSkKICAgICAgICAgcmVzcG9uc2VF bmRUaW1lID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7Ci0gICAgdGltaW5nKCktPnNl dFJlc3BvbnNlRW5kKHJlc3BvbnNlRW5kVGltZSk7CisgICAgdGltaW5nKCkuc2V0UmVzcG9uc2VF bmQocmVzcG9uc2VFbmRUaW1lKTsKIAogICAgIGNvbW1pdElmUmVhZHkoKTsKICAgICBpZiAoIWZy YW1lTG9hZGVyKCkpCkBAIC01MTIsNyArNTEyLDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6d2ls bFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCwgY29uc3QgUmVzb3VyY2UK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIEFTU0VSVCh0aW1pbmcoKS0+ZmV0Y2hTdGFy dCgpKTsKKyAgICBBU1NFUlQodGltaW5nKCkuZmV0Y2hTdGFydCgpKTsKICAgICBpZiAoIXJlZGly ZWN0UmVzcG9uc2UuaXNOdWxsKCkpIHsKICAgICAgICAgLy8gSWYgdGhlIHJlZGlyZWN0aW5nIHVy bCBpcyBub3QgYWxsb3dlZCB0byBkaXNwbGF5IGNvbnRlbnQgZnJvbSB0aGUgdGFyZ2V0IG9yaWdp biwKICAgICAgICAgLy8gdGhlbiBibG9jayB0aGUgcmVkaXJlY3QuCkBAIC01MjIsNyArNTIyLDcg QEAgdm9pZCBEb2N1bWVudExvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYg bmV3UmVxdWVzdCwgY29uc3QgUmVzb3VyY2UKICAgICAgICAgICAgIGNhbmNlbE1haW5SZXNvdXJj ZUxvYWQoZnJhbWVMb2FkZXIoKS0+Y2FuY2VsbGVkRXJyb3IobmV3UmVxdWVzdCkpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHRpbWluZygpLT5hZGRSZWRpcmVjdChy ZWRpcmVjdFJlc3BvbnNlLnVybCgpLCBuZXdSZXF1ZXN0LnVybCgpKTsKKyAgICAgICAgdGltaW5n KCkuYWRkUmVkaXJlY3QocmVkaXJlY3RSZXNwb25zZS51cmwoKSwgbmV3UmVxdWVzdC51cmwoKSk7 CiAgICAgfQogCiAgICAgLy8gVXBkYXRlIGNvb2tpZSBwb2xpY3kgYmFzZSBVUkwgYXMgVVJMIGNo YW5nZXMsIGV4Y2VwdCBmb3Igc3ViZnJhbWVzLCB3aGljaCB1c2UgdGhlCkBAIC01NzMsNyArNTcz LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlck5hdmlnYXRpb25Qb2xpY3ko Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgYm9vbAogICAgICAgICBzdG9wTG9hZGluZ0ZvclBvbGlj eUNoYW5nZSgpOwogICAgIGVsc2UgaWYgKG1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpKSB7CiAg ICAgICAgIC8vIEEgcmVkaXJlY3QgcmVzdWx0ZWQgaW4gbG9hZGluZyBzdWJzdGl0dXRlIGRhdGEu Ci0gICAgICAgIEFTU0VSVCh0aW1pbmcoKS0+cmVkaXJlY3RDb3VudCgpKTsKKyAgICAgICAgQVNT RVJUKHRpbWluZygpLnJlZGlyZWN0Q291bnQoKSk7CiAKICAgICAgICAgLy8gV2UgbmVlZCB0byBy ZW1vdmUgb3VyIHJlZmVyZW5jZSB0byB0aGUgQ2FjaGVkUmVzb3VyY2UgaW4gZmF2b3Igb2YgYSBT dWJzdGl0dXRlRGF0YSBsb2FkLgogICAgICAgICAvLyBUaGlzIHdpbGwgcHJvYmFibHkgdHJpZ2dl ciB0aGUgY2FuY2VsbGF0aW9uIG9mIHRoZSBDYWNoZWRSZXNvdXJjZSdzIHVuZGVybHlpbmcgUmVz b3VyY2VMb2FkZXIsIHRob3VnaCB0aGVyZSBpcyBhCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCBib29s IERvY3VtZW50TG9hZGVyOjptYXliZUxvYWRFbXB0eSgpCiB2b2lkIERvY3VtZW50TG9hZGVyOjpz dGFydExvYWRpbmdNYWluUmVzb3VyY2UoKQogewogICAgIG1fbWFpbkRvY3VtZW50RXJyb3IgPSBS ZXNvdXJjZUVycm9yKCk7Ci0gICAgdGltaW5nKCktPm1hcmtOYXZpZ2F0aW9uU3RhcnQoKTsKKyAg ICB0aW1pbmcoKS5tYXJrTmF2aWdhdGlvblN0YXJ0KCk7CiAgICAgQVNTRVJUKCFtX21haW5SZXNv dXJjZSk7CiAgICAgQVNTRVJUKCFtX2xvYWRpbmdNYWluUmVzb3VyY2UpOwogICAgIG1fbG9hZGlu Z01haW5SZXNvdXJjZSA9IHRydWU7CkBAIC0xNDExLDkgKzE0MTEsOSBAQCB2b2lkIERvY3VtZW50 TG9hZGVyOjpzdGFydExvYWRpbmdNYWluUmVzb3VyY2UoKQogICAgIC8vIGJlY2F1c2Ugd2UgcGFz cyBhIHdyb25nIGxvYWRUeXBlIChzZWUgRklYTUUgaW4gYWRkRXh0cmFGaWVsZHNUb01haW5SZXNv dXJjZVJlcXVlc3QoKSkuCiAgICAgZnJhbWVMb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb01haW5S ZXNvdXJjZVJlcXVlc3QobV9yZXF1ZXN0KTsKIAotICAgIEFTU0VSVCh0aW1pbmcoKS0+bmF2aWdh dGlvblN0YXJ0KCkpOwotICAgIEFTU0VSVCghdGltaW5nKCktPmZldGNoU3RhcnQoKSk7Ci0gICAg dGltaW5nKCktPm1hcmtGZXRjaFN0YXJ0KCk7CisgICAgQVNTRVJUKHRpbWluZygpLm5hdmlnYXRp b25TdGFydCgpKTsKKyAgICBBU1NFUlQoIXRpbWluZygpLmZldGNoU3RhcnQoKSk7CisgICAgdGlt aW5nKCkubWFya0ZldGNoU3RhcnQoKTsKICAgICB3aWxsU2VuZFJlcXVlc3QobV9yZXF1ZXN0LCBS ZXNvdXJjZVJlc3BvbnNlKCkpOwogCiAgICAgLy8gd2lsbFNlbmRSZXF1ZXN0KCkgbWF5IGxlYWQg dG8gb3VyIEZyYW1lIGJlaW5nIGRldGFjaGVkIG9yIGNhbmNlbGxpbmcgdGhlIGxvYWQgdmlhIG51 bGxpbmcgdGhlIFJlc291cmNlUmVxdWVzdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmgKaW5kZXggMTg4ZTliYS4uNTRkNGJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmgKQEAgLTI0OCw3ICsyNDgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHZvaWQgcmVjb3JkTWVtb3J5Q2FjaGVMb2FkRm9yRnV0dXJlQ2xpZW50Tm90aWZpY2F0aW9u KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwogICAgICAgICB2b2lkIHRha2VNZW1vcnlDYWNoZUxv YWRzRm9yQ2xpZW50Tm90aWZpY2F0aW9uKFZlY3RvcjxSZXNvdXJjZVJlcXVlc3Q+JiBsb2Fkcyk7 CiAKLSAgICAgICAgRG9jdW1lbnRMb2FkVGltaW5nKiB0aW1pbmcoKSB7IHJldHVybiAmbV9kb2N1 bWVudExvYWRUaW1pbmc7IH0KKyAgICAgICAgRG9jdW1lbnRMb2FkVGltaW5nJiB0aW1pbmcoKSB7 IHJldHVybiBtX2RvY3VtZW50TG9hZFRpbWluZzsgfQogICAgICAgICB2b2lkIHJlc2V0VGltaW5n KCkgeyBtX2RvY3VtZW50TG9hZFRpbWluZyA9IERvY3VtZW50TG9hZFRpbWluZygpOyB9CiAKICAg ICAgICAgLy8gVGhlIFdlYktpdCBsYXllciBjYWxscyB0aGlzIGZ1bmN0aW9uIHdoZW4gaXQncyBy ZWFkeSBmb3IgdGhlIGRhdGEgdG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmlu ZGV4IGIzY2UyMGUuLjBiMTc4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cApAQCAtNDUyLDEyICs0NTIsMTIgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcoVW5s b2FkRXZlbnRQb2xpY3kgdW5sb2FkRXZlbnRQb2xpY3kpCiAgICAgICAgICAgICAgICAgICAgICAg ICAvLyB0aW1lIGludG8gZnJlZWQgbWVtb3J5LgogICAgICAgICAgICAgICAgICAgICAgICAgUmVm UHRyPERvY3VtZW50TG9hZGVyPiBkb2N1bWVudExvYWRlciA9IG1fcHJvdmlzaW9uYWxEb2N1bWVu dExvYWRlcjsKICAgICAgICAgICAgICAgICAgICAgICAgIG1fcGFnZURpc21pc3NhbEV2ZW50QmVp bmdEaXNwYXRjaGVkID0gVW5sb2FkRGlzbWlzc2FsOwotICAgICAgICAgICAgICAgICAgICAgICAg aWYgKGRvY3VtZW50TG9hZGVyICYmICFkb2N1bWVudExvYWRlci0+dGltaW5nKCktPnVubG9hZEV2 ZW50U3RhcnQoKSAmJiAhZG9jdW1lbnRMb2FkZXItPnRpbWluZygpLT51bmxvYWRFdmVudEVuZCgp KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgRG9jdW1lbnRMb2FkVGltaW5nKiB0aW1p bmcgPSBkb2N1bWVudExvYWRlci0+dGltaW5nKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgQVNTRVJUKHRpbWluZy0+bmF2aWdhdGlvblN0YXJ0KCkpOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWluZy0+bWFya1VubG9hZEV2ZW50U3RhcnQoKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChkb2N1bWVudExvYWRlciAmJiAhZG9jdW1lbnRMb2FkZXItPnRpbWluZygp LnVubG9hZEV2ZW50U3RhcnQoKSAmJiAhZG9jdW1lbnRMb2FkZXItPnRpbWluZygpLnVubG9hZEV2 ZW50RW5kKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb2N1bWVudExvYWRUaW1p bmcmIHRpbWluZyA9IGRvY3VtZW50TG9hZGVyLT50aW1pbmcoKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBBU1NFUlQodGltaW5nLm5hdmlnYXRpb25TdGFydCgpKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0aW1pbmcubWFya1VubG9hZEV2ZW50U3RhcnQoKTsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPmRvbVdpbmRvdygpLT5kaXNw YXRjaEV2ZW50KHVubG9hZEV2ZW50LCBtX2ZyYW1lLmRvY3VtZW50KCkpOwotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRpbWluZy0+bWFya1VubG9hZEV2ZW50RW5kKCk7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGltaW5nLm1hcmtVbmxvYWRFdmVudEVuZCgpOwogICAgICAgICAg ICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mcmFt ZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hFdmVudCh1bmxvYWRFdmVudCwgbV9m cmFtZS5kb2N1bWVudCgpKTsKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMTc4Niw3ICsxNzg2 LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKCkKICAgICBpZiAo cGRsICYmIG1fZG9jdW1lbnRMb2FkZXIpIHsKICAgICAgICAgLy8gQ2hlY2sgaWYgdGhlIGRlc3Rp bmF0aW9uIHBhZ2UgaXMgYWxsb3dlZCB0byBhY2Nlc3MgdGhlIHByZXZpb3VzIHBhZ2UncyB0aW1p bmcgaW5mb3JtYXRpb24uCiAgICAgICAgIFJlZjxTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmln aW4oU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShwZGwtPnJlcXVlc3QoKS51cmwoKSkpOwotICAgICAg ICBtX2RvY3VtZW50TG9hZGVyLT50aW1pbmcoKS0+c2V0SGFzU2FtZU9yaWdpbkFzUHJldmlvdXNE b2N1bWVudChzZWN1cml0eU9yaWdpbi5nZXQoKS5jYW5SZXF1ZXN0KG1fcHJldmlvdXNVUkwpKTsK KyAgICAgICAgbV9kb2N1bWVudExvYWRlci0+dGltaW5nKCkuc2V0SGFzU2FtZU9yaWdpbkFzUHJl dmlvdXNEb2N1bWVudChzZWN1cml0eU9yaWdpbi5nZXQoKS5jYW5SZXF1ZXN0KG1fcHJldmlvdXNV UkwpKTsKICAgICB9CiAKICAgICAvLyBDYWxsIGNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5p c2hlZCgpIGhlcmUgc28gdGhhdCB0aGUgZnJhbWUgbG9hZCBkZWxlZ2F0ZSBpcyBub3RpZmllZCB0 aGF0IHRoZSByZWRpcmVjdCdzCkBAIC0zMDkxLDkgKzMwOTEsOSBAQCB2b2lkIEZyYW1lTG9hZGVy Ojpsb2FkUHJvdmlzaW9uYWxJdGVtRnJvbUNhY2hlZFBhZ2UoKQogICAgIG1fbG9hZGluZ0Zyb21D YWNoZWRQYWdlID0gdHJ1ZTsKIAogICAgIC8vIFNob3VsZCBoYXZlIHRpbWluZyBkYXRhIGZyb20g cHJldmlvdXMgdGltZShzKSB0aGUgcGFnZSB3YXMgc2hvd24uCi0gICAgQVNTRVJUKHByb3Zpc2lv bmFsTG9hZGVyLT50aW1pbmcoKS0+bmF2aWdhdGlvblN0YXJ0KCkpOworICAgIEFTU0VSVChwcm92 aXNpb25hbExvYWRlci0+dGltaW5nKCkubmF2aWdhdGlvblN0YXJ0KCkpOwogICAgIHByb3Zpc2lv bmFsTG9hZGVyLT5yZXNldFRpbWluZygpOwotICAgIHByb3Zpc2lvbmFsTG9hZGVyLT50aW1pbmco KS0+bWFya05hdmlnYXRpb25TdGFydCgpOworICAgIHByb3Zpc2lvbmFsTG9hZGVyLT50aW1pbmco KS5tYXJrTmF2aWdhdGlvblN0YXJ0KCk7CiAKICAgICBwcm92aXNpb25hbExvYWRlci0+c2V0Q29t bWl0dGVkKHRydWUpOwogICAgIGNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9E T01XaW5kb3cuY3BwCmluZGV4IDc5NzA4ODAuLmNiMzk0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdp bmRvdy5jcHAKQEAgLTE4NDYsMTQgKzE4NDYsMTQgQEAgYm9vbCBET01XaW5kb3c6OnJlbW92ZUV2 ZW50TGlzdGVuZXIoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIEV2ZW50TGlzdGVuZXIK IHZvaWQgRE9NV2luZG93OjpkaXNwYXRjaExvYWRFdmVudCgpCiB7CiAgICAgUmVmUHRyPEV2ZW50 PiBsb2FkRXZlbnQoRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkubG9hZEV2ZW50LCBmYWxzZSwg ZmFsc2UpKTsKLSAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExv YWRlcigpICYmICFtX2ZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT50aW1pbmcoKS0+ bG9hZEV2ZW50U3RhcnQoKSkgeworICAgIGlmIChtX2ZyYW1lICYmIG1fZnJhbWUtPmxvYWRlcigp LmRvY3VtZW50TG9hZGVyKCkgJiYgIW1fZnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkt PnRpbWluZygpLmxvYWRFdmVudFN0YXJ0KCkpIHsKICAgICAgICAgLy8gVGhlIERvY3VtZW50TG9h ZGVyIChhbmQgdGh1cyBpdHMgRG9jdW1lbnRMb2FkVGltaW5nKSBtaWdodCBnZXQgZGVzdHJveWVk IHdoaWxlIGRpc3BhdGNoaW5nCiAgICAgICAgIC8vIHRoZSBldmVudCwgc28gcHJvdGVjdCBpdCB0 byBwcmV2ZW50IHdyaXRpbmcgdGhlIGVuZCB0aW1lIGludG8gZnJlZWQgbWVtb3J5LgogICAgICAg ICBSZWZQdHI8RG9jdW1lbnRMb2FkZXI+IGRvY3VtZW50TG9hZGVyID0gbV9mcmFtZS0+bG9hZGVy KCkuZG9jdW1lbnRMb2FkZXIoKTsKLSAgICAgICAgRG9jdW1lbnRMb2FkVGltaW5nKiB0aW1pbmcg PSBkb2N1bWVudExvYWRlci0+dGltaW5nKCk7Ci0gICAgICAgIHRpbWluZy0+bWFya0xvYWRFdmVu dFN0YXJ0KCk7CisgICAgICAgIERvY3VtZW50TG9hZFRpbWluZyYgdGltaW5nID0gZG9jdW1lbnRM b2FkZXItPnRpbWluZygpOworICAgICAgICB0aW1pbmcubWFya0xvYWRFdmVudFN0YXJ0KCk7CiAg ICAgICAgIGRpc3BhdGNoRXZlbnQobG9hZEV2ZW50LCBkb2N1bWVudCgpKTsKLSAgICAgICAgdGlt aW5nLT5tYXJrTG9hZEV2ZW50RW5kKCk7CisgICAgICAgIHRpbWluZy5tYXJrTG9hZEV2ZW50RW5k KCk7CiAgICAgfSBlbHNlCiAgICAgICAgIGRpc3BhdGNoRXZlbnQobG9hZEV2ZW50LCBkb2N1bWVu dCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlLmNwcAppbmRleCBiNDM3MmY2Li44ZTk2 OWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlLmNwcApAQCAtMjI4LDcgKzIyOCw3IEBA IHZvaWQgUGVyZm9ybWFuY2U6OndlYmtpdENsZWFyTWVhc3VyZXMoY29uc3QgU3RyaW5nJiBtZWFz dXJlTmFtZSkKIAogZG91YmxlIFBlcmZvcm1hbmNlOjpub3coKSBjb25zdAogewotICAgIHJldHVy biAxMDAwLjAgKiBtX2ZyYW1lLT5kb2N1bWVudCgpLT5sb2FkZXIoKS0+dGltaW5nKCktPm1vbm90 b25pY1RpbWVUb1plcm9CYXNlZERvY3VtZW50VGltZShtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1Rp bWUoKSk7CisgICAgcmV0dXJuIDEwMDAuMCAqIG1fZnJhbWUtPmRvY3VtZW50KCktPmxvYWRlcigp LT50aW1pbmcoKS5tb25vdG9uaWNUaW1lVG9aZXJvQmFzZWREb2N1bWVudFRpbWUobW9ub3Rvbmlj YWxseUluY3JlYXNpbmdUaW1lKCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTmF2aWdhdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTmF2aWdhdGlvbi5jcHAKaW5kZXggMmNiM2Fl Zi4uOTVkNGMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU5h dmlnYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VOYXZpZ2F0 aW9uLmNwcApAQCAtNzMsMTEgKzczLDExIEBAIHVuc2lnbmVkIHNob3J0IFBlcmZvcm1hbmNlTmF2 aWdhdGlvbjo6cmVkaXJlY3RDb3VudCgpIGNvbnN0CiAgICAgaWYgKCFsb2FkZXIpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgRG9jdW1lbnRMb2FkVGltaW5nKiB0aW1pbmcgPSBsb2FkZXItPnRp bWluZygpOwotICAgIGlmICh0aW1pbmctPmhhc0Nyb3NzT3JpZ2luUmVkaXJlY3QoKSkKKyAgICBE b2N1bWVudExvYWRUaW1pbmcmIHRpbWluZyA9IGxvYWRlci0+dGltaW5nKCk7CisgICAgaWYgKHRp bWluZy5oYXNDcm9zc09yaWdpblJlZGlyZWN0KCkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAg cmV0dXJuIHRpbWluZy0+cmVkaXJlY3RDb3VudCgpOworICAgIHJldHVybiB0aW1pbmcucmVkaXJl Y3RDb3VudCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlUmVzb3VyY2VUaW1pbmcuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QZXJmb3JtYW5jZVJlc291cmNlVGltaW5nLmNwcAppbmRleCBmYjA3YmU0Li45 Yzk3Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlUmVzb3Vy Y2VUaW1pbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VSZXNvdXJj ZVRpbWluZy5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RhdGlj IGRvdWJsZSBtb25vdG9uaWNUaW1lVG9Eb2N1bWVudE1pbGxpc2Vjb25kcyhEb2N1bWVudCogZG9j dW1lbnQsIGRvdWJsZSBzZWNvbmRzKQogewogICAgIEFTU0VSVChzZWNvbmRzID49IDAuMCk7Ci0g ICAgcmV0dXJuIGRvY3VtZW50LT5sb2FkZXIoKS0+dGltaW5nKCktPm1vbm90b25pY1RpbWVUb1pl cm9CYXNlZERvY3VtZW50VGltZShzZWNvbmRzKSAqIDEwMDAuMDsKKyAgICByZXR1cm4gZG9jdW1l bnQtPmxvYWRlcigpLT50aW1pbmcoKS5tb25vdG9uaWNUaW1lVG9aZXJvQmFzZWREb2N1bWVudFRp bWUoc2Vjb25kcykgKiAxMDAwLjA7CiB9CiAKIHN0YXRpYyBib29sIHBhc3Nlc1RpbWluZ0FsbG93 Q2hlY2soY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIERvY3VtZW50KiByZXF1ZXN0 aW5nRG9jdW1lbnQpCkBAIC0xOTQsNyArMTk0LDcgQEAgZG91YmxlIFBlcmZvcm1hbmNlUmVzb3Vy Y2VUaW1pbmc6OnJlc291cmNlVGltZVRvRG9jdW1lbnRNaWxsaXNlY29uZHMoaW50IGRlbHRhTWkK IHsKICAgICBpZiAoIWRlbHRhTWlsbGlzZWNvbmRzKQogICAgICAgICByZXR1cm4gMC4wOwotICAg IHJldHVybiBtb25vdG9uaWNUaW1lVG9Eb2N1bWVudE1pbGxpc2Vjb25kcyhtX3JlcXVlc3RpbmdE b2N1bWVudC5nZXQoKSwgbV9yZXF1ZXN0aW5nRG9jdW1lbnQuZ2V0KCktPmxvYWRlcigpLT50aW1p bmcoKS0+bmF2aWdhdGlvblN0YXJ0KCkpICsgZGVsdGFNaWxsaXNlY29uZHM7CisgICAgcmV0dXJu IG1vbm90b25pY1RpbWVUb0RvY3VtZW50TWlsbGlzZWNvbmRzKG1fcmVxdWVzdGluZ0RvY3VtZW50 LmdldCgpLCBtX3JlcXVlc3RpbmdEb2N1bWVudC0+bG9hZGVyKCktPnRpbWluZygpLm5hdmlnYXRp b25TdGFydCgpKSArIGRlbHRhTWlsbGlzZWNvbmRzOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCmluZGV4IGY0MDkx NmQuLjkxOTliZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VU aW1pbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3Bw CkBAIC0zMjgsNyArMzI4LDcgQEAgRG9jdW1lbnRMb2FkVGltaW5nKiBQZXJmb3JtYW5jZVRpbWlu Zzo6ZG9jdW1lbnRMb2FkVGltaW5nKCkgY29uc3QKICAgICBpZiAoIWxvYWRlcikKICAgICAgICAg cmV0dXJuIDA7CiAKLSAgICByZXR1cm4gbG9hZGVyLT50aW1pbmcoKTsKKyAgICByZXR1cm4gJmxv YWRlci0+dGltaW5nKCk7CiB9CiAKIHVuc2lnbmVkIGxvbmcgbG9uZyBQZXJmb3JtYW5jZVRpbWlu Zzo6cmVzb3VyY2VMb2FkVGltZVJlbGF0aXZlVG9BYnNvbHV0ZShpbnQgcmVsYXRpdmVNaWxsaXNl Y29uZHMpIGNvbnN0Cg==