175479 2017-08-11 07:26:08 -0700 Remove RenderQuote collection from RenderView 2017-08-11 09:23:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 163848 1 koivisto webkit-unassigned bfulgham commit-queue kling simon.fraser webkit-bug-importer zalan oldest_to_newest 1337882 0 koivisto 2017-08-11 07:26:08 -0700 We can do it well enough without maintaining this pointer structure. Global updating doesn't work well with future direction for first-letter and similar anyway. 1337884 1 317929 koivisto 2017-08-11 07:33:11 -0700 Created attachment 317929 patch 1337901 2 317929 commit-queue 2017-08-11 09:22:47 -0700 Comment on attachment 317929 patch Clearing flags on attachment: 317929 Committed r220594: <http://trac.webkit.org/changeset/220594> 1337902 3 commit-queue 2017-08-11 09:22:49 -0700 All reviewed patches have been landed. Closing bug. 317929 2017-08-11 07:33:11 -0700 2017-08-11 09:22:47 -0700 patch incremental-quote-udpate.patch text/plain 12148 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMDU4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBACisyMDE3LTA4LTExICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgUmVuZGVyUXVvdGUg Y29sbGVjdGlvbiBmcm9tIFJlbmRlclZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3NTQ3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlIGNhbiBkbyBpdCB3ZWxsIGVub3VnaCB3aXRob3V0IG1haW50 YWluaW5nIHRoaXMgcG9pbnRlciBzdHJ1Y3R1cmUuCisKKyAgICAgICAgR2xvYmFsIHVwZGF0aW5n IGRvZXNuJ3Qgd29yayB3ZWxsIHdpdGggZnV0dXJlIGRpcmVjdGlvbiBmb3IgZmlyc3QtbGV0dGVy IGFuZCBzaW1pbGFyIGFueXdheS4KKyAgICAgICAgV2UgbmVlZCB0byB1cGRhdGUgcXVvdGUgaW1t ZWRpYXRlbHkgd2hlbiB1cGRhdGluZyBpdHMgc3R5bGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyUXVvdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUXVvdGU6Omluc2VydGVk SW50b1RyZWUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUXVvdGU6OndpbGxCZVJlbW92ZWRG cm9tVHJlZSk6CisKKyAgICAgICAgICAgIEp1c3QgdGVsbCB0aGUgdmlldyB0aGF0IHRoZXJlIGFy ZSByZW5kZXJlcnMgdG8gdXBkYXRlLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJRdW90ZTo6 c3R5bGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUXVvdGU6OmlzT3BlbiBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJRdW90ZTo6dXBkYXRlUmVuZGVyZXIpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUXVvdGU6OnVwZGF0ZVJlbmRlcmVycyk6IERlbGV0ZWQu CisKKyAgICAgICAgICAgIFVwZGF0ZSBzaW5nbGUgcmVuZGVyZXIgb25seS4gUmVuZGVyVHJlZVVw ZGF0ZXIgcHJvdmlkZXMgdGhlIHByZXZpb3VzIHJlbmRlcmVyIHRvIGNvbXB1dGUgdGhlIGRlcHRo LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclF1b3RlLmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6cmVnaXN0 ZXJRdW90ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3Ojp1bnJlZ2lz dGVyUXVvdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6dXBkYXRl U3BlY2lhbFJlbmRlcmVycyk6IERlbGV0ZWQuCisKKyAgICAgICAgICAgIFJlbW92ZSB0aGUgcXVv dGUgbGlzdC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6CisgICAgICAgICog c3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJl ZVVwZGF0ZXI6OmNvbW1pdCk6CisKKyAgICAgICAgICAgIEVuc3VyZSB0aGF0IGFsbCBxdW90ZXMg YXJlIHVwZGF0ZWQuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVVcGRhdGVyOjp1cGRh dGVCZWZvcmVPckFmdGVyUHNldWRvRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU cmVlVXBkYXRlcjo6dXBkYXRlUXVvdGVzVXBUbyk6CisKKyAgICAgICAgICAgIFRyYXZlcnNlIHJl bmRlciB0cmVlIHRvIGZpbmQgcXVvdGVzIHRvIHVwZGF0ZSBzdGFydGluZyBmcm9tIHRoZSBwcmV2 aW91cyB1cGRhdGVkIHF1b3RlLgorCisgICAgICAgICogc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIu aDoKKwogMjAxNy0wOC0xMSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gT3ZlcnJpZGVuIHZpcnR1YWwgZnVuY3Rpb24gbm90 IG1hcmtlZCDigJxvdmVycmlkZeKAnSBpbiBJbWFnZUJ1ZmZlckRhdGFDYWlyby5oCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUXVvdGUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJRdW90ZS5jcHAJKHJldmlzaW9uIDIyMDUyMykK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJRdW90ZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQ3LDEyICs0NywxMiBAQCBSZW5kZXJRdW90ZTo6flJlbmRlclF1b3RlKCkKIHZvaWQg UmVuZGVyUXVvdGU6Omluc2VydGVkSW50b1RyZWUoKQogewogICAgIFJlbmRlcklubGluZTo6aW5z ZXJ0ZWRJbnRvVHJlZSgpOwotICAgIHZpZXcoKS5yZWdpc3RlclF1b3RlKCp0aGlzKTsKKyAgICB2 aWV3KCkuc2V0SGFzUXVvdGVzTmVlZGluZ1VwZGF0ZSh0cnVlKTsKIH0KIAogdm9pZCBSZW5kZXJR dW90ZTo6d2lsbEJlUmVtb3ZlZEZyb21UcmVlKCkKIHsKLSAgICB2aWV3KCkudW5yZWdpc3RlclF1 b3RlKCp0aGlzKTsKKyAgICB2aWV3KCkuc2V0SGFzUXVvdGVzTmVlZGluZ1VwZGF0ZSh0cnVlKTsK ICAgICBSZW5kZXJJbmxpbmU6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSgpOwogfQogCkBAIC02MSw3 ICs2MSw3IEBAIHZvaWQgUmVuZGVyUXVvdGU6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGkKICAgICBS ZW5kZXJJbmxpbmU6OnN0eWxlRGlkQ2hhbmdlKGRpZmYsIG9sZFN0eWxlKTsKICAgICBpZiAoZGlm ZiA+PSBTdHlsZURpZmZlcmVuY2VMYXlvdXQpIHsKICAgICAgICAgbV9uZWVkc1RleHRVcGRhdGUg PSB0cnVlOwotICAgICAgICB2aWV3KCkuc2V0SGFzU3BlY2lhbFJlbmRlcmVyTmVlZGluZ1VwZGF0 ZSgpOworICAgICAgICB2aWV3KCkuc2V0SGFzUXVvdGVzTmVlZGluZ1VwZGF0ZSh0cnVlKTsKICAg ICB9CiB9CiAKQEAgLTM4OCwyNSArMzg4LDQ0IEBAIFN0cmluZyBSZW5kZXJRdW90ZTo6Y29tcHV0 ZVRleHQoKSBjb25zdAogICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogfQogCi12b2lkIFJlbmRl clF1b3RlOjp1cGRhdGVSZW5kZXJlcnMoY29uc3QgUmVuZGVyVmlldyYgdmlldykKK2Jvb2wgUmVu ZGVyUXVvdGU6OmlzT3BlbigpIGNvbnN0CiB7Ci0gICAgaW50IGRlcHRoID0gLTE7Ci0gICAgZm9y IChhdXRvKiBxdW90ZSA6IHZpZXcucXVvdGVzKCkpIHsKLSAgICAgICAgYm9vbCBpc09wZW4gPSBx dW90ZS0+bV90eXBlID09IE9QRU5fUVVPVEUgfHwgcXVvdGUtPm1fdHlwZSA9PSBOT19PUEVOX1FV T1RFOwotICAgICAgICBpZiAoIWlzT3BlbikKLSAgICAgICAgICAgIC0tZGVwdGg7Ci0gICAgICAg IGVsc2UgaWYgKGRlcHRoIDwgMCkKLSAgICAgICAgICAgIGRlcHRoID0gMDsKLQotICAgICAgICBp ZiAocXVvdGUtPm1fZGVwdGggIT0gZGVwdGggfHwgcXVvdGUtPm1fbmVlZHNUZXh0VXBkYXRlKSB7 Ci0gICAgICAgICAgICBxdW90ZS0+bV9kZXB0aCA9IGRlcHRoOwotICAgICAgICAgICAgcXVvdGUt Pm1fbmVlZHNUZXh0VXBkYXRlID0gZmFsc2U7Ci0gICAgICAgICAgICBxdW90ZS0+dXBkYXRlVGV4 dFJlbmRlcmVyKCk7Ci0gICAgICAgIH0KKyAgICBzd2l0Y2ggKG1fdHlwZSkgeworICAgIGNhc2Ug T1BFTl9RVU9URToKKyAgICBjYXNlIE5PX09QRU5fUVVPVEU6CisgICAgICAgIHJldHVybiB0cnVl OworICAgIGNhc2UgQ0xPU0VfUVVPVEU6CisgICAgY2FzZSBOT19DTE9TRV9RVU9URToKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBy ZXR1cm4gZmFsc2U7Cit9CiAKLSAgICAgICAgaWYgKGlzT3BlbikKK3ZvaWQgUmVuZGVyUXVvdGU6 OnVwZGF0ZVJlbmRlcmVyKFJlbmRlclF1b3RlKiBwcmV2aW91c1F1b3RlKQoreworICAgIEFTU0VS VF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGRvY3VtZW50KCkuaW5SZW5kZXJUcmVlVXBkYXRl KCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCF2aWV3KCkucmVuZGVy VHJlZUlzQmVpbmdNdXRhdGVkSW50ZXJuYWxseSgpKTsKKyAgICBBU1NFUlRfV0lUSF9TRUNVUklU WV9JTVBMSUNBVElPTighdmlldygpLmxheW91dFN0YXRlKCkpOworCisgICAgaW50IGRlcHRoID0g LTE7CisgICAgaWYgKHByZXZpb3VzUXVvdGUpIHsKKyAgICAgICAgZGVwdGggPSBwcmV2aW91c1F1 b3RlLT5tX2RlcHRoOworICAgICAgICBpZiAocHJldmlvdXNRdW90ZS0+aXNPcGVuKCkpCiAgICAg ICAgICAgICArK2RlcHRoOwogICAgIH0KKworICAgIGlmICghaXNPcGVuKCkpCisgICAgICAgIC0t ZGVwdGg7CisgICAgZWxzZSBpZiAoZGVwdGggPCAwKQorICAgICAgICBkZXB0aCA9IDA7CisKKyAg ICBpZiAobV9kZXB0aCA9PSBkZXB0aCAmJiAhbV9uZWVkc1RleHRVcGRhdGUpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fZGVwdGggPSBkZXB0aDsKKyAgICBtX25lZWRzVGV4dFVwZGF0ZSA9IGZh bHNlOworICAgIHVwZGF0ZVRleHRSZW5kZXJlcigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUXVvdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUXVvdGUuaAkocmV2aXNpb24g MjIwNTIzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclF1b3RlLmgJKHdvcmtp bmcgY29weSkKQEAgLTMxLDExICszMSwxMiBAQCBwdWJsaWM6CiAgICAgUmVuZGVyUXVvdGUoRG9j dW1lbnQmLCBSZW5kZXJTdHlsZSYmLCBRdW90ZVR5cGUpOwogICAgIHZpcnR1YWwgflJlbmRlclF1 b3RlKCk7CiAKLSAgICBzdGF0aWMgdm9pZCB1cGRhdGVSZW5kZXJlcnMoY29uc3QgUmVuZGVyVmll dyYpOworICAgIHZvaWQgdXBkYXRlUmVuZGVyZXIoUmVuZGVyUXVvdGUqIHByZXZpb3VzUXVvdGUp OwogCiBwcml2YXRlOgogICAgIGNvbnN0IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiAiUmVuZGVyUXVvdGUiOyB9CiAgICAgYm9vbCBpc1F1b3RlKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIGJvb2wgaXNPcGVuKCkgY29uc3Q7CiAgICAgdm9p ZCBzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UsIGNvbnN0IFJlbmRlclN0eWxlKikgb3Zl cnJpZGU7CiAgICAgdm9pZCBpbnNlcnRlZEludG9UcmVlKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCB3 aWxsQmVSZW1vdmVkRnJvbVRyZWUoKSBvdmVycmlkZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHAJKHJldmlzaW9uIDIyMDUyMykKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUyNCw0OCArMTUy NCw2IEBAIHVuc2lnbmVkIFJlbmRlclZpZXc6OnBhZ2VDb3VudCgpIGNvbnN0CiAgICAgcmV0dXJu IDA7CiB9CiAKLXZvaWQgUmVuZGVyVmlldzo6cmVnaXN0ZXJRdW90ZShSZW5kZXJRdW90ZSYgcXVv dGUpCi17Ci0gICAgQVNTRVJUKCFtX3F1b3Rlcy5jb250YWlucygmcXVvdGUpKTsKLQotICAgIHNl dEhhc1NwZWNpYWxSZW5kZXJlck5lZWRpbmdVcGRhdGUoKTsKLQotICAgIGlmIChtX3F1b3Rlcy5p c0VtcHR5KCkpIHsKLSAgICAgICAgbV9xdW90ZXMuYWRkKCZxdW90ZSk7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9Ci0gICAgYXV0byBxdW90ZVJlbmRlcmVycyA9IGRlc2NlbmRhbnRzT2ZUeXBlPFJl bmRlclF1b3RlPigqdGhpcyk7Ci0gICAgYXV0byBpdCA9IHF1b3RlUmVuZGVyZXJzLmF0KHF1b3Rl KTsKLSAgICBpZiAoKytpdCA9PSBxdW90ZVJlbmRlcmVycy5lbmQoKSkgewotICAgICAgICBtX3F1 b3Rlcy5hZGQoJnF1b3RlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBhdXRvJiBuZXh0 UXVvdGUgPSAqaXQ7Ci0gICAgQVNTRVJUKG1fcXVvdGVzLmNvbnRhaW5zKCZuZXh0UXVvdGUpKTsK LSAgICBtX3F1b3Rlcy5pbnNlcnRCZWZvcmUoJm5leHRRdW90ZSwgJnF1b3RlKTsKLX0KLQotdm9p ZCBSZW5kZXJWaWV3Ojp1bnJlZ2lzdGVyUXVvdGUoUmVuZGVyUXVvdGUmIHF1b3RlKQotewotICAg IEFTU0VSVChtX3F1b3Rlcy5jb250YWlucygmcXVvdGUpKTsKLQotICAgIHNldEhhc1NwZWNpYWxS ZW5kZXJlck5lZWRpbmdVcGRhdGUoKTsKLQotICAgIG1fcXVvdGVzLnJlbW92ZSgmcXVvdGUpOwot fQotCi12b2lkIFJlbmRlclZpZXc6OnVwZGF0ZVNwZWNpYWxSZW5kZXJlcnMoKQotewotICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGRvY3VtZW50KCkuaW5SZW5kZXJUcmVlVXBk YXRlKCkpOwotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFyZW5kZXJUcmVl SXNCZWluZ011dGF0ZWRJbnRlcm5hbGx5KCkpOwotCi0gICAgaWYgKCFtX2hhc1NwZWNpYWxSZW5k ZXJlck5lZWRpbmdVcGRhdGUpCi0gICAgICAgIHJldHVybjsKLSAgICBtX2hhc1NwZWNpYWxSZW5k ZXJlck5lZWRpbmdVcGRhdGUgPSBmYWxzZTsKLQotICAgIFJlbmRlclF1b3RlOjp1cGRhdGVSZW5k ZXJlcnMoKnRoaXMpOwotfQotCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKIHZvaWQgUmVu ZGVyVmlldzo6cmVnaXN0ZXJCb3hXaXRoU2Nyb2xsU25hcFBvc2l0aW9ucyhjb25zdCBSZW5kZXJC b3gmIGJveCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAkocmV2 aXNpb24gMjIwNTIzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtMTk2LDEyICsxOTYsOCBAQCBwdWJsaWM6CiAKICAgICBJbnRTaXpl IHZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoKSBjb25zdDsKIAotICAgIHZvaWQgcmVn aXN0ZXJRdW90ZShSZW5kZXJRdW90ZSYpOwotICAgIHZvaWQgdW5yZWdpc3RlclF1b3RlKFJlbmRl clF1b3RlJik7Ci0gICAgY29uc3QgTGlzdEhhc2hTZXQ8UmVuZGVyUXVvdGUqPiYgcXVvdGVzKCkg Y29uc3QgeyByZXR1cm4gbV9xdW90ZXM7IH0KLQotICAgIHZvaWQgc2V0SGFzU3BlY2lhbFJlbmRl cmVyTmVlZGluZ1VwZGF0ZSgpIHsgbV9oYXNTcGVjaWFsUmVuZGVyZXJOZWVkaW5nVXBkYXRlID0g dHJ1ZTsgfQotICAgIHZvaWQgdXBkYXRlU3BlY2lhbFJlbmRlcmVycygpOworICAgIGJvb2wgaGFz UXVvdGVzTmVlZGluZ1VwZGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzUXVvdGVzTmVlZGluZ1Vw ZGF0ZTsgfQorICAgIHZvaWQgc2V0SGFzUXVvdGVzTmVlZGluZ1VwZGF0ZShib29sIGIpIHsgbV9o YXNRdW90ZXNOZWVkaW5nVXBkYXRlID0gYjsgfQogCiAgICAgLy8gRklYTUU6IHNlZSBjbGFzcyBS ZW5kZXJUcmVlSW50ZXJuYWxNdXRhdGlvbiBiZWxvdy4KICAgICBib29sIHJlbmRlclRyZWVJc0Jl aW5nTXV0YXRlZEludGVybmFsbHkoKSBjb25zdCB7IHJldHVybiAhIW1fcmVuZGVyVHJlZUludGVy bmFsTXV0YXRpb25Db3VudGVyOyB9CkBAIC0yMDksNyArMjA1LDcgQEAgcHVibGljOgogICAgIC8v IEZJWE1FOiBUaGlzIGlzIGEgd29yayBhcm91bmQgYmVjYXVzZSB0aGUgY3VycmVudCBpbXBsZW1l bnRhdGlvbiBvZiBjb3VudGVycwogICAgIC8vIHJlcXVpcmVzIHdhbGtpbmcgdGhlIGVudGlyZSB0 cmVlIHJlcGVhdGVkbHkgYW5kIG1vc3QgcGFnZXMgZG9uJ3QgYWN0dWFsbHkgdXNlIGVpdGhlcgog ICAgIC8vIGZlYXR1cmUgc28gd2Ugc2hvdWxkbid0IHRha2UgdGhlIHBlcmZvcm1hbmNlIGhpdCB3 aGVuIG5vdCBuZWVkZWQuIExvbmcgdGVybSB3ZSBzaG91bGQKLSAgICAvLyByZXdyaXRlIHRoZSBj b3VudGVyIGFuZCBxdW90ZXMgY29kZS4KKyAgICAvLyByZXdyaXRlIHRoZSBjb3VudGVyIGNvZGUu CiAgICAgdm9pZCBhZGRSZW5kZXJDb3VudGVyKCkgeyBtX3JlbmRlckNvdW50ZXJDb3VudCsrOyB9 CiAgICAgdm9pZCByZW1vdmVSZW5kZXJDb3VudGVyKCkgeyBBU1NFUlQobV9yZW5kZXJDb3VudGVy Q291bnQgPiAwKTsgbV9yZW5kZXJDb3VudGVyQ291bnQtLTsgfQogICAgIGJvb2wgaGFzUmVuZGVy Q291bnRlcnMoKSB7IHJldHVybiBtX3JlbmRlckNvdW50ZXJDb3VudDsgfQpAQCAtMzc2LDggKzM3 Miw3IEBAIHByaXZhdGU6CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlckxheWVyQ29tcG9zaXRv cj4gbV9jb21wb3NpdG9yOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxGbG93VGhyZWFkQ29udHJvbGxl cj4gbV9mbG93VGhyZWFkQ29udHJvbGxlcjsKIAotICAgIExpc3RIYXNoU2V0PFJlbmRlclF1b3Rl Kj4gbV9xdW90ZXM7Ci0gICAgYm9vbCBtX2hhc1NwZWNpYWxSZW5kZXJlck5lZWRpbmdVcGRhdGUg eyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNRdW90ZXNOZWVkaW5nVXBkYXRlIHsgZmFsc2UgfTsK IAogICAgIHVuc2lnbmVkIG1fcmVuZGVyQ291bnRlckNvdW50IHsgMCB9OwogICAgIHVuc2lnbmVk IG1fcmVuZGVyVHJlZUludGVybmFsTXV0YXRpb25Db3VudGVyIHsgMCB9OwpJbmRleDogU291cmNl L1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmNwcAkocmV2aXNpb24gMjIwNTIzKQor KysgU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNyw4ICszNywxMCBAQAogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oIgogI2luY2x1ZGUgIk5vZGVSZW5kZXJTdHlsZS5oIgogI2luY2x1ZGUgIlBzZXVkb0VsZW1l bnQuaCIKKyNpbmNsdWRlICJSZW5kZXJEZXNjZW5kYW50SXRlcmF0b3IuaCIKICNpbmNsdWRlICJS ZW5kZXJGdWxsU2NyZWVuLmgiCiAjaW5jbHVkZSAiUmVuZGVyTmFtZWRGbG93VGhyZWFkLmgiCisj aW5jbHVkZSAiUmVuZGVyUXVvdGUuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAjaW5j bHVkZSAiU3R5bGVUcmVlUmVzb2x2ZXIuaCIKICNpbmNsdWRlIDx3dGYvU3lzdGVtVHJhY2luZy5o PgpAQCAtMTI0LDcgKzEyNiwxMSBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpjb21taXQoc3Rk Ojp1bmlxCiAgICAgZm9yIChhdXRvKiByb290IDogZmluZFJlbmRlcmluZ1Jvb3RzKCptX3N0eWxl VXBkYXRlKSkKICAgICAgICAgdXBkYXRlUmVuZGVyVHJlZSgqcm9vdCk7CiAKLSAgICBtX2RvY3Vt ZW50LnJlbmRlclZpZXcoKS0+dXBkYXRlU3BlY2lhbFJlbmRlcmVycygpOworICAgIGlmIChtX2Rv Y3VtZW50LnJlbmRlclZpZXcoKS0+aGFzUXVvdGVzTmVlZGluZ1VwZGF0ZSgpKSB7CisgICAgICAg IHVwZGF0ZVF1b3Rlc1VwVG8obnVsbHB0cik7CisgICAgICAgIG1fcHJldmlvdXNVcGRhdGVkUXVv dGUgPSBudWxscHRyOworICAgICAgICBtX2RvY3VtZW50LnJlbmRlclZpZXcoKS0+c2V0SGFzUXVv dGVzTmVlZGluZ1VwZGF0ZShmYWxzZSk7CisgICAgfQogCiAgICAgbV9zdHlsZVVwZGF0ZSA9IG51 bGxwdHI7CiB9CkBAIC01NDIsMTAgKzU0OCwxOSBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp1 cGRhdGVCZWZvcmVPckFmCiAKICAgICB1cGRhdGVFbGVtZW50UmVuZGVyZXIoKnBzZXVkb0VsZW1l bnQsIGVsZW1lbnRVcGRhdGUpOwogCisgICAgYXV0byogcHNldWRvUmVuZGVyZXIgPSBwc2V1ZG9F bGVtZW50LT5yZW5kZXJlcigpOworICAgIGlmICghcHNldWRvUmVuZGVyZXIpCisgICAgICAgIHJl dHVybjsKKwogICAgIGlmIChlbGVtZW50VXBkYXRlLmNoYW5nZSA9PSBTdHlsZTo6RGV0YWNoKQog ICAgICAgICBwc2V1ZG9FbGVtZW50LT5kaWRBdHRhY2hSZW5kZXJlcnMoKTsKICAgICBlbHNlCiAg ICAgICAgIHBzZXVkb0VsZW1lbnQtPmRpZFJlY2FsY1N0eWxlKGVsZW1lbnRVcGRhdGUuY2hhbmdl KTsKKworICAgIGlmIChtX2RvY3VtZW50LnJlbmRlclZpZXcoKS0+aGFzUXVvdGVzTmVlZGluZ1Vw ZGF0ZSgpKSB7CisgICAgICAgIGZvciAoYXV0byYgY2hpbGQgOiBkZXNjZW5kYW50c09mVHlwZTxS ZW5kZXJRdW90ZT4oKnBzZXVkb1JlbmRlcmVyKSkKKyAgICAgICAgICAgIHVwZGF0ZVF1b3Rlc1Vw VG8oJmNoaWxkKTsKKyAgICB9CiB9CiAKIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3du UmVuZGVyZXJzKEVsZW1lbnQmIHJvb3QsIFRlYXJkb3duVHlwZSB0ZWFyZG93blR5cGUpCkBAIC02 MDMsNiArNjE4LDIyIEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnRlYXJEb3duUmVuZGVyZXIK ICAgICB0ZXh0LnNldFJlbmRlcmVyKG51bGxwdHIpOwogfQogCit2b2lkIFJlbmRlclRyZWVVcGRh dGVyOjp1cGRhdGVRdW90ZXNVcFRvKFJlbmRlclF1b3RlKiBsYXN0UXVvdGUpCit7CisgICAgYXV0 byBxdW90ZVJlbmRlcmVycyA9IGRlc2NlbmRhbnRzT2ZUeXBlPFJlbmRlclF1b3RlPigqbV9kb2N1 bWVudC5yZW5kZXJWaWV3KCkpOworICAgIGF1dG8gaXQgPSBtX3ByZXZpb3VzVXBkYXRlZFF1b3Rl ID8gKytxdW90ZVJlbmRlcmVycy5hdCgqbV9wcmV2aW91c1VwZGF0ZWRRdW90ZSkgOiBxdW90ZVJl bmRlcmVycy5iZWdpbigpOworICAgIGF1dG8gZW5kID0gcXVvdGVSZW5kZXJlcnMuZW5kKCk7Cisg ICAgZm9yICg7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBhdXRvJiBxdW90ZSA9ICppdDsK KyAgICAgICAgLy8gUXVvdGUgY2hhcmFjdGVyIGRlcGVuZHMgb24gcXVvdGUgZGVwdGggc28gd2Ug Y2hhaW4gdGhlIHVwZGF0ZXMuCisgICAgICAgIHF1b3RlLnVwZGF0ZVJlbmRlcmVyKG1fcHJldmlv dXNVcGRhdGVkUXVvdGUpOworICAgICAgICBtX3ByZXZpb3VzVXBkYXRlZFF1b3RlID0gJnF1b3Rl OworICAgICAgICBpZiAoJnF1b3RlID09IGxhc3RRdW90ZSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICB9CisgICAgQVNTRVJUKCFsYXN0UXVvdGUpOworfQorCiAjaWYgUExBVEZPUk0oSU9TKQog c3RhdGljIEVWaXNpYmlsaXR5IGVsZW1lbnRJbXBsaWNpdFZpc2liaWxpdHkoY29uc3QgRWxlbWVu dCYgZWxlbWVudCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRh dGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0 ZXIuaAkocmV2aXNpb24gMjIwNTIzKQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJl ZVVwZGF0ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBAQCBjbGFzcyBDb250YWlu ZXJOb2RlOwogY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBFbGVtZW50OwogY2xhc3MgTm9kZTsKK2Ns YXNzIFJlbmRlclF1b3RlOwogY2xhc3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBUZXh0OwogCkBAIC03 MywxMiArNzQsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBvcFBhcmVudCgpOwogICAgIHZvaWQg cG9wUGFyZW50c1RvRGVwdGgodW5zaWduZWQgZGVwdGgpOwogCisgICAgdm9pZCB1cGRhdGVRdW90 ZXNVcFRvKFJlbmRlclF1b3RlKik7CisKICAgICBEb2N1bWVudCYgbV9kb2N1bWVudDsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8Y29uc3QgU3R5bGU6OlVwZGF0ZT4gbV9zdHlsZVVwZGF0ZTsKIAogICAg IFZlY3RvcjxQYXJlbnQ+IG1fcGFyZW50U3RhY2s7CiAKICAgICBIYXNoU2V0PFRleHQqPiBtX2lu dmFsaWRhdGVkV2hpdGVzcGFjZU9ubHlUZXh0U2libGluZ3M7CisgICAgUmVuZGVyUXVvdGUqIG1f cHJldmlvdXNVcGRhdGVkUXVvdGUgeyBudWxscHRyIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==