155830 2016-03-23 21:33:20 -0700 [OS X] Overflow:scroll scrollbars do not obey overlay/always-on system preference changes 2016-03-24 19:03:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1177602 0 mmaxfield 2016-03-23 21:33:20 -0700 [OS X] Overflow:scroll scrollbars do not obey overlay/always-on system preference changes 1177606 1 274816 mmaxfield 2016-03-23 21:56:52 -0700 Created attachment 274816 Patch 1177609 2 274816 simon.fraser 2016-03-23 22:12:42 -0700 Comment on attachment 274816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274816&action=review > Source/WebCore/rendering/RenderLayer.cpp:2926 > + renderer().setNeedsLayout(MarkContainingBlockChain); Isn't MarkContainingBlockChain the default? > Source/WebCore/rendering/RenderLayer.cpp:2927 > + renderer().view().layout(); Ouch. Please don't do a sync layout here. 1177843 3 mmaxfield 2016-03-24 19:03:26 -0700 Committed r198656: <http://trac.webkit.org/changeset/198656> 274816 2016-03-23 21:56:52 -0700 2016-03-23 22:12:42 -0700 Patch bug-155830-20160323215653.patch text/plain 10339 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzliY2FiNjRiYzJlNmNm OGZlMmZlNTc5MTEyNDVlNTFlM2M1MzNiOC4uNDA1YmE2YzU0NWIwMzRiMTA3OGNhMDEwZDM3OGQ1 YTQ0OGVjZGViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE2LTAzLTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIE92 ZXJmbG93OnNjcm9sbCBzY3JvbGxiYXJzIGRvIG5vdCBvYmV5IG92ZXJsYXkvYWx3YXlzLW9uIHN5 c3RlbSBwcmVmZXJlbmNlIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTgzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoZW4gdGhlIHNjcm9sbGJhciBzdHlsZSBjaGFuZ2VzLCB0aGUgYXZh aWxhYmxlIHdpZHRoIG9mIGFsbCBTY3JvbGxhYmxlQXJlYXMgY2hhbmdlLAorICAgICAgICBhbmQg dGhlcmVmb3JlIGEgcmVsYXlvdXQgbXVzdCBvY2N1ci4KKworICAgICAgICBFYWNoIFNjcm9sbGFi bGVBcmVhIG93bnMgaXRzIG93biBTY3JvbGxBbmltYXRvciAoaWYgbmVjZXNzYXJ5KS4gVXBvbiBj cmVhdGlvbiwgdGhlCisgICAgICAgIFNjcm9sbEFuaW1hdG9yIHdpbGwgc3RhcnQgbGlzdGVuaW5n IGZvciBjaGFuZ2VzIHRvIHRoZSBzeXN0ZW0gcHJlZmVyZW5jZSBmb3IKKyAgICAgICAgb3Zlcmxh eSAvIGFsd2F5cy1vbiBzY3JvbGxiYXJzLiBXaGVuIG5vdGlmaWVkLCB0aGUgU2Nyb2xsQW5pbWF0 b3IgdGVsbHMgaXRzIG93bmluZworICAgICAgICBTY3JvbGxhYmxlQXJlYSB0aGF0IHNjcm9sbGJh clN0eWxlQ2hhbmdlZCgpLgorCisgICAgICAgIEZvciBtYWluLWZyYW1lIHNjcm9sbGluZywgRnJh bWVWaWV3IG92ZXJyaWRlcyBzY3JvbGxiYXJTdHlsZUNoYW5nZWQgYW5kIGNhdXNlcyBhCisgICAg ICAgIHJlbGF5b3V0LiBIb3dldmVyLCBmb3Igb3ZlcmZsb3c6c2Nyb2xsIGVsZW1lbnRzLCBubyBy ZWxheW91dCBpcyB0cmlnZ2VyZWQuIFRoaXMKKyAgICAgICAgcGF0Y2ggb3ZlcnJpZGVzIGF2YWls YWJsZUNvbnRlbnRTaXplQ2hhbmdlZCgpIGZvciBSZW5kZXJMYXllciAod2hpY2ggaXMgdXNlZCBm b3IKKyAgICAgICAgb3ZlcmZsb3c6c2Nyb2xsIGVsZW1lbnRzKS4gVGhpcyBvdmVycmlkZSB0cmln Z2VycyBhIHJlbGF5b3V0LgorCisgICAgICAgIEl0IGFsc28gdXBkYXRlcyB0aGUgbWVjaGFuaXNt IGluIFJlbmRlckJsb2NrOjpyZWNvbXB1dGVMb2dpY2FsV2lkdGgoKSB0byBlbnN1cmUgdGhhdAor ICAgICAgICBhIGNoYW5nZSBpbiBzY3JvbGxiYXIgc2l6ZSBjYXVzZXMgUmVuZGVyQmxvY2tGbG93 OjpsYXlvdXRCbG9jaygpIHRvIHJlbGF5b3V0IGl0cworICAgICAgICBjaGlsZHJlbi4gVGhpcyBp cyBhcHByb3ByaWF0ZSBiZWNhdXNlIGJsb2NrIGNoaWxkIHBvc2l0aW9uaW5nIGlzIGFmZmVjdGVk IGJ5CisgICAgICAgIHNjcm9sbGJhciBzaXplLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoZm9y IG5vdykuIFByZXN1bWFibHkgd2UgY291bGQgbW9jayB0aGUgbWVzc2FnZSB3ZSByZWNlaXZlIHdo ZW4gdGhlCisgICAgICAgIHN5c3RlbSBwcmVmZXJlbmNlIGlzIGNoYW5nZWQuIEhvd2V2ZXIsIEkg aGF2ZW4ndCBpbXBsZW1lbnRlZCB0aGF0IHlldC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHA6IFJlbmFtZSBzZXRIYXNCb3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFu Z2VkKCkuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c3R5bGVEaWRDaGFuZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnJlY29tcHV0ZUxvZ2ljYWxXaWR0aCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OnNldEhhc0JvcmRlck9yUGFkZGluZ09yU2Nyb2xsYmFyTG9naWNhbFdp ZHRoQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aGFzQm9yZGVyT3JQ YWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6c2V0SGFzQm9yZGVyT3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZCk6IERlbGV0ZWQuCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckVsZW1lbnQ6OlJlbmRlckVsZW1lbnQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJFbGVtZW50Lmg6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVu dDo6c2V0UmVuZGVyQmxvY2tIYXNCb3JkZXJPclBhZGRpbmdPclNjcm9sbGJhckxvZ2ljYWxXaWR0 aENoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6cmVuZGVyQmxvY2tI YXNCb3JkZXJPclBhZGRpbmdPclNjcm9sbGJhckxvZ2ljYWxXaWR0aENoYW5nZWQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6c2V0UmVuZGVyQmxvY2tIYXNCb3JkZXJPclBhZGRp bmdMb2dpY2FsV2lkdGhDaGFuZ2VkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckVsZW1lbnQ6OnJlbmRlckJsb2NrSGFzQm9yZGVyT3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdl ZCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjphdmFpbGFibGVDb250ZW50U2l6ZUNoYW5nZWQpOiBD YXVzZSBhIHJlbGF5b3V0IHRvIG9jY3VyLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5oOgorCiAyMDE2LTAzLTIyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5j b20+CiAKICAgICAgICAgVXNlIHJlZmVyZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycyBmb3IgYWJz b2x1dGUgcG9zaXRpb25pbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAKaW5kZXggOWI0Mjk4YzgyODAzYTBkNzFkOWMwOWQ4Zjc4ZGJiNmQ2YmNhZjNhZi4uZDQ3 ZmUwMDg5M2I4ODU2OGI5M2I5YmRmYmYyY2QxYjVlYjRhNmY2NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0zMTUsNyArMzE1LDcgQEAgdm9pZCBSZW5kZXJC bG9jazo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0 eWxlKiBvbGRTdHkKIAogICAgIC8vIEl0J3MgcG9zc2libGUgZm9yIG91ciBib3JkZXIvcGFkZGlu ZyB0byBjaGFuZ2UsIGJ1dCBmb3IgdGhlIG92ZXJhbGwgbG9naWNhbCB3aWR0aCBvZiB0aGUgYmxv Y2sgdG8KICAgICAvLyBlbmQgdXAgYmVpbmcgdGhlIHNhbWUuIFdlIGtlZXAgdHJhY2sgb2YgdGhp cyBjaGFuZ2Ugc28gaW4gbGF5b3V0QmxvY2ssIHdlIGNhbiBrbm93IHRvIHNldCByZWxheW91dENo aWxkcmVuPXRydWUuCi0gICAgc2V0SGFzQm9yZGVyT3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdl ZChvbGRTdHlsZSAmJiBkaWZmID09IFN0eWxlRGlmZmVyZW5jZUxheW91dCAmJiBuZWVkc0xheW91 dCgpICYmIGJvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQob2xkU3R5bGUsICZuZXdT dHlsZSkpOworICAgIHNldEhhc0JvcmRlck9yUGFkZGluZ09yU2Nyb2xsYmFyTG9naWNhbFdpZHRo Q2hhbmdlZChvbGRTdHlsZSAmJiBkaWZmID09IFN0eWxlRGlmZmVyZW5jZUxheW91dCAmJiBuZWVk c0xheW91dCgpICYmIGJvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQob2xkU3R5bGUs ICZuZXdTdHlsZSkpOwogfQogCiBSZW5kZXJCbG9jayogUmVuZGVyQmxvY2s6OmNvbnRpbnVhdGlv bkJlZm9yZShSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQpAQCAtOTc1LDcgKzk3NSw3IEBAIGJv b2wgUmVuZGVyQmxvY2s6OnJlY29tcHV0ZUxvZ2ljYWxXaWR0aCgpCiAgICAgdXBkYXRlTG9naWNh bFdpZHRoKCk7CiAgICAgCiAgICAgYm9vbCBoYXNCb3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhD aGFuZ2VkID0gdGhpcy0+aGFzQm9yZGVyT3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZCgpOwot ICAgIHNldEhhc0JvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQoZmFsc2UpOworICAg IHNldEhhc0JvcmRlck9yUGFkZGluZ09yU2Nyb2xsYmFyTG9naWNhbFdpZHRoQ2hhbmdlZChmYWxz ZSk7CiAKICAgICByZXR1cm4gb2xkV2lkdGggIT0gbG9naWNhbFdpZHRoKCkgfHwgaGFzQm9yZGVy T3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmgKaW5kZXggZjI1MTU4YjczZmYzM2E1YzlkNGVjY2Q4NGJhMjRiZDRiMjQxMDkz Mi4uYWRhYWNiNTliN2I4ZTc2OWE5NzRkNmM3ZTRiNTkxMjk3ZTUzOTkzNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTEwMywxMSArMTAzLDExIEBAIHB1YmxpYzoK IAogICAgIHZvaWQgc2V0SGFzTWFyZ2luQmVmb3JlUXVpcmsoYm9vbCBiKSB7IHNldFJlbmRlckJs b2NrSGFzTWFyZ2luQmVmb3JlUXVpcmsoYik7IH0KICAgICB2b2lkIHNldEhhc01hcmdpbkFmdGVy UXVpcmsoYm9vbCBiKSB7IHNldFJlbmRlckJsb2NrSGFzTWFyZ2luQWZ0ZXJRdWlyayhiKTsgfQot ICAgIHZvaWQgc2V0SGFzQm9yZGVyT3JQYWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZChib29sIGIp IHsgc2V0UmVuZGVyQmxvY2tIYXNCb3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFuZ2VkKGIp OyB9CisgICAgdm9pZCBzZXRIYXNCb3JkZXJPclBhZGRpbmdPclNjcm9sbGJhckxvZ2ljYWxXaWR0 aENoYW5nZWQoYm9vbCBiKSB7IHNldFJlbmRlckJsb2NrSGFzQm9yZGVyT3JQYWRkaW5nT3JTY3Jv bGxiYXJMb2dpY2FsV2lkdGhDaGFuZ2VkKGIpOyB9CiAKICAgICBib29sIGhhc01hcmdpbkJlZm9y ZVF1aXJrKCkgY29uc3QgeyByZXR1cm4gcmVuZGVyQmxvY2tIYXNNYXJnaW5CZWZvcmVRdWlyaygp OyB9CiAgICAgYm9vbCBoYXNNYXJnaW5BZnRlclF1aXJrKCkgY29uc3QgeyByZXR1cm4gcmVuZGVy QmxvY2tIYXNNYXJnaW5BZnRlclF1aXJrKCk7IH0KLSAgICBib29sIGhhc0JvcmRlck9yUGFkZGlu Z0xvZ2ljYWxXaWR0aENoYW5nZWQoKSBjb25zdCB7IHJldHVybiByZW5kZXJCbG9ja0hhc0JvcmRl ck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQoKTsgfQorICAgIGJvb2wgaGFzQm9yZGVyT3JQ YWRkaW5nTG9naWNhbFdpZHRoQ2hhbmdlZCgpIGNvbnN0IHsgcmV0dXJuIHJlbmRlckJsb2NrSGFz Qm9yZGVyT3JQYWRkaW5nT3JTY3JvbGxiYXJMb2dpY2FsV2lkdGhDaGFuZ2VkKCk7IH0KIAogICAg IGJvb2wgaGFzTWFyZ2luQmVmb3JlUXVpcmsoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7 CiAgICAgYm9vbCBoYXNNYXJnaW5BZnRlclF1aXJrKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IDhj MDk3MDllYWM4ODgzNDhiYzIxN2ZjMTE4MjUxODE0YmE4NDdlMTUuLjViOWE4MzcxYTNlY2U5NTk4 YjM4MTYzZTkzODgzYTYxYzliZmNmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgaW5saW5lIFJlbmRlckVsZW1lbnQ6OlJl bmRlckVsZW1lbnQoQ29udGFpbmVyTm9kZSYgZWxlbWVudE9yRG9jdW1lbnQsIFJlZjxSZW5kZXIK ICAgICAsIG1faGFzQ29udGludWF0aW9uKGZhbHNlKQogICAgICwgbV9yZW5kZXJCbG9ja0hhc01h cmdpbkJlZm9yZVF1aXJrKGZhbHNlKQogICAgICwgbV9yZW5kZXJCbG9ja0hhc01hcmdpbkFmdGVy UXVpcmsoZmFsc2UpCi0gICAgLCBtX3JlbmRlckJsb2NrSGFzQm9yZGVyT3JQYWRkaW5nTG9naWNh bFdpZHRoQ2hhbmdlZChmYWxzZSkKKyAgICAsIG1fcmVuZGVyQmxvY2tIYXNCb3JkZXJPclBhZGRp bmdPclNjcm9sbGJhckxvZ2ljYWxXaWR0aENoYW5nZWQoZmFsc2UpCiAgICAgLCBtX3JlbmRlckJs b2NrRmxvd0hhc01hcmt1cFRydW5jYXRpb24oZmFsc2UpCiAgICAgLCBtX3JlbmRlckJsb2NrRmxv d0xpbmVMYXlvdXRQYXRoKFJlbmRlckJsb2NrRmxvdzo6VW5kZXRlcm1pbmVkUGF0aCkKICAgICAs IG1fZmlyc3RDaGlsZChudWxscHRyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmgKaW5kZXggZjQ3OTJkOTdjMTllNGY5YTBkMzk1YjYzYjBhM2EyMGQyZTVhZmE1ZS4uYzE0 ZjY5Y2ExYjEwZWUxMWViMmNkMTQyYWQ2YmU3NmZmYjBiZDU5YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCkBAIC0yNjQsMTAgKzI2NCwxMCBAQCBwcm90ZWN0ZWQ6 CiAKICAgICB2b2lkIHNldFJlbmRlckJsb2NrSGFzTWFyZ2luQmVmb3JlUXVpcmsoYm9vbCBiKSB7 IG1fcmVuZGVyQmxvY2tIYXNNYXJnaW5CZWZvcmVRdWlyayA9IGI7IH0KICAgICB2b2lkIHNldFJl bmRlckJsb2NrSGFzTWFyZ2luQWZ0ZXJRdWlyayhib29sIGIpIHsgbV9yZW5kZXJCbG9ja0hhc01h cmdpbkFmdGVyUXVpcmsgPSBiOyB9Ci0gICAgdm9pZCBzZXRSZW5kZXJCbG9ja0hhc0JvcmRlck9y UGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQoYm9vbCBiKSB7IG1fcmVuZGVyQmxvY2tIYXNCb3Jk ZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFuZ2VkID0gYjsgfQorICAgIHZvaWQgc2V0UmVuZGVy QmxvY2tIYXNCb3JkZXJPclBhZGRpbmdPclNjcm9sbGJhckxvZ2ljYWxXaWR0aENoYW5nZWQoYm9v bCBiKSB7IG1fcmVuZGVyQmxvY2tIYXNCb3JkZXJPclBhZGRpbmdPclNjcm9sbGJhckxvZ2ljYWxX aWR0aENoYW5nZWQgPSBiOyB9CiAgICAgYm9vbCByZW5kZXJCbG9ja0hhc01hcmdpbkJlZm9yZVF1 aXJrKCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJCbG9ja0hhc01hcmdpbkJlZm9yZVF1aXJrOyB9 CiAgICAgYm9vbCByZW5kZXJCbG9ja0hhc01hcmdpbkFmdGVyUXVpcmsoKSBjb25zdCB7IHJldHVy biBtX3JlbmRlckJsb2NrSGFzTWFyZ2luQWZ0ZXJRdWlyazsgfQotICAgIGJvb2wgcmVuZGVyQmxv Y2tIYXNCb3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFuZ2VkKCkgY29uc3QgeyByZXR1cm4g bV9yZW5kZXJCbG9ja0hhc0JvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQ7IH0KKyAg ICBib29sIHJlbmRlckJsb2NrSGFzQm9yZGVyT3JQYWRkaW5nT3JTY3JvbGxiYXJMb2dpY2FsV2lk dGhDaGFuZ2VkKCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJCbG9ja0hhc0JvcmRlck9yUGFkZGlu Z09yU2Nyb2xsYmFyTG9naWNhbFdpZHRoQ2hhbmdlZDsgfQogCiAgICAgdm9pZCBzZXRSZW5kZXJC bG9ja0Zsb3dMaW5lTGF5b3V0UGF0aCh1bnNpZ25lZCB1KSB7IG1fcmVuZGVyQmxvY2tGbG93TGlu ZUxheW91dFBhdGggPSB1OyB9CiAgICAgdm9pZCBzZXRSZW5kZXJCbG9ja0Zsb3dIYXNNYXJrdXBU cnVuY2F0aW9uKGJvb2wgYikgeyBtX3JlbmRlckJsb2NrRmxvd0hhc01hcmt1cFRydW5jYXRpb24g PSBiOyB9CkBAIC0zMzAsNyArMzMwLDcgQEAgcHJpdmF0ZToKIAogICAgIHVuc2lnbmVkIG1fcmVu ZGVyQmxvY2tIYXNNYXJnaW5CZWZvcmVRdWlyayA6IDE7CiAgICAgdW5zaWduZWQgbV9yZW5kZXJC bG9ja0hhc01hcmdpbkFmdGVyUXVpcmsgOiAxOwotICAgIHVuc2lnbmVkIG1fcmVuZGVyQmxvY2tI YXNCb3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFuZ2VkIDogMTsKKyAgICB1bnNpZ25lZCBt X3JlbmRlckJsb2NrSGFzQm9yZGVyT3JQYWRkaW5nT3JTY3JvbGxiYXJMb2dpY2FsV2lkdGhDaGFu Z2VkIDogMTsKICAgICB1bnNpZ25lZCBtX3JlbmRlckJsb2NrRmxvd0hhc01hcmt1cFRydW5jYXRp b24gOiAxOwogICAgIHVuc2lnbmVkIG1fcmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBhdGggOiAy OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBhMDU5ZmFi NTgxZWU5MGY0NmRmYmNmYjk2MmU0OWMyMTQ5NDU0YzcxLi4xM2MxMGIzODFhODIyYzY5NjEyZjdh MGU0OGZmYzVmNzYxNWE0MjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAKQEAgLTI5MTYsNiArMjkxNiwxOCBAQCBJbnRTaXplIFJlbmRlckxheWVyOjpzY3JvbGxh YmxlQ29udGVudHNTaXplKCkgY29uc3QKICAgICByZXR1cm4gY29udGVudHNTaXplOwogfQogCit2 b2lkIFJlbmRlckxheWVyOjphdmFpbGFibGVDb250ZW50U2l6ZUNoYW5nZWQoQXZhaWxhYmxlU2l6 ZUNoYW5nZVJlYXNvbiByZWFzb24pCit7CisgICAgU2Nyb2xsYWJsZUFyZWE6OmF2YWlsYWJsZUNv bnRlbnRTaXplQ2hhbmdlZChyZWFzb24pOworCisgICAgaWYgKHJlYXNvbiA9PSBBdmFpbGFibGVT aXplQ2hhbmdlUmVhc29uOjpTY3JvbGxiYXJzQ2hhbmdlZCkgeworICAgICAgICBpZiAoaXM8UmVu ZGVyQmxvY2s+KHJlbmRlcmVyKCkpKQorICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQmxvY2s+ KHJlbmRlcmVyKCkpLnNldEhhc0JvcmRlck9yUGFkZGluZ09yU2Nyb2xsYmFyTG9naWNhbFdpZHRo Q2hhbmdlZCh0cnVlKTsKKyAgICAgICAgcmVuZGVyZXIoKS5zZXROZWVkc0xheW91dChNYXJrQ29u dGFpbmluZ0Jsb2NrQ2hhaW4pOworICAgICAgICByZW5kZXJlcigpLnZpZXcoKS5sYXlvdXQoKTsK KyAgICB9Cit9CisKIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRp b25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gcmVuZGVyZXIoKS52aWV3KCkuZnJhbWVWaWV3KCku c2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKaW5kZXggOTRmOGU5MTBlMDlkZDNjNTVlOWM5YTYzZGMyMjY4NTBmMGM5ZmU2 NS4uZTEwNTE0OTIyNTdiNTk3YTJhODBjYzdmNTU1Y2Q5NmVjYjYyZWE4OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTIwMyw2ICsyMDMsOCBAQCBwdWJsaWM6CiAg ICAgU2Nyb2xsT2Zmc2V0IHNjcm9sbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbE9mZnNl dEZyb21Qb3NpdGlvbihtX3Njcm9sbFBvc2l0aW9uKTsgfQogICAgIEludFNpemUgc2Nyb2xsYWJs ZUNvbnRlbnRzU2l6ZSgpIGNvbnN0OwogCisgICAgdm9pZCBhdmFpbGFibGVDb250ZW50U2l6ZUNo YW5nZWQoQXZhaWxhYmxlU2l6ZUNoYW5nZVJlYXNvbikgb3ZlcnJpZGU7CisKICAgICB2b2lkIHNj cm9sbFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYsIGNvbnN0IFNjcm9sbEFsaWdubWVu dCYgYWxpZ25YLCBjb25zdCBTY3JvbGxBbGlnbm1lbnQmIGFsaWduWSk7CiAKICAgICBMYXlvdXRS ZWN0IGdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3Qg TGF5b3V0UmVjdCYgdmlzaWJsZVJlY3RSZWxhdGl2ZVRvRG9jdW1lbnQsIGNvbnN0IExheW91dFJl Y3QmIGV4cG9zZVJlY3QsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25YLCBjb25zdCBTY3Jv bGxBbGlnbm1lbnQmIGFsaWduWSk7Cg==