170039 2017-03-23 17:03:50 -0700 Move visibleInViewportStateChanged callback from Element to render tree 2017-03-27 17:06:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue jer.noble simon.fraser zalan oldest_to_newest 1290667 0 koivisto 2017-03-23 17:03:50 -0700 Make it easier to use from render tree. 1290676 1 305249 koivisto 2017-03-23 17:19:05 -0700 Created attachment 305249 patch 1290727 2 305249 simon.fraser 2017-03-23 21:38:36 -0700 Comment on attachment 305249 patch View in context: https://bugs.webkit.org/attachment.cgi?id=305249&action=review > Source/WebCore/rendering/RenderElement.h:349 > + unsigned m_visibleInViewportState : 2; Would be nice to have a comment to say what enum gets stuffed in here. 1291693 3 305249 commit-queue 2017-03-27 17:06:32 -0700 Comment on attachment 305249 patch Clearing flags on attachment: 305249 Committed r214443: <http://trac.webkit.org/changeset/214443> 1291694 4 commit-queue 2017-03-27 17:06:35 -0700 All reviewed patches have been landed. Closing bug. 305249 2017-03-23 17:19:05 -0700 2017-03-27 17:06:32 -0700 patch visible-in-viewport.patch text/plain 13183 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNDMyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE3LTAzLTIzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHZpc2libGVJblZpZXdw b3J0U3RhdGVDaGFuZ2VkIGNhbGxiYWNrIGZyb20gRWxlbWVudCB0byByZW5kZXIgdHJlZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMDM5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBlYXNp ZXIgdG8gdXNlIGZyb20gdGhlIHJlbmRlciB0cmVlLgorCisgICAgICAgIEFsc28gZm9yIHNpbXBs aWNpdHkgbW92ZSB0aGUgYml0cyBmcm9tIFJlbmRlck9iamVjdCByYXJlIGRhdGEgdG8gUmVuZGVy RWxlbWVudC4KKyAgICAgICAgVGhlcmUgaXMgcGxlbnR5IG9mIHNwYWNlIHRoZXJlLgorCisgICAg ICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmlzVmlzaWJs ZUluVmlld3BvcnRDaGFuZ2VkKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVs ZW1lbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpSZW5kZXJFbGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckVsZW1lbnQ6OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJFbGVtZW50OjpyZWdpc3RlckZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2spOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6dW5yZWdpc3RlckZvclZpc2libGVJblZpZXdw b3J0Q2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6c2V0VmlzaWJs ZUluVmlld3BvcnRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50Ojp2aXNp YmxlSW5WaWV3cG9ydFN0YXRlQ2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OnZpc2libGVJblZpZXdw b3J0U3RhdGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZXRJc1JlZ2lzdGVyZWRGb3JWaXNpYmxlSW5WaWV3 cG9ydENhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 c2V0VmlzaWJsZUluVmlld3BvcnRTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpoYXNPdXRs aW5lQXV0b0FuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6UmVuZGVy T2JqZWN0UmFyZURhdGE6OlJlbmRlck9iamVjdFJhcmVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck9iamVjdDo6aXNSZWdpc3RlcmVkRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFjayk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnZpc2libGVJblZpZXdw b3J0U3RhdGUpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWRlbzo6dmlzaWJsZUluVmlld3BvcnRTdGF0ZUNo YW5nZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnVw ZGF0ZVZpc2libGVWaWV3cG9ydFJlY3QpOgorCiAyMDE3LTAzLTIzICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU1ZHIGFuaW1hdGlvbnMgYXJlIG5vdCBwYXVzZWQg d2hlbiB0aGVpciA8c3ZnPiBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSB0aGUgZG9jdW1lbnQKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuaAkocmV2aXNpb24gMjE0MzA1KQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTUwLDggKzU1MCw2IEBAIHB1YmxpYzoK ICAgICBib29sIGhhc0Rpc3BsYXlDb250ZW50cygpIGNvbnN0OwogICAgIHZvaWQgc2V0SGFzRGlz cGxheUNvbnRlbnRzKGJvb2wpOwogCi0gICAgdmlydHVhbCB2b2lkIGlzVmlzaWJsZUluVmlld3Bv cnRDaGFuZ2VkKCkgeyB9Ci0KICAgICB1c2luZyBDb250YWluZXJOb2RlOjpzZXRBdHRyaWJ1dGVF dmVudExpc3RlbmVyOwogICAgIHZvaWQgc2V0QXR0cmlidXRlRXZlbnRMaXN0ZW5lcihjb25zdCBB dG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0cmlidXRlTmFt ZSwgY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCShyZXZpc2lvbiAyMTQzMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDk3LDYgKzQ5Nyw4IEBA IHB1YmxpYzoKIAogICAgIGJvb2wgaXNUZW1wb3JhcmlseUFsbG93aW5nSW5saW5lUGxheWJhY2tB ZnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7cmV0dXJuIG1fdGVtcG9yYXJpbHlBbGxvd2luZ0lubGlu ZVBsYXliYWNrQWZ0ZXJGdWxsc2NyZWVuOyB9CiAKKyAgICB2b2lkIGlzVmlzaWJsZUluVmlld3Bv cnRDaGFuZ2VkKCk7CisKIHByb3RlY3RlZDoKICAgICBIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1 YWxpZmllZE5hbWUmLCBEb2N1bWVudCYsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKTsKICAgICB2aXJ0 dWFsIH5IVE1MTWVkaWFFbGVtZW50KCk7CkBAIC04MTMsNyArODE1LDYgQEAgcHJpdmF0ZToKICNl bmRpZgogCiAgICAgYm9vbCBpc1ZpZGVvVG9vU21hbGxGb3JJbmxpbmVQbGF5YmFjaygpOwotICAg IHZvaWQgaXNWaXNpYmxlSW5WaWV3cG9ydENoYW5nZWQoKSBmaW5hbDsKICAgICB2b2lkIHVwZGF0 ZVNob3VsZEF1dG9wbGF5KCk7CiAKICAgICB2b2lkIHBhdXNlQWZ0ZXJEZXRhY2hlZFRhc2soKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAJKHJldmlz aW9uIDIxNDMwNSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYgKzExNCw4IEBAIGlubGluZSBSZW5kZXJFbGVtZW50 OjpSZW5kZXJFbGVtZW50KENvbnQKICAgICAsIG1fcmVuZGVyQmxvY2tTaG91bGRGb3JjZVJlbGF5 b3V0Q2hpbGRyZW4oZmFsc2UpCiAgICAgLCBtX3JlbmRlckJsb2NrRmxvd0hhc01hcmt1cFRydW5j YXRpb24oZmFsc2UpCiAgICAgLCBtX3JlbmRlckJsb2NrRmxvd0xpbmVMYXlvdXRQYXRoKFJlbmRl ckJsb2NrRmxvdzo6VW5kZXRlcm1pbmVkUGF0aCkKKyAgICAsIG1faXNSZWdpc3RlcmVkRm9yVmlz aWJsZUluVmlld3BvcnRDYWxsYmFjayhmYWxzZSkKKyAgICAsIG1fdmlzaWJsZUluVmlld3BvcnRT dGF0ZShWaXNpYmlsaXR5VW5rbm93bikKICAgICAsIG1fZmlyc3RDaGlsZChudWxscHRyKQogICAg ICwgbV9sYXN0Q2hpbGQobnVsbHB0cikKICAgICAsIG1fc3R5bGUoV1RGTW92ZShzdHlsZSkpCkBA IC0xMTA2LDggKzExMDgsNyBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OndpbGxCZURlc3Ryb3llZCgp CiAKICAgICBkZXN0cm95TGVmdG92ZXJDaGlsZHJlbigpOwogCi0gICAgaWYgKGlzUmVnaXN0ZXJl ZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2soKSkKLSAgICAgICAgdW5yZWdpc3RlckZvclZp c2libGVJblZpZXdwb3J0Q2FsbGJhY2soKTsKKyAgICB1bnJlZ2lzdGVyRm9yVmlzaWJsZUluVmll d3BvcnRDYWxsYmFjaygpOwogCiAgICAgaWYgKGhhc0NvdW50ZXJOb2RlTWFwKCkpCiAgICAgICAg IFJlbmRlckNvdW50ZXI6OmRlc3Ryb3lDb3VudGVyTm9kZXMoKnRoaXMpOwpAQCAtMTE0NSw5ICsx MTQ2LDYgQEAgdm9pZCBSZW5kZXJFbGVtZW50Ojp3aWxsQmVEZXN0cm95ZWQoKQogICAgIH0KICAg ICBpZiAobV9oYXNQYXVzZWRJbWFnZUFuaW1hdGlvbnMpCiAgICAgICAgIHZpZXcoKS5yZW1vdmVS ZW5kZXJlcldpdGhQYXVzZWRJbWFnZUFuaW1hdGlvbnMoKnRoaXMpOwotCi0gICAgaWYgKGlzUmVn aXN0ZXJlZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2soKSkKLSAgICAgICAgdmlldygpLnVu cmVnaXN0ZXJGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKCp0aGlzKTsKIH0KIAogdm9pZCBS ZW5kZXJFbGVtZW50OjpzZXROZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dChjb25zdCBSZW5k ZXJTdHlsZSogb2xkU3R5bGUpCkBAIC0xNDY3LDMwICsxNDY1LDMzIEBAIHN0YXRpYyBib29sIHNo b3VsZFJlcGFpbnRGb3JJbWFnZUFuaW1hdGkKIAogdm9pZCBSZW5kZXJFbGVtZW50OjpyZWdpc3Rl ckZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2soKQogewotICAgIGlmIChpc1JlZ2lzdGVyZWRG b3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKCkpCisgICAgaWYgKG1faXNSZWdpc3RlcmVkRm9y VmlzaWJsZUluVmlld3BvcnRDYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwotICAgIHNldElzUmVn aXN0ZXJlZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2sodHJ1ZSk7CisgICAgbV9pc1JlZ2lz dGVyZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrID0gdHJ1ZTsKIAogICAgIHZpZXcoKS5y ZWdpc3RlckZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2soKnRoaXMpOwogfQogCiB2b2lkIFJl bmRlckVsZW1lbnQ6OnVucmVnaXN0ZXJGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKCkKIHsK LSAgICBpZiAoIWlzUmVnaXN0ZXJlZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2soKSkKKyAg ICBpZiAoIW1faXNSZWdpc3RlcmVkRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFjaykKICAgICAg ICAgcmV0dXJuOwotICAgIHNldElzUmVnaXN0ZXJlZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJh Y2soZmFsc2UpOworICAgIG1faXNSZWdpc3RlcmVkRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFj ayA9IGZhbHNlOwogCiAgICAgdmlldygpLnVucmVnaXN0ZXJGb3JWaXNpYmxlSW5WaWV3cG9ydENh bGxiYWNrKCp0aGlzKTsKIH0KIAotdm9pZCBSZW5kZXJFbGVtZW50Ojp2aXNpYmxlSW5WaWV3cG9y dFN0YXRlQ2hhbmdlZChWaXNpYmxlSW5WaWV3cG9ydFN0YXRlIHN0YXRlKQordm9pZCBSZW5kZXJF bGVtZW50OjpzZXRWaXNpYmxlSW5WaWV3cG9ydFN0YXRlKFZpc2libGVJblZpZXdwb3J0U3RhdGUg c3RhdGUpCiB7Ci0gICAgaWYgKHN0YXRlID09IHZpc2libGVJblZpZXdwb3J0U3RhdGUoKSkKKyAg ICBpZiAoc3RhdGUgPT0gbV92aXNpYmxlSW5WaWV3cG9ydFN0YXRlKQogICAgICAgICByZXR1cm47 Ci0gICAgc2V0VmlzaWJsZUluVmlld3BvcnRTdGF0ZShzdGF0ZSk7CisgICAgbV92aXNpYmxlSW5W aWV3cG9ydFN0YXRlID0gc3RhdGU7CisgICAgdmlzaWJsZUluVmlld3BvcnRTdGF0ZUNoYW5nZWQo KTsKK30KIAotICAgIGlmIChlbGVtZW50KCkpCi0gICAgICAgIGVsZW1lbnQoKS0+aXNWaXNpYmxl SW5WaWV3cG9ydENoYW5nZWQoKTsKK3ZvaWQgUmVuZGVyRWxlbWVudDo6dmlzaWJsZUluVmlld3Bv cnRTdGF0ZUNoYW5nZWQoKQoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiB2b2lk IFJlbmRlckVsZW1lbnQ6Om5ld0ltYWdlQW5pbWF0aW9uRnJhbWVBdmFpbGFibGUoQ2FjaGVkSW1h Z2UmIGltYWdlKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5o CShyZXZpc2lvbiAyMTQzMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxl bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODUsNyArMTg1LDE1IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgcmVnaXN0ZXJGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKCk7CiAgICAgdm9pZCB1 bnJlZ2lzdGVyRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFjaygpOwotICAgIHZvaWQgdmlzaWJs ZUluVmlld3BvcnRTdGF0ZUNoYW5nZWQoVmlzaWJsZUluVmlld3BvcnRTdGF0ZSk7CisKKyAgICBl bnVtIFZpc2libGVJblZpZXdwb3J0U3RhdGUgeworICAgICAgICBWaXNpYmlsaXR5VW5rbm93biwK KyAgICAgICAgVmlzaWJsZUluVmlld3BvcnQsCisgICAgICAgIE5vdFZpc2libGVJblZpZXdwb3J0 LAorICAgIH07CisgICAgVmlzaWJsZUluVmlld3BvcnRTdGF0ZSB2aXNpYmxlSW5WaWV3cG9ydFN0 YXRlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8VmlzaWJsZUluVmlld3BvcnRTdGF0ZT4o bV92aXNpYmxlSW5WaWV3cG9ydFN0YXRlKTsgfQorICAgIHZvaWQgc2V0VmlzaWJsZUluVmlld3Bv cnRTdGF0ZShWaXNpYmxlSW5WaWV3cG9ydFN0YXRlKTsKKyAgICB2aXJ0dWFsIHZvaWQgdmlzaWJs ZUluVmlld3BvcnRTdGF0ZUNoYW5nZWQoKTsKIAogICAgIGJvb2wgcmVwYWludEZvclBhdXNlZElt YWdlQW5pbWF0aW9uc0lmTmVlZGVkKGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0KTsKICAgICBi b29sIGhhc1BhdXNlZEltYWdlQW5pbWF0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1faGFzUGF1c2Vk SW1hZ2VBbmltYXRpb25zOyB9CkBAIC0zMzcsNiArMzQ1LDkgQEAgcHJpdmF0ZToKICAgICB1bnNp Z25lZCBtX3JlbmRlckJsb2NrRmxvd0hhc01hcmt1cFRydW5jYXRpb24gOiAxOwogICAgIHVuc2ln bmVkIG1fcmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBhdGggOiAyOwogCisgICAgdW5zaWduZWQg bV9pc1JlZ2lzdGVyZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrIDogMTsKKyAgICB1bnNp Z25lZCBtX3Zpc2libGVJblZpZXdwb3J0U3RhdGUgOiAyOworCiAgICAgUmVuZGVyT2JqZWN0KiBt X2ZpcnN0Q2hpbGQ7CiAgICAgUmVuZGVyT2JqZWN0KiBtX2xhc3RDaGlsZDsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDIxNDMwNSkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xOTg1LDE4ICsxOTg1LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnNldEhhc091dGxp bmVBdXRvQW5jZQogICAgICAgICBlbnN1cmVSYXJlRGF0YSgpLnNldEhhc091dGxpbmVBdXRvQW5j ZXN0b3IoaGFzT3V0bGluZUF1dG9BbmNlc3Rvcik7CiB9CiAKLXZvaWQgUmVuZGVyT2JqZWN0Ojpz ZXRJc1JlZ2lzdGVyZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKGJvb2wgcmVnaXN0ZXJl ZCkKLXsKLSAgICBpZiAocmVnaXN0ZXJlZCB8fCBoYXNSYXJlRGF0YSgpKQotICAgICAgICBlbnN1 cmVSYXJlRGF0YSgpLnNldElzUmVnaXN0ZXJlZEZvclZpc2libGVJblZpZXdwb3J0Q2FsbGJhY2so cmVnaXN0ZXJlZCk7Ci19Ci0KLXZvaWQgUmVuZGVyT2JqZWN0OjpzZXRWaXNpYmxlSW5WaWV3cG9y dFN0YXRlKFZpc2libGVJblZpZXdwb3J0U3RhdGUgdmlzaWJsZSkKLXsKLSAgICBpZiAodmlzaWJs ZSAhPSBWaXNpYmlsaXR5VW5rbm93biB8fCBoYXNSYXJlRGF0YSgpKQotICAgICAgICBlbnN1cmVS YXJlRGF0YSgpLnNldFZpc2libGVJblZpZXdwb3J0U3RhdGUodmlzaWJsZSk7Ci19Ci0KIFJlbmRl ck9iamVjdDo6UmFyZURhdGFNYXAmIFJlbmRlck9iamVjdDo6cmFyZURhdGFNYXAoKQogewogICAg IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSYXJlRGF0YU1hcD4gbWFwOwpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gMjE0MzA1KQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NDYs MTkgKzQ0NiwxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNSZWZsZWN0aW9uKCkgY29uc3QgeyBy ZXR1cm4gbV9iaXRmaWVsZHMuaGFzUmFyZURhdGEoKSAmJiByYXJlRGF0YSgpLmhhc1JlZmxlY3Rp b24oKTsgfQogICAgIGJvb2wgaXNSZW5kZXJGbG93VGhyZWFkKCkgY29uc3QgeyByZXR1cm4gbV9i aXRmaWVsZHMuaGFzUmFyZURhdGEoKSAmJiByYXJlRGF0YSgpLmlzUmVuZGVyRmxvd1RocmVhZCgp OyB9CiAgICAgYm9vbCBoYXNPdXRsaW5lQXV0b0FuY2VzdG9yKCkgY29uc3QgeyByZXR1cm4gbV9i aXRmaWVsZHMuaGFzUmFyZURhdGEoKSAmJiByYXJlRGF0YSgpLmhhc091dGxpbmVBdXRvQW5jZXN0 b3IoKTsgfQotICAgIGJvb2wgaXNSZWdpc3RlcmVkRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFj aygpIHsgcmV0dXJuIG1fYml0ZmllbGRzLmhhc1JhcmVEYXRhKCkgJiYgcmFyZURhdGEoKS5pc1Jl Z2lzdGVyZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKCk7IH0KIAogICAgIGJvb2wgaXNF eGNsdWRlZEZyb21Ob3JtYWxMYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX2JpdGZpZWxkcy5pc0V4 Y2x1ZGVkRnJvbU5vcm1hbExheW91dCgpOyB9CiAgICAgdm9pZCBzZXRJc0V4Y2x1ZGVkRnJvbU5v cm1hbExheW91dChib29sIGV4Y2x1ZGVkKSB7IG1fYml0ZmllbGRzLnNldElzRXhjbHVkZWRGcm9t Tm9ybWFsTGF5b3V0KGV4Y2x1ZGVkKTsgfQogICAgIGJvb2wgaXNFeGNsdWRlZEFuZFBsYWNlZElu Qm9yZGVyKCkgY29uc3QgeyByZXR1cm4gaXNFeGNsdWRlZEZyb21Ob3JtYWxMYXlvdXQoKSAmJiBp c0xlZ2VuZCgpOyB9CiAKLSAgICBlbnVtIFZpc2libGVJblZpZXdwb3J0U3RhdGUgewotICAgICAg ICBWaXNpYmlsaXR5VW5rbm93biwKLSAgICAgICAgVmlzaWJsZUluVmlld3BvcnQsCi0gICAgICAg IE5vdFZpc2libGVJblZpZXdwb3J0LAotICAgIH07Ci0gICAgVmlzaWJsZUluVmlld3BvcnRTdGF0 ZSB2aXNpYmxlSW5WaWV3cG9ydFN0YXRlKCkgeyByZXR1cm4gbV9iaXRmaWVsZHMuaGFzUmFyZURh dGEoKSA/IHJhcmVEYXRhKCkudmlzaWJsZUluVmlld3BvcnRTdGF0ZSgpIDogVmlzaWJpbGl0eVVu a25vd247IH0KLQogICAgIGJvb2wgaGFzTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX2JpdGZpZWxk cy5oYXNMYXllcigpOyB9CiAKICAgICBlbnVtIEJveERlY29yYXRpb25TdGF0ZSB7CkBAIC01Njcs OCArNTU5LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SGFzUmVmbGVjdGlvbihib29sID0gdHJ1 ZSk7CiAgICAgdm9pZCBzZXRJc1JlbmRlckZsb3dUaHJlYWQoYm9vbCA9IHRydWUpOwogICAgIHZv aWQgc2V0SGFzT3V0bGluZUF1dG9BbmNlc3Rvcihib29sID0gdHJ1ZSk7Ci0gICAgdm9pZCBzZXRJ c1JlZ2lzdGVyZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKGJvb2wpOwotICAgIHZvaWQg c2V0VmlzaWJsZUluVmlld3BvcnRTdGF0ZShWaXNpYmxlSW5WaWV3cG9ydFN0YXRlKTsKIAogICAg IC8vIEhvb2sgc28gdGhhdCBSZW5kZXJUZXh0Q29udHJvbCBjYW4gcmV0dXJuIHRoZSBsaW5lIGhl aWdodCBvZiBpdHMgaW5uZXIgcmVuZGVyZXIuCiAgICAgLy8gRm9yIG90aGVyIHJlbmRlcmVycywg dGhlIHZhbHVlIGlzIHRoZSBzYW1lIGFzIGxpbmVIZWlnaHQoZmFsc2UpLgpAQCAtOTgyLDggKzk3 Miw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAsIG1faGFzUmVmbGVjdGlvbihmYWxzZSkKICAg ICAgICAgICAgICwgbV9pc1JlbmRlckZsb3dUaHJlYWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1f aGFzT3V0bGluZUF1dG9BbmNlc3RvcihmYWxzZSkKLSAgICAgICAgICAgICwgbV9pc1JlZ2lzdGVy ZWRGb3JWaXNpYmxlSW5WaWV3cG9ydENhbGxiYWNrKGZhbHNlKQotICAgICAgICAgICAgLCBtX3Zp c2libGVJblZpZXdwb3J0U3RhdGUoVmlzaWJpbGl0eVVua25vd24pCiAgICAgICAgIHsKICAgICAg ICAgfQogICAgICAgICBBRERfQk9PTEVBTl9CSVRGSUVMRChpc0RyYWdnaW5nLCBJc0RyYWdnaW5n KTsKQEAgLTk5Miw4ICs5ODAsNiBAQCBwcml2YXRlOgogICAgICAgICBBRERfQk9PTEVBTl9CSVRG SUVMRChoYXNPdXRsaW5lQXV0b0FuY2VzdG9yLCBIYXNPdXRsaW5lQXV0b0FuY2VzdG9yKTsKIAog ICAgICAgICAvLyBGcm9tIFJlbmRlckVsZW1lbnQKLSAgICAgICAgQUREX0JPT0xFQU5fQklURklF TEQoaXNSZWdpc3RlcmVkRm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFjaywgSXNSZWdpc3RlcmVk Rm9yVmlzaWJsZUluVmlld3BvcnRDYWxsYmFjayk7Ci0gICAgICAgIEFERF9FTlVNX0JJVEZJRUxE KHZpc2libGVJblZpZXdwb3J0U3RhdGUsIFZpc2libGVJblZpZXdwb3J0U3RhdGUsIFZpc2libGVJ blZpZXdwb3J0U3RhdGUsIDIpOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+ IGNhY2hlZEZpcnN0TGluZVN0eWxlOwogICAgIH07CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAJKHJldmlzaW9uIDIxNDMwNSkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3LDYg KzY3LDExIEBAIHZvaWQgUmVuZGVyVmlkZW86OndpbGxCZURlc3Ryb3llZCgpCiAgICAgUmVuZGVy TWVkaWE6OndpbGxCZURlc3Ryb3llZCgpOwogfQogCit2b2lkIFJlbmRlclZpZGVvOjp2aXNpYmxl SW5WaWV3cG9ydFN0YXRlQ2hhbmdlZCgpCit7CisgICAgdmlkZW9FbGVtZW50KCkuaXNWaXNpYmxl SW5WaWV3cG9ydENoYW5nZWQoKTsKK30KKwogSW50U2l6ZSBSZW5kZXJWaWRlbzo6ZGVmYXVsdFNp emUoKQogewogICAgIC8vIFRoZXNlIHZhbHVlcyBhcmUgc3BlY2lmaWVkIGluIHRoZSBzcGVjLgpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmgJKHJldmlzaW9uIDIxNDMw NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5oCSh3b3JraW5nIGNv cHkpCkBAIC03MSw2ICs3MSw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGxheW91dCgpIGZpbmFs OwogCisgICAgdm9pZCB2aXNpYmxlSW5WaWV3cG9ydFN0YXRlQ2hhbmdlZCgpIGZpbmFsOworCiAg ICAgTGF5b3V0VW5pdCBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVBy ZWZlcnJlZCAgPSBDb21wdXRlQWN0dWFsKSBjb25zdCBmaW5hbDsKICAgICBMYXlvdXRVbml0IG1p bmltdW1SZXBsYWNlZEhlaWdodCgpIGNvbnN0IGZpbmFsOwogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZpc2lvbiAyMTQzMDUpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzODksOCAr MTM4OSwxMCBAQCB2b2lkIFJlbmRlclZpZXc6OnVwZGF0ZVZpc2libGVWaWV3cG9ydFJlCiB7CiAg ICAgcmVzdW1lUGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQodmlzaWJsZVJlY3QpOwogCi0g ICAgZm9yIChhdXRvKiByZW5kZXJlciA6IG1fdmlzaWJsZUluVmlld3BvcnRSZW5kZXJlcnMpCi0g ICAgICAgIHJlbmRlcmVyLT52aXNpYmxlSW5WaWV3cG9ydFN0YXRlQ2hhbmdlZCh2aXNpYmxlUmVj dC5pbnRlcnNlY3RzKGVuY2xvc2luZ0ludFJlY3QocmVuZGVyZXItPmFic29sdXRlQ2xpcHBlZE92 ZXJmbG93UmVjdCgpKSkgPyBSZW5kZXJFbGVtZW50OjpWaXNpYmxlSW5WaWV3cG9ydCA6IFJlbmRl ckVsZW1lbnQ6Ok5vdFZpc2libGVJblZpZXdwb3J0KTsKKyAgICBmb3IgKGF1dG8qIHJlbmRlcmVy IDogbV92aXNpYmxlSW5WaWV3cG9ydFJlbmRlcmVycykgeworICAgICAgICBhdXRvIHN0YXRlID0g dmlzaWJsZVJlY3QuaW50ZXJzZWN0cyhlbmNsb3NpbmdJbnRSZWN0KHJlbmRlcmVyLT5hYnNvbHV0 ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKSkpID8gUmVuZGVyRWxlbWVudDo6VmlzaWJsZUluVmlld3Bv cnQgOiBSZW5kZXJFbGVtZW50OjpOb3RWaXNpYmxlSW5WaWV3cG9ydDsKKyAgICAgICAgcmVuZGVy ZXItPnNldFZpc2libGVJblZpZXdwb3J0U3RhdGUoc3RhdGUpOworICAgIH0KIH0KIAogdm9pZCBS ZW5kZXJWaWV3OjphZGRSZW5kZXJlcldpdGhQYXVzZWRJbWFnZUFuaW1hdGlvbnMoUmVuZGVyRWxl bWVudCYgcmVuZGVyZXIpCg==