184794 2018-04-19 14:24:46 -0700 Don't use RenderTreeBuilder::current() in RenderTreeUpdater 2018-04-19 15:32:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1416060 0 koivisto 2018-04-19 14:24:46 -0700 Pass the builder as a parameter where needed. 1416065 1 338358 koivisto 2018-04-19 14:27:16 -0700 Created attachment 338358 patch 1416093 2 338358 commit-queue 2018-04-19 15:31:11 -0700 Comment on attachment 338358 patch Clearing flags on attachment: 338358 Committed r230823: <https://trac.webkit.org/changeset/230823> 1416094 3 commit-queue 2018-04-19 15:31:12 -0700 All reviewed patches have been landed. Closing bug. 1416095 4 webkit-bug-importer 2018-04-19 15:32:36 -0700 <rdar://problem/39579009> 338358 2018-04-19 14:27:16 -0700 2018-04-19 15:31:11 -0700 patch teardown-builder.patch text/plain 11101 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDgxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA0LTE5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCB1c2UgUmVuZGVyVHJl ZUJ1aWxkZXI6OmN1cnJlbnQoKSBpbiBSZW5kZXJUcmVlVXBkYXRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0Nzk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFzcyB0aGUgYnVpbGRlciBhcyBhIHBh cmFtZXRlciB3aGVyZSBuZWVkZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZVVwZGF0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6 OnVwZGF0ZUVsZW1lbnRSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlVXBk YXRlcjo6dXBkYXRlVGV4dFJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVV cGRhdGVyOjp0ZWFyRG93blJlbmRlcmVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVl VXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVl VXBkYXRlcjo6dGVhckRvd25UZXh0UmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VHJlZVVwZGF0ZXI6OnRlYXJEb3duTGVmdG92ZXJQYWdpbmF0aW9uUmVuZGVyZXJzSWZOZWVkZWQp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3duTGVmdG92ZXJT aGFkb3dIb3N0Q2hpbGRyZW4pOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlVXBkYXRlci5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBk YXRlckdlbmVyYXRlZENvbnRlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVw ZGF0ZXI6OkdlbmVyYXRlZENvbnRlbnQ6OnVwZGF0ZVBzZXVkb0VsZW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6OkdlbmVyYXRlZENvbnRlbnQ6OnJlbW92ZUJlZm9y ZVBzZXVkb0VsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6Okdl bmVyYXRlZENvbnRlbnQ6OnJlbW92ZUFmdGVyUHNldWRvRWxlbWVudCk6CisgICAgICAgICogcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyR2VuZXJhdGVkQ29udGVudC5oOgorCiAy MDE4LTA0LTE5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIFtFeHRyYSB6b29tIG1vZGVdIEFkZCBhIG1lY2hhbmlzbSB0byBleHRlbmQgdGhlIGhlaWdo dCBvZiB0aGUgbGF5b3V0IHZpZXdwb3J0IGluIGV4dHJhIHpvb20gbW9kZQpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0 ZXIuY3BwCShyZXZpc2lvbiAyMzA4MTApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNyArMzE4 LDcgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlRWxlbWVudFJlbgogCiAgICAgICAg IC8vIGRpc3BsYXk6bm9uZSBjYW5jZWxzIGFuaW1hdGlvbnMuCiAgICAgICAgIGF1dG8gdGVhcmRv d25UeXBlID0gdXBkYXRlLnN0eWxlLT5kaXNwbGF5KCkgPT0gTk9ORSA/IFRlYXJkb3duVHlwZTo6 UmVuZGVyZXJVcGRhdGVDYW5jZWxpbmdBbmltYXRpb25zIDogVGVhcmRvd25UeXBlOjpSZW5kZXJl clVwZGF0ZTsKLSAgICAgICAgdGVhckRvd25SZW5kZXJlcnMoZWxlbWVudCwgdGVhcmRvd25UeXBl KTsKKyAgICAgICAgdGVhckRvd25SZW5kZXJlcnMoZWxlbWVudCwgdGVhcmRvd25UeXBlLCBtX2J1 aWxkZXIpOwogCiAgICAgICAgIHJlbmRlcmluZ1BhcmVudCgpLmRpZENyZWF0ZU9yRGVzdHJveUNo aWxkUmVuZGVyZXIgPSB0cnVlOwogICAgIH0KQEAgLTQ4NCw3ICs0ODQsNyBAQCB2b2lkIFJlbmRl clRyZWVVcGRhdGVyOjp1cGRhdGVUZXh0UmVuZGVyCiAgICAgaWYgKGV4aXN0aW5nUmVuZGVyZXIg JiYgdGV4dFVwZGF0ZSAmJiB0ZXh0VXBkYXRlLT5pbmhlcml0ZWREaXNwbGF5Q29udGVudHNTdHls ZSkgewogICAgICAgICBpZiAoZXhpc3RpbmdSZW5kZXJlci0+aW5saW5lV3JhcHBlckZvckRpc3Bs YXlDb250ZW50cygpIHx8ICp0ZXh0VXBkYXRlLT5pbmhlcml0ZWREaXNwbGF5Q29udGVudHNTdHls ZSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFdlIGNvdWxkIHVwZGF0ZSB3aXRob3V0IHRlYXJk b3duLgotICAgICAgICAgICAgdGVhckRvd25UZXh0UmVuZGVyZXIodGV4dCk7CisgICAgICAgICAg ICB0ZWFyRG93blRleHRSZW5kZXJlcih0ZXh0LCBtX2J1aWxkZXIpOwogICAgICAgICAgICAgZXhp c3RpbmdSZW5kZXJlciA9IG51bGxwdHI7CiAgICAgICAgIH0KICAgICB9CkBAIC00OTUsNyArNDk1 LDcgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlVGV4dFJlbmRlcgogICAgICAgICAg ICAgICAgIGV4aXN0aW5nUmVuZGVyZXItPnNldFRleHRXaXRoT2Zmc2V0KHRleHQuZGF0YSgpLCB0 ZXh0VXBkYXRlLT5vZmZzZXQsIHRleHRVcGRhdGUtPmxlbmd0aCk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KLSAgICAgICAgdGVhckRvd25UZXh0UmVuZGVyZXIodGV4dCk7CisgICAg ICAgIHRlYXJEb3duVGV4dFJlbmRlcmVyKHRleHQsIG1fYnVpbGRlcik7CiAgICAgICAgIHJlbmRl cmluZ1BhcmVudCgpLmRpZENyZWF0ZU9yRGVzdHJveUNoaWxkUmVuZGVyZXIgPSB0cnVlOwogICAg ICAgICByZXR1cm47CiAgICAgfQpAQCAtNTIwLDcgKzUyMCw3IEBAIHZvaWQgUmVuZGVyVHJlZVVw ZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybjsK ICAgICBSZW5kZXJUcmVlQnVpbGRlciBidWlsZGVyKCp2aWV3KTsKLSAgICB0ZWFyRG93blJlbmRl cmVycyhyb290LCBUZWFyZG93blR5cGU6OkZ1bGwpOworICAgIHRlYXJEb3duUmVuZGVyZXJzKHJv b3QsIFRlYXJkb3duVHlwZTo6RnVsbCwgYnVpbGRlcik7CiB9CiAKIHZvaWQgUmVuZGVyVHJlZVVw ZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIoVGV4dCYgdGV4dCkKQEAgLTUyOSwxMCArNTI5LDEwIEBA IHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIKICAgICBpZiAoIXZpZXcp CiAgICAgICAgIHJldHVybjsKICAgICBSZW5kZXJUcmVlQnVpbGRlciBidWlsZGVyKCp2aWV3KTsK LSAgICB0ZWFyRG93blRleHRSZW5kZXJlcih0ZXh0KTsKKyAgICB0ZWFyRG93blRleHRSZW5kZXJl cih0ZXh0LCBidWlsZGVyKTsKIH0KIAotdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25S ZW5kZXJlcnMoRWxlbWVudCYgcm9vdCwgVGVhcmRvd25UeXBlIHRlYXJkb3duVHlwZSkKK3ZvaWQg UmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXJzKEVsZW1lbnQmIHJvb3QsIFRlYXJk b3duVHlwZSB0ZWFyZG93blR5cGUsIFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyKQogewogICAg IFdpZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJh cmNoeVVwZGF0ZXM7CiAKQEAgLTU2MywxNyArNTYzLDE3IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0 ZXI6OnRlYXJEb3duUmVuZGVyZXIKICAgICAgICAgICAgIGlmICh0ZWFyZG93blR5cGUgPT0gVGVh cmRvd25UeXBlOjpGdWxsKQogICAgICAgICAgICAgICAgIGVsZW1lbnQuY2xlYXJIb3ZlckFuZEFj dGl2ZVN0YXR1c0JlZm9yZURldGFjaGluZ1JlbmRlcmVyKCk7CiAKLSAgICAgICAgICAgIEdlbmVy YXRlZENvbnRlbnQ6OnJlbW92ZUJlZm9yZVBzZXVkb0VsZW1lbnQoZWxlbWVudCk7Ci0gICAgICAg ICAgICBHZW5lcmF0ZWRDb250ZW50OjpyZW1vdmVBZnRlclBzZXVkb0VsZW1lbnQoZWxlbWVudCk7 CisgICAgICAgICAgICBHZW5lcmF0ZWRDb250ZW50OjpyZW1vdmVCZWZvcmVQc2V1ZG9FbGVtZW50 KGVsZW1lbnQsIGJ1aWxkZXIpOworICAgICAgICAgICAgR2VuZXJhdGVkQ29udGVudDo6cmVtb3Zl QWZ0ZXJQc2V1ZG9FbGVtZW50KGVsZW1lbnQsIGJ1aWxkZXIpOwogCiAgICAgICAgICAgICBpZiAo YXV0byogcmVuZGVyZXIgPSBlbGVtZW50LnJlbmRlcmVyKCkpIHsKLSAgICAgICAgICAgICAgICBS ZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpLT5kZXN0cm95QW5kQ2xlYW5VcEFub255bW91c1dy YXBwZXJzKCpyZW5kZXJlcik7CisgICAgICAgICAgICAgICAgYnVpbGRlci5kZXN0cm95QW5kQ2xl YW5VcEFub255bW91c1dyYXBwZXJzKCpyZW5kZXJlcik7CiAgICAgICAgICAgICAgICAgZWxlbWVu dC5zZXRSZW5kZXJlcihudWxscHRyKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8g TWFrZSBzdXJlIHdlIGRvbid0IGxlYXZlIGFueSByZW5kZXJlcnMgYmVoaW5kIGluIG5vZGVzIG91 dHNpZGUgdGhlIGNvbXBvc2VkIHRyZWUuCiAgICAgICAgICAgICBpZiAoZWxlbWVudC5zaGFkb3dS b290KCkpCi0gICAgICAgICAgICAgICAgdGVhckRvd25MZWZ0b3ZlclNoYWRvd0hvc3RDaGlsZHJl bihlbGVtZW50KTsKKyAgICAgICAgICAgICAgICB0ZWFyRG93bkxlZnRvdmVyU2hhZG93SG9zdENo aWxkcmVuKGVsZW1lbnQsIGJ1aWxkZXIpOwogCiAgICAgICAgICAgICBpZiAoZWxlbWVudC5oYXND dXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3MoKSkKICAgICAgICAgICAgICAgICBlbGVtZW50LmRp ZERldGFjaFJlbmRlcmVycygpOwpAQCAtNTg3LDcgKzU4Nyw3IEBAIHZvaWQgUmVuZGVyVHJlZVVw ZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIKICAgICAgICAgcG9wKGl0LmRlcHRoKCkpOwogCiAgICAg ICAgIGlmIChpczxUZXh0PigqaXQpKSB7Ci0gICAgICAgICAgICB0ZWFyRG93blRleHRSZW5kZXJl cihkb3duY2FzdDxUZXh0PigqaXQpKTsKKyAgICAgICAgICAgIHRlYXJEb3duVGV4dFJlbmRlcmVy KGRvd25jYXN0PFRleHQ+KCppdCksIGJ1aWxkZXIpOwogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIH0KIApAQCAtNTk2LDQxICs1OTYsNDEgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6 dGVhckRvd25SZW5kZXJlcgogCiAgICAgcG9wKDApOwogCi0gICAgdGVhckRvd25MZWZ0b3ZlclBh Z2luYXRpb25SZW5kZXJlcnNJZk5lZWRlZChyb290KTsKKyAgICB0ZWFyRG93bkxlZnRvdmVyUGFn aW5hdGlvblJlbmRlcmVyc0lmTmVlZGVkKHJvb3QsIGJ1aWxkZXIpOwogfQogCi12b2lkIFJlbmRl clRyZWVVcGRhdGVyOjp0ZWFyRG93blRleHRSZW5kZXJlcihUZXh0JiB0ZXh0KQordm9pZCBSZW5k ZXJUcmVlVXBkYXRlcjo6dGVhckRvd25UZXh0UmVuZGVyZXIoVGV4dCYgdGV4dCwgUmVuZGVyVHJl ZUJ1aWxkZXImIGJ1aWxkZXIpCiB7CiAgICAgYXV0byogcmVuZGVyZXIgPSB0ZXh0LnJlbmRlcmVy KCk7CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwotICAgIFJlbmRlclRyZWVC dWlsZGVyOjpjdXJyZW50KCktPmRlc3Ryb3lBbmRDbGVhblVwQW5vbnltb3VzV3JhcHBlcnMoKnJl bmRlcmVyKTsKKyAgICBidWlsZGVyLmRlc3Ryb3lBbmRDbGVhblVwQW5vbnltb3VzV3JhcHBlcnMo KnJlbmRlcmVyKTsKICAgICB0ZXh0LnNldFJlbmRlcmVyKG51bGxwdHIpOwogfQogCi12b2lkIFJl bmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93bkxlZnRvdmVyUGFnaW5hdGlvblJlbmRlcmVyc0lmTmVl ZGVkKEVsZW1lbnQmIHJvb3QpCit2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93bkxlZnRv dmVyUGFnaW5hdGlvblJlbmRlcmVyc0lmTmVlZGVkKEVsZW1lbnQmIHJvb3QsIFJlbmRlclRyZWVC dWlsZGVyJiBidWlsZGVyKQogewogICAgIGlmICgmcm9vdCAhPSByb290LmRvY3VtZW50KCkuZG9j dW1lbnRFbGVtZW50KCkpCiAgICAgICAgIHJldHVybjsKICAgICBmb3IgKGF1dG8qIGNoaWxkID0g cm9vdC5kb2N1bWVudCgpLnJlbmRlclZpZXcoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDspIHsKICAg ICAgICAgYXV0byogbmV4dFNpYmxpbmcgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKTsKICAgICAgICAg aWYgKGlzPFJlbmRlck11bHRpQ29sdW1uRmxvdz4oKmNoaWxkKSB8fCBpczxSZW5kZXJNdWx0aUNv bHVtblNldD4oKmNoaWxkKSkKLSAgICAgICAgICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50 KCktPmRlc3Ryb3lBbmRDbGVhblVwQW5vbnltb3VzV3JhcHBlcnMoKmNoaWxkKTsKKyAgICAgICAg ICAgIGJ1aWxkZXIuZGVzdHJveUFuZENsZWFuVXBBbm9ueW1vdXNXcmFwcGVycygqY2hpbGQpOwog ICAgICAgICBjaGlsZCA9IG5leHRTaWJsaW5nOwogICAgIH0KIH0KIAotdm9pZCBSZW5kZXJUcmVl VXBkYXRlcjo6dGVhckRvd25MZWZ0b3ZlclNoYWRvd0hvc3RDaGlsZHJlbihFbGVtZW50JiBob3N0 KQordm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25MZWZ0b3ZlclNoYWRvd0hvc3RDaGls ZHJlbihFbGVtZW50JiBob3N0LCBSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKIHsKICAgICBm b3IgKGF1dG8qIGhvc3RDaGlsZCA9IGhvc3QuZmlyc3RDaGlsZCgpOyBob3N0Q2hpbGQ7IGhvc3RD aGlsZCA9IGhvc3RDaGlsZC0+bmV4dFNpYmxpbmcoKSkgewogICAgICAgICBpZiAoIWhvc3RDaGls ZC0+cmVuZGVyZXIoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoaXM8VGV4 dD4oKmhvc3RDaGlsZCkpIHsKLSAgICAgICAgICAgIHRlYXJEb3duVGV4dFJlbmRlcmVyKGRvd25j YXN0PFRleHQ+KCpob3N0Q2hpbGQpKTsKKyAgICAgICAgICAgIHRlYXJEb3duVGV4dFJlbmRlcmVy KGRvd25jYXN0PFRleHQ+KCpob3N0Q2hpbGQpLCBidWlsZGVyKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChpczxFbGVtZW50PigqaG9zdENoaWxkKSkKLSAg ICAgICAgICAgIHRlYXJEb3duUmVuZGVyZXJzKGRvd25jYXN0PEVsZW1lbnQ+KCpob3N0Q2hpbGQp LCBUZWFyZG93blR5cGU6OkZ1bGwpOworICAgICAgICAgICAgdGVhckRvd25SZW5kZXJlcnMoZG93 bmNhc3Q8RWxlbWVudD4oKmhvc3RDaGlsZCksIFRlYXJkb3duVHlwZTo6RnVsbCwgYnVpbGRlcik7 CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZVVwZGF0ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXIuaAkocmV2aXNpb24gMjMwODEwKQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTg3LDEwICs4NywxMCBAQCBwcml2YXRlOgogICAgIHZvaWQgcG9wUGFyZW50c1Rv RGVwdGgodW5zaWduZWQgZGVwdGgpOwogCiAgICAgZW51bSBjbGFzcyBUZWFyZG93blR5cGUgeyBG dWxsLCBSZW5kZXJlclVwZGF0ZSwgUmVuZGVyZXJVcGRhdGVDYW5jZWxpbmdBbmltYXRpb25zIH07 Ci0gICAgc3RhdGljIHZvaWQgdGVhckRvd25SZW5kZXJlcnMoRWxlbWVudCYsIFRlYXJkb3duVHlw ZSk7Ci0gICAgc3RhdGljIHZvaWQgdGVhckRvd25UZXh0UmVuZGVyZXIoVGV4dCYpOwotICAgIHN0 YXRpYyB2b2lkIHRlYXJEb3duTGVmdG92ZXJTaGFkb3dIb3N0Q2hpbGRyZW4oRWxlbWVudCYpOwot ICAgIHN0YXRpYyB2b2lkIHRlYXJEb3duTGVmdG92ZXJQYWdpbmF0aW9uUmVuZGVyZXJzSWZOZWVk ZWQoRWxlbWVudCYpOworICAgIHN0YXRpYyB2b2lkIHRlYXJEb3duUmVuZGVyZXJzKEVsZW1lbnQm LCBUZWFyZG93blR5cGUsIFJlbmRlclRyZWVCdWlsZGVyJik7CisgICAgc3RhdGljIHZvaWQgdGVh ckRvd25UZXh0UmVuZGVyZXIoVGV4dCYsIFJlbmRlclRyZWVCdWlsZGVyJik7CisgICAgc3RhdGlj IHZvaWQgdGVhckRvd25MZWZ0b3ZlclNoYWRvd0hvc3RDaGlsZHJlbihFbGVtZW50JiwgUmVuZGVy VHJlZUJ1aWxkZXImKTsKKyAgICBzdGF0aWMgdm9pZCB0ZWFyRG93bkxlZnRvdmVyUGFnaW5hdGlv blJlbmRlcmVyc0lmTmVlZGVkKEVsZW1lbnQmLCBSZW5kZXJUcmVlQnVpbGRlciYpOwogCiAgICAg UmVuZGVyVmlldyYgcmVuZGVyVmlldygpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXJHZW5lcmF0ZWRDb250ZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0 ZXJHZW5lcmF0ZWRDb250ZW50LmNwcAkocmV2aXNpb24gMjMwODEwKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyR2VuZXJhdGVkQ29udGVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTk5LDkgKzk5LDkgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRl cjo6R2VuZXJhdGVkQ29udGVudAogICAgIGlmICghbmVlZHNQc2V1ZG9FbGVtZW50KHVwZGF0ZSkp IHsKICAgICAgICAgaWYgKHBzZXVkb0VsZW1lbnQpIHsKICAgICAgICAgICAgIGlmIChwc2V1ZG9J ZCA9PSBCRUZPUkUpCi0gICAgICAgICAgICAgICAgcmVtb3ZlQmVmb3JlUHNldWRvRWxlbWVudChj dXJyZW50KTsKKyAgICAgICAgICAgICAgICByZW1vdmVCZWZvcmVQc2V1ZG9FbGVtZW50KGN1cnJl bnQsIG1fdXBkYXRlci5tX2J1aWxkZXIpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIHJlbW92ZUFmdGVyUHNldWRvRWxlbWVudChjdXJyZW50KTsKKyAgICAgICAgICAgICAgICBy ZW1vdmVBZnRlclBzZXVkb0VsZW1lbnQoY3VycmVudCwgbV91cGRhdGVyLm1fYnVpbGRlcik7CiAg ICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE2NSwyMSArMTY1LDIxIEBAIGJv b2wgUmVuZGVyVHJlZVVwZGF0ZXI6OkdlbmVyYXRlZENvbnRlbnQKICAgICByZXR1cm4gdHJ1ZTsK IH0KIAotdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6R2VuZXJhdGVkQ29udGVudDo6cmVtb3ZlQmVm b3JlUHNldWRvRWxlbWVudChFbGVtZW50JiBlbGVtZW50KQordm9pZCBSZW5kZXJUcmVlVXBkYXRl cjo6R2VuZXJhdGVkQ29udGVudDo6cmVtb3ZlQmVmb3JlUHNldWRvRWxlbWVudChFbGVtZW50JiBl bGVtZW50LCBSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKIHsKICAgICBhdXRvKiBwc2V1ZG9F bGVtZW50ID0gZWxlbWVudC5iZWZvcmVQc2V1ZG9FbGVtZW50KCk7CiAgICAgaWYgKCFwc2V1ZG9F bGVtZW50KQogICAgICAgICByZXR1cm47Ci0gICAgdGVhckRvd25SZW5kZXJlcnMoKnBzZXVkb0Vs ZW1lbnQsIFRlYXJkb3duVHlwZTo6RnVsbCk7CisgICAgdGVhckRvd25SZW5kZXJlcnMoKnBzZXVk b0VsZW1lbnQsIFRlYXJkb3duVHlwZTo6RnVsbCwgYnVpbGRlcik7CiAgICAgZWxlbWVudC5jbGVh ckJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKIH0KIAotdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6R2Vu ZXJhdGVkQ29udGVudDo6cmVtb3ZlQWZ0ZXJQc2V1ZG9FbGVtZW50KEVsZW1lbnQmIGVsZW1lbnQp Cit2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpHZW5lcmF0ZWRDb250ZW50OjpyZW1vdmVBZnRlclBz ZXVkb0VsZW1lbnQoRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIp CiB7CiAgICAgYXV0byogcHNldWRvRWxlbWVudCA9IGVsZW1lbnQuYWZ0ZXJQc2V1ZG9FbGVtZW50 KCk7CiAgICAgaWYgKCFwc2V1ZG9FbGVtZW50KQogICAgICAgICByZXR1cm47Ci0gICAgdGVhckRv d25SZW5kZXJlcnMoKnBzZXVkb0VsZW1lbnQsIFRlYXJkb3duVHlwZTo6RnVsbCk7CisgICAgdGVh ckRvd25SZW5kZXJlcnMoKnBzZXVkb0VsZW1lbnQsIFRlYXJkb3duVHlwZTo6RnVsbCwgYnVpbGRl cik7CiAgICAgZWxlbWVudC5jbGVhckFmdGVyUHNldWRvRWxlbWVudCgpOwogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXJHZW5lcmF0 ZWRDb250ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVVcGRhdGVyR2VuZXJhdGVkQ29udGVudC5oCShyZXZpc2lvbiAyMzA4MTAp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXJH ZW5lcmF0ZWRDb250ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDggKzQxLDggQEAgcHVibGlj OgogICAgIHZvaWQgdXBkYXRlUHNldWRvRWxlbWVudChFbGVtZW50JiwgY29uc3Qgc3RkOjpvcHRp b25hbDxTdHlsZTo6RWxlbWVudFVwZGF0ZT4mLCBQc2V1ZG9JZCk7CiAgICAgdm9pZCB1cGRhdGVS ZW1haW5pbmdRdW90ZXMoKTsKIAotICAgIHN0YXRpYyB2b2lkIHJlbW92ZUJlZm9yZVBzZXVkb0Vs ZW1lbnQoRWxlbWVudCYpOwotICAgIHN0YXRpYyB2b2lkIHJlbW92ZUFmdGVyUHNldWRvRWxlbWVu dChFbGVtZW50Jik7CisgICAgc3RhdGljIHZvaWQgcmVtb3ZlQmVmb3JlUHNldWRvRWxlbWVudChF bGVtZW50JiwgUmVuZGVyVHJlZUJ1aWxkZXImKTsKKyAgICBzdGF0aWMgdm9pZCByZW1vdmVBZnRl clBzZXVkb0VsZW1lbnQoRWxlbWVudCYsIFJlbmRlclRyZWVCdWlsZGVyJik7CiAKIHByaXZhdGU6 CiAgICAgdm9pZCB1cGRhdGVRdW90ZXNVcFRvKFJlbmRlclF1b3RlKik7Cg==