128623 2014-02-11 13:48:40 -0800 CTTE: RenderNamedFlowThread always has a WebKitNamedFlow. 2014-02-11 16:03:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn kangil.han kondapallykalyan WebkitBugTracker oldest_to_newest 979587 0 kling 2014-02-11 13:48:40 -0800 CTTE: RenderNamedFlowThread always has a WebKitNamedFlow. 979588 1 223895 kling 2014-02-11 13:48:59 -0800 Created attachment 223895 Patch 979645 2 223895 commit-queue 2014-02-11 16:03:17 -0800 Comment on attachment 223895 Patch Clearing flags on attachment: 223895 Committed r163917: <http://trac.webkit.org/changeset/163917> 979646 3 commit-queue 2014-02-11 16:03:28 -0800 All reviewed patches have been landed. Closing bug. 223895 2014-02-11 13:48:59 -0800 2014-02-11 16:03:15 -0800 Patch bug-128623.diff text/plain 10800 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxOTA3MzUwLi44YjY3MDYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTQtMDItMTEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIENUVEU6IFJlbmRlck5hbWVkRmxvd1RocmVhZCBhbHdheXMgaGFzIGEgV2ViS2l0TmFtZWRG bG93LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4NjIzPgorCisgICAgICAgIENv ZGlmeSB0aGUgZmFjdCB0aGF0IFJlbmRlck5hbWVkRmxvd1RocmVhZCBhbHdheXMgaGFzIGEgY29y cmVzcG9uZGluZworICAgICAgICBXZWJLaXROYW1lZEZsb3cgYnkgc3RvcmluZyBpdCBpbiBhIFJl ZiwgYW5kIGFkZGluZyBhbiBhY2Nlc3NvciB0aGF0CisgICAgICAgIHJldHVybnMgYSByZWZlcmVu Y2UgdG8gZ2V0IHJpZCBvZiBhbGwgdGhlIC0+J3MuCisKKyAgICAgICAgQWxzbyByZW1vdmVkIHNv bWUgdW5uZWNlc3NhcnkgYXNzZXJ0aW9ucyBleHBvc2VkIGJ5IHRoaXMuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vTmFtZWRGbG93Q29sbGVj dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYW1lZEZsb3dDb2xsZWN0aW9uOjplbnN1cmVG bG93V2l0aE5hbWUpOgorICAgICAgICAqIGRvbS9OYW1lZEZsb3dDb2xsZWN0aW9uLmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OlJlbmRlck5hbWVkRmxvd1RocmVhZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lzdGVyTmFtZWRGbG93Q29u dGVudEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjp1 bnJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTmFtZWRGbG93VGhyZWFkOjpmbG93VGhyZWFkTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OmRpc3BhdGNoUmVnaW9uTGF5b3V0VXBkYXRlRXZlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjpkaXNwYXRjaFJlZ2lvbk92 ZXJzZXRDaGFuZ2VFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6OnJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50VGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudFRpbWVyRmly ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjpzZXRNYXJrRm9y RGVzdHJ1Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTmFtZWRGbG93VGhyZWFkOjpy ZXNldE1hcmtGb3JEZXN0cnVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZs b3dUaHJlYWQ6OmlzTWFya2VkRm9yRGVzdHJ1Y3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJOYW1lZEZsb3dUaHJlYWQuaDoKKwogMjAxNC0wMi0xMSAgU2FtdWVsIFdoaXRlICA8c2Ft dWVsX3doaXRlQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogQWRkIHRleHQgcmVwbGFjZW1lbnQg YWN0aXZpdHkgc3VwcG9ydCB0byBOU0FjY2Vzc2liaWxpdHlTZWxlY3RUZXh0V2l0aENyaXRlcmlh UGFyYW1ldGVyaXplZEF0dHJpYnV0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9O YW1lZEZsb3dDb2xsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZEZsb3dDb2xs ZWN0aW9uLmNwcAppbmRleCBjODc5ODE2Li5lMTQwZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTmFtZWRGbG93Q29sbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L05hbWVkRmxvd0NvbGxlY3Rpb24uY3BwCkBAIC02NiwxNCArNjYsMTQgQEAgV2ViS2l0TmFtZWRG bG93KiBOYW1lZEZsb3dDb2xsZWN0aW9uOjpmbG93QnlOYW1lKGNvbnN0IFN0cmluZyYgZmxvd05h bWUpCiAgICAgcmV0dXJuICppdDsKIH0KIAotUGFzc1JlZlB0cjxXZWJLaXROYW1lZEZsb3c+IE5h bWVkRmxvd0NvbGxlY3Rpb246OmVuc3VyZUZsb3dXaXRoTmFtZShjb25zdCBTdHJpbmcmIGZsb3dO YW1lKQorUGFzc1JlZjxXZWJLaXROYW1lZEZsb3c+IE5hbWVkRmxvd0NvbGxlY3Rpb246OmVuc3Vy ZUZsb3dXaXRoTmFtZShjb25zdCBTdHJpbmcmIGZsb3dOYW1lKQogewogICAgIE5hbWVkRmxvd1Nl dDo6aXRlcmF0b3IgaXQgPSBtX25hbWVkRmxvd3MuZmluZDxTdHJpbmcsIE5hbWVkRmxvd0hhc2hU cmFuc2xhdG9yPihmbG93TmFtZSk7CiAgICAgaWYgKGl0ICE9IG1fbmFtZWRGbG93cy5lbmQoKSkg ewogICAgICAgICBXZWJLaXROYW1lZEZsb3cqIG5hbWVkRmxvdyA9ICppdDsKICAgICAgICAgQVNT RVJUKG5hbWVkRmxvdy0+Zmxvd1N0YXRlKCkgPT0gV2ViS2l0TmFtZWRGbG93OjpGbG93U3RhdGVO dWxsKTsKIAotICAgICAgICByZXR1cm4gbmFtZWRGbG93OworICAgICAgICByZXR1cm4gKm5hbWVk RmxvdzsKICAgICB9CiAKICAgICBSZWZQdHI8V2ViS2l0TmFtZWRGbG93PiBuZXdGbG93ID0gV2Vi S2l0TmFtZWRGbG93OjpjcmVhdGUodGhpcywgZmxvd05hbWUpOwpAQCAtODEsNyArODEsNyBAQCBQ YXNzUmVmUHRyPFdlYktpdE5hbWVkRmxvdz4gTmFtZWRGbG93Q29sbGVjdGlvbjo6ZW5zdXJlRmxv d1dpdGhOYW1lKGNvbnN0IFN0cmluZwogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpk aWRDcmVhdGVOYW1lZEZsb3coZG9jdW1lbnQoKSwgbmV3Rmxvdy5nZXQoKSk7CiAKLSAgICByZXR1 cm4gbmV3Rmxvdy5yZWxlYXNlKCk7CisgICAgcmV0dXJuIG5ld0Zsb3cucmVsZWFzZU5vbk51bGwo KTsKIH0KIAogdm9pZCBOYW1lZEZsb3dDb2xsZWN0aW9uOjpkaXNjYXJkTmFtZWRGbG93KFdlYktp dE5hbWVkRmxvdyogbmFtZWRGbG93KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05h bWVkRmxvd0NvbGxlY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZEZsb3dDb2xsZWN0 aW9uLmgKaW5kZXggMGJiMDY0OS4uMmMwZDljOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL05hbWVkRmxvd0NvbGxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWRG bG93Q29sbGVjdGlvbi5oCkBAIC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKIAogICAgIFZlY3RvcjxS ZWZQdHI8V2ViS2l0TmFtZWRGbG93Pj4gbmFtZWRGbG93cygpOwogICAgIFdlYktpdE5hbWVkRmxv dyogZmxvd0J5TmFtZShjb25zdCBTdHJpbmcmKTsKLSAgICBQYXNzUmVmUHRyPFdlYktpdE5hbWVk Rmxvdz4gZW5zdXJlRmxvd1dpdGhOYW1lKGNvbnN0IFN0cmluZyYpOworICAgIFBhc3NSZWY8V2Vi S2l0TmFtZWRGbG93PiBlbnN1cmVGbG93V2l0aE5hbWUoY29uc3QgU3RyaW5nJik7CiAKICAgICB2 b2lkIGRpc2NhcmROYW1lZEZsb3coV2ViS2l0TmFtZWRGbG93Kik7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5jcHAKaW5kZXggZDA2YzE0 NS4uMjVmNzFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5h bWVkRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5h bWVkRmxvd1RocmVhZC5jcHAKQEAgLTQ1LDEyICs0NSwxMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLVJlbmRlck5hbWVkRmxvd1RocmVhZDo6UmVuZGVyTmFtZWRGbG93VGhyZWFkKERvY3Vt ZW50JiBkb2N1bWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUsIFBhc3NSZWZQdHI8V2Vi S2l0TmFtZWRGbG93PiBuYW1lZEZsb3cpCitSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OlJlbmRlck5h bWVkRmxvd1RocmVhZChEb2N1bWVudCYgZG9jdW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0 eWxlLCBQYXNzUmVmPFdlYktpdE5hbWVkRmxvdz4gbmFtZWRGbG93KQogICAgIDogUmVuZGVyRmxv d1RocmVhZChkb2N1bWVudCwgc3RkOjptb3ZlKHN0eWxlKSkKICAgICAsIG1fZmxvd1RocmVhZENo aWxkTGlzdChhZG9wdFB0cihuZXcgRmxvd1RocmVhZENoaWxkTGlzdCgpKSkKICAgICAsIG1fb3Zl cnNldCh0cnVlKQogICAgICwgbV9oYXNSZWdpb25zV2l0aFN0eWxpbmcoZmFsc2UpCi0gICAgLCBt X25hbWVkRmxvdyhuYW1lZEZsb3cpCisgICAgLCBtX25hbWVkRmxvdyhzdGQ6Om1vdmUobmFtZWRG bG93KSkKICAgICAsIG1fcmVnaW9uTGF5b3V0VXBkYXRlRXZlbnRUaW1lcih0aGlzLCAmUmVuZGVy TmFtZWRGbG93VGhyZWFkOjpyZWdpb25MYXlvdXRVcGRhdGVFdmVudFRpbWVyRmlyZWQpCiAgICAg LCBtX3JlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudFRpbWVyKHRoaXMsICZSZW5kZXJOYW1lZEZsb3dU aHJlYWQ6OnJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudFRpbWVyRmlyZWQpCiB7CkBAIC00MzYsMTMg KzQzNiwxMyBAQCB2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVnaXN0ZXJOYW1lZEZsb3dD b250ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxlbQogICAgICAgICB1bnNpZ25lZCBzaG9y dCBwb3NpdGlvbiA9IGNvbnRlbnRFbGVtZW50LmNvbXBhcmVEb2N1bWVudFBvc2l0aW9uKGVsZW1l bnQpOwogICAgICAgICBpZiAocG9zaXRpb24gJiBOb2RlOjpET0NVTUVOVF9QT1NJVElPTl9GT0xM T1dJTkcpIHsKICAgICAgICAgICAgIG1fY29udGVudEVsZW1lbnRzLmluc2VydEJlZm9yZShlbGVt ZW50LCAmY29udGVudEVsZW1lbnQpOwotICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRSZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KCZkb2N1bWVudCgpLCBtX25h bWVkRmxvdy5nZXQoKSwgJmNvbnRlbnRFbGVtZW50LCBlbGVtZW50KTsKKyAgICAgICAgICAgIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVu dCgmZG9jdW1lbnQoKSwgJm5hbWVkRmxvdygpLCAmY29udGVudEVsZW1lbnQsIGVsZW1lbnQpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQogCiAgICAgbV9jb250ZW50RWxl bWVudHMuYWRkKCZjb250ZW50RWxlbWVudCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpkaWRSZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KCZkb2N1bWVudCgpLCBtX25hbWVk Rmxvdy5nZXQoKSwgJmNvbnRlbnRFbGVtZW50KTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmRpZFJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnQoJmRvY3VtZW50KCksICZuYW1l ZEZsb3coKSwgJmNvbnRlbnRFbGVtZW50KTsKIH0KIAogdm9pZCBSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6OnVucmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxl bWVudCkKQEAgLTQ1Nyw3ICs0NTcsNyBAQCB2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6dW5y ZWdpc3Rlck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KEVsZW1lbnQmIGNvbnRlbnRFbAogICAgIGlm IChjYW5CZURlc3Ryb3llZCgpKQogICAgICAgICBzZXRNYXJrRm9yRGVzdHJ1Y3Rpb24oKTsKIAot ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkVW5yZWdpc3Rlck5hbWVkRmxvd0NvbnRl bnRFbGVtZW50KCZkb2N1bWVudCgpLCBtX25hbWVkRmxvdy5nZXQoKSwgJmNvbnRlbnRFbGVtZW50 KTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFVucmVnaXN0ZXJOYW1lZEZsb3dD b250ZW50RWxlbWVudCgmZG9jdW1lbnQoKSwgJm5hbWVkRmxvdygpLCAmY29udGVudEVsZW1lbnQp OwogfQogCiBib29sIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6aGFzQ29udGVudEVsZW1lbnQoRWxl bWVudCYgY29udGVudEVsZW1lbnQpIGNvbnN0CkBAIC00NjcsNyArNDY3LDcgQEAgYm9vbCBSZW5k ZXJOYW1lZEZsb3dUaHJlYWQ6Omhhc0NvbnRlbnRFbGVtZW50KEVsZW1lbnQmIGNvbnRlbnRFbGVt ZW50KSBjb25zdAogICAgIAogY29uc3QgQXRvbWljU3RyaW5nJiBSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6OmZsb3dUaHJlYWROYW1lKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9uYW1lZEZsb3ctPm5h bWUoKTsKKyAgICByZXR1cm4gbmFtZWRGbG93KCkubmFtZSgpOwogfQogCiBib29sIFJlbmRlck5h bWVkRmxvd1RocmVhZDo6aXNDaGlsZEFsbG93ZWQoY29uc3QgUmVuZGVyT2JqZWN0JiBjaGlsZCwg Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKSBjb25zdApAQCAtNDg3LDU3ICs0ODcsNTMgQEAgYm9v bCBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OmlzQ2hpbGRBbGxvd2VkKGNvbnN0IFJlbmRlck9iamVj dCYgY2hpbGQsIGNvbnN0IFJlbmQKIHZvaWQgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjpkaXNwYXRj aFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50KCkKIHsKICAgICBSZW5kZXJGbG93VGhyZWFkOjpkaXNw YXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50KCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRVcGRhdGVSZWdpb25MYXlvdXQoJmRvY3VtZW50KCksIG1fbmFtZWRGbG93LmdldCgp KTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFVwZGF0ZVJlZ2lvbkxheW91dCgm ZG9jdW1lbnQoKSwgJm5hbWVkRmxvdygpKTsKIAotICAgIGlmICghbV9yZWdpb25MYXlvdXRVcGRh dGVFdmVudFRpbWVyLmlzQWN0aXZlKCkgJiYgbV9uYW1lZEZsb3ctPmhhc0V2ZW50TGlzdGVuZXJz KCkpCisgICAgaWYgKCFtX3JlZ2lvbkxheW91dFVwZGF0ZUV2ZW50VGltZXIuaXNBY3RpdmUoKSAm JiBuYW1lZEZsb3coKS5oYXNFdmVudExpc3RlbmVycygpKQogICAgICAgICBtX3JlZ2lvbkxheW91 dFVwZGF0ZUV2ZW50VGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCiB2b2lkIFJlbmRlck5hbWVk Rmxvd1RocmVhZDo6ZGlzcGF0Y2hSZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnQoKQogewogICAgIFJl bmRlckZsb3dUaHJlYWQ6OmRpc3BhdGNoUmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50KCk7Ci0gICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDaGFuZ2VSZWdpb25PdmVyc2V0KCZkb2N1bWVu dCgpLCBtX25hbWVkRmxvdy5nZXQoKSk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpk aWRDaGFuZ2VSZWdpb25PdmVyc2V0KCZkb2N1bWVudCgpLCAmbmFtZWRGbG93KCkpOwogICAgIAot ICAgIGlmICghbV9yZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnRUaW1lci5pc0FjdGl2ZSgpICYmIG1f bmFtZWRGbG93LT5oYXNFdmVudExpc3RlbmVycygpKQorICAgIGlmICghbV9yZWdpb25PdmVyc2V0 Q2hhbmdlRXZlbnRUaW1lci5pc0FjdGl2ZSgpICYmIG5hbWVkRmxvdygpLmhhc0V2ZW50TGlzdGVu ZXJzKCkpCiAgICAgICAgIG1fcmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50VGltZXIuc3RhcnRPbmVT aG90KDApOwogfQogCiB2b2lkIFJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVnaW9uTGF5b3V0VXBk YXRlRXZlbnRUaW1lckZpcmVkKFRpbWVyPFJlbmRlck5hbWVkRmxvd1RocmVhZD4mKQogewotICAg IEFTU0VSVChtX25hbWVkRmxvdyk7Ci0KLSAgICBtX25hbWVkRmxvdy0+ZGlzcGF0Y2hSZWdpb25M YXlvdXRVcGRhdGVFdmVudCgpOworICAgIG5hbWVkRmxvdygpLmRpc3BhdGNoUmVnaW9uTGF5b3V0 VXBkYXRlRXZlbnQoKTsKIH0KIAogdm9pZCBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lvbk92 ZXJzZXRDaGFuZ2VFdmVudFRpbWVyRmlyZWQoVGltZXI8UmVuZGVyTmFtZWRGbG93VGhyZWFkPiYp CiB7Ci0gICAgQVNTRVJUKG1fbmFtZWRGbG93KTsKLSAgICAKLSAgICBtX25hbWVkRmxvdy0+ZGlz cGF0Y2hSZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnQoKTsKKyAgICBuYW1lZEZsb3coKS5kaXNwYXRj aFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudCgpOwogfQogCiB2b2lkIFJlbmRlck5hbWVkRmxvd1Ro cmVhZDo6c2V0TWFya0ZvckRlc3RydWN0aW9uKCkKIHsKLSAgICBpZiAobV9uYW1lZEZsb3ctPmZs b3dTdGF0ZSgpID09IFdlYktpdE5hbWVkRmxvdzo6Rmxvd1N0YXRlTnVsbCkKKyAgICBpZiAobmFt ZWRGbG93KCkuZmxvd1N0YXRlKCkgPT0gV2ViS2l0TmFtZWRGbG93OjpGbG93U3RhdGVOdWxsKQog ICAgICAgICByZXR1cm47CiAKLSAgICBtX25hbWVkRmxvdy0+c2V0UmVuZGVyZXIoMCk7CisgICAg bmFtZWRGbG93KCkuc2V0UmVuZGVyZXIobnVsbHB0cik7CiAgICAgLy8gQWZ0ZXIgdGhpcyBjYWxs IGVuZHMsIHRoZSByZW5kZXJlciBjYW4gYmUgc2FmZWx5IGRlc3Ryb3llZC4KICAgICAvLyBUaGUg TmFtZWRGbG93IG9iamVjdCBtYXkgb3V0bGl2ZSBpdHMgcmVuZGVyZXIgaWYgaXQncyByZWZlcmVu Y2VkIGZyb20gYSBzY3JpcHQgYW5kIG1heSBiZSByZWF0YWNoZWQgdG8gb25lIGlmIHRoZSBuYW1l ZCBmbG93IGlzIHJlY3JlYXRlZCBpbiB0aGUgc3R5bGVzaGVldC4KIH0KIAogdm9pZCBSZW5kZXJO YW1lZEZsb3dUaHJlYWQ6OnJlc2V0TWFya0ZvckRlc3RydWN0aW9uKCkKIHsKLSAgICBpZiAobV9u YW1lZEZsb3ctPmZsb3dTdGF0ZSgpID09IFdlYktpdE5hbWVkRmxvdzo6Rmxvd1N0YXRlQ3JlYXRl ZCkKKyAgICBpZiAobmFtZWRGbG93KCkuZmxvd1N0YXRlKCkgPT0gV2ViS2l0TmFtZWRGbG93OjpG bG93U3RhdGVDcmVhdGVkKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX25hbWVkRmxvdy0+c2V0 UmVuZGVyZXIodGhpcyk7CisgICAgbmFtZWRGbG93KCkuc2V0UmVuZGVyZXIodGhpcyk7CiB9CiAK IGJvb2wgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjppc01hcmtlZEZvckRlc3RydWN0aW9uKCkgY29u c3QKIHsKICAgICAvLyBGbG93IHRocmVhZHMgaW4gdGhlICJOVUxMIiBzdGF0ZSBjYW4gYmUgZGVz dHJveWVkLgotICAgIHJldHVybiBtX25hbWVkRmxvdy0+Zmxvd1N0YXRlKCkgPT0gV2ViS2l0TmFt ZWRGbG93OjpGbG93U3RhdGVOdWxsOworICAgIHJldHVybiBuYW1lZEZsb3coKS5mbG93U3RhdGUo KSA9PSBXZWJLaXROYW1lZEZsb3c6OkZsb3dTdGF0ZU51bGw7CiB9CiAKIHN0YXRpYyBib29sIGlz Q29udGFpbmVkSW5FbGVtZW50cyhjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBvdGhlcnMsIEVsZW1l bnQqIGVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TmFtZWRGbG93VGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93VGhyZWFkLmgKaW5kZXggYjJkOTFjZS4uMWJiMzZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuaApAQCAtNDUsNyArNDUsNyBAQCB0 eXBlZGVmIExpc3RIYXNoU2V0PEVsZW1lbnQqPiBOYW1lZEZsb3dDb250ZW50RWxlbWVudHM7CiAK IGNsYXNzIFJlbmRlck5hbWVkRmxvd1RocmVhZCBmaW5hbCA6IHB1YmxpYyBSZW5kZXJGbG93VGhy ZWFkIHsKIHB1YmxpYzoKLSAgICBSZW5kZXJOYW1lZEZsb3dUaHJlYWQoRG9jdW1lbnQmLCBQYXNz UmVmPFJlbmRlclN0eWxlPiwgUGFzc1JlZlB0cjxXZWJLaXROYW1lZEZsb3c+KTsKKyAgICBSZW5k ZXJOYW1lZEZsb3dUaHJlYWQoRG9jdW1lbnQmLCBQYXNzUmVmPFJlbmRlclN0eWxlPiwgUGFzc1Jl ZjxXZWJLaXROYW1lZEZsb3c+KTsKICAgICB2aXJ0dWFsIH5SZW5kZXJOYW1lZEZsb3dUaHJlYWQo KTsKIAogICAgIGNvbnN0IEF0b21pY1N0cmluZyYgZmxvd1RocmVhZE5hbWUoKSBjb25zdDsKQEAg LTExNiw3ICsxMTYsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJDb250ZW50RWxlbWVudHMo KTsKICAgICB2b2lkIHVwZGF0ZVdyaXRpbmdNb2RlKCk7CiAKLXByaXZhdGU6CisgICAgV2ViS2l0 TmFtZWRGbG93JiBuYW1lZEZsb3coKSB7IHJldHVybiBtX25hbWVkRmxvdy5nZXQoKTsgfQorICAg IGNvbnN0IFdlYktpdE5hbWVkRmxvdyYgbmFtZWRGbG93KCkgY29uc3QgeyByZXR1cm4gbV9uYW1l ZEZsb3cuZ2V0KCk7IH0KKwogICAgIC8vIE9ic2VydmVyIGZsb3cgdGhyZWFkcyBoYXZlIGludmFs aWQgcmVnaW9ucyB0aGF0IGRlcGVuZCBvbiB0aGUgc3RhdGUgb2YgdGhpcyB0aHJlYWQKICAgICAv LyB0byByZS12YWxpZGF0ZSB0aGVpciByZWdpb25zLiBLZWVwaW5nIGEgc2V0IG9mIG9ic2VydmVy IHRocmVhZHMgbWFrZSBpdCBlYXN5CiAgICAgLy8gdG8gbm90aWZ5IHRoZW0gd2hlbiBhIHJlZ2lv biB3YXMgcmVtb3ZlZCBmcm9tIHRoaXMgZmxvdy4KQEAgLTEzOSw3ICsxNDEsNyBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9oYXNSZWdpb25zV2l0aFN0eWxpbmcgOiAxOwogCiAgICAgLy8gVGhlIERP TSBPYmplY3QgdGhhdCByZXByZXNlbnRzIGEgbmFtZWQgZmxvdy4KLSAgICBSZWZQdHI8V2ViS2l0 TmFtZWRGbG93PiBtX25hbWVkRmxvdzsKKyAgICBSZWY8V2ViS2l0TmFtZWRGbG93PiBtX25hbWVk RmxvdzsKIAogICAgIFRpbWVyPFJlbmRlck5hbWVkRmxvd1RocmVhZD4gbV9yZWdpb25MYXlvdXRV cGRhdGVFdmVudFRpbWVyOwogICAgIFRpbWVyPFJlbmRlck5hbWVkRmxvd1RocmVhZD4gbV9yZWdp b25PdmVyc2V0Q2hhbmdlRXZlbnRUaW1lcjsK