120393 2013-08-27 23:43:50 -0700 Make descendant iterators always require ContainerNode root 2013-08-28 05:30:28 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned darin kling oldest_to_newest 921851 0 koivisto 2013-08-27 23:43:50 -0700 There is no reason to iterate over Node. 921854 1 209851 koivisto 2013-08-27 23:50:32 -0700 Created attachment 209851 patch 921933 2 209851 kling 2013-08-28 05:20:02 -0700 Comment on attachment 209851 patch View in context: https://bugs.webkit.org/attachment.cgi?id=209851&action=review r=me > Source/WebCore/accessibility/AccessibilityNodeObject.cpp:416 > + Element* canvasElement = toElement(node); HTMLCanvasElement* canvasElement = toHTMLCanvasElement(node); 921940 3 koivisto 2013-08-28 05:30:28 -0700 https://trac.webkit.org/r154734 209851 2013-08-27 23:50:32 -0700 2013-08-28 05:20:02 -0700 patch iterator-no-node.patch text/plain 13275 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDcyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA4LTI3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIGRlc2NlbmRhbnQgaXRl cmF0b3JzIGFsd2F5cyByZXF1aXJlIENvbnRhaW5lck5vZGUgcm9vdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwMzkzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIE5vZGUqIHJvb3QgdmVyc2lv bnMgb2YgdGhlIGl0ZXJhdG9ycy4gCisgICAgICAgIEZpeCB0aGUgZmV3IGNhbGwgc2l0ZXMgdGhh dCByZXF1aXJlZCB0aGVtIHRvIGhhdmUgdGlnaHRlciB0eXBpbmcuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpjYW52YXNIYXNGYWxsYmFja0NvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6c2libGluZ1dpdGhBcmlhUm9sZSk6CisgICAgICAgICogZG9tL0NoaWxk SXRlcmF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6Q2hpbGRJdGVyYXRvckFkYXB0ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6OjpiZWdpbik6CisgICAgICAgIChXZWJDb3JlOjo6OmVuZCk6Cisg ICAgICAgIChXZWJDb3JlOjplbGVtZW50Q2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6Y2hp bGRyZW5PZlR5cGUpOgorICAgICAgICAqIGRvbS9EZXNjZW5kYW50SXRlcmF0b3IuaDoKKyAgICAg ICAgKFdlYkNvcmU6Ojo6RGVzY2VuZGFudEl0ZXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ojo6 RGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRlcik6CisgICAgICAgIChXZWJDb3JlOjo6OmJlZ2luKToK KyAgICAgICAgKFdlYkNvcmU6Ojo6ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OmVsZW1lbnREZXNj ZW5kYW50cyk6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kYW50c09mVHlwZSk6CisgICAgICAg ICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkdW1t eVNwYW5BbmNlc3RvckZvck5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlTdHlsZUNvbW1h bmQ6OmNsZWFudXBVbnN0eWxlZEFwcGxlU3R5bGVTcGFucyk6CisgICAgICAgIChXZWJDb3JlOjpB cHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZSk6CisgICAgICAgICogZWRpdGluZy9B cHBseVN0eWxlQ29tbWFuZC5oOgorCiAyMDEzLTA4LTI2ICBBbnRvbmlvIEdvbWVzICA8YTEuZ29t ZXNAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBTY3JvbGxpbmcgYWxsb3dlZCB3aGVuIG92 ZXJmbG93OmhpZGRlbiAoc2VlbiBvbiBBY2lkMikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCShyZXZp c2lvbiAxNTQ2NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEzLDExICs0MTMsMTEgQEAgYm9v bCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Y2FudmFzSGFzRgogICAgIE5vZGUqIG5vZGUgPSB0 aGlzLT5ub2RlKCk7CiAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5oYXNUYWdOYW1lKGNhbnZhc1Rh ZykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQorICAgIEVsZW1lbnQqIGNhbnZhc0VsZW1lbnQg PSB0b0VsZW1lbnQobm9kZSk7CiAgICAgLy8gSWYgaXQgaGFzIGFueSBjaGlsZHJlbiB0aGF0IGFy ZSBlbGVtZW50cywgd2UnbGwgYXNzdW1lIGl0IG1pZ2h0IGJlIGZhbGxiYWNrCiAgICAgLy8gY29u dGVudC4gSWYgaXQgaGFzIG5vIGNoaWxkcmVuIG9yIGl0cyBvbmx5IGNoaWxkcmVuIGFyZSBub3Qg ZWxlbWVudHMKICAgICAvLyAoZS5nLiBqdXN0IHRleHQgbm9kZXMpLCBpdCBkb2Vzbid0IGhhdmUg ZmFsbGJhY2sgY29udGVudC4KLSAgICByZXR1cm4gZWxlbWVudENoaWxkcmVuKG5vZGUpLmJlZ2lu KCkgIT0gZWxlbWVudENoaWxkcmVuKG5vZGUpLmVuZCgpOworICAgIHJldHVybiBlbGVtZW50Q2hp bGRyZW4oY2FudmFzRWxlbWVudCkuYmVnaW4oKSAhPSBlbGVtZW50Q2hpbGRyZW4oY2FudmFzRWxl bWVudCkuZW5kKCk7CiB9CiAKIGJvb2wgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmlzSW1hZ2VC dXR0b24oKSBjb25zdApAQCAtMTExOCwxMCArMTExOCw5IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdDo6YXJpYUFjY2UKIAogc3RhdGljIEVsZW1lbnQqIHNpYmxpbmdXaXRoQXJpYVJv bGUoU3RyaW5nIHJvbGUsIE5vZGUqIG5vZGUpCiB7Ci0gICAgTm9kZSogcGFyZW50ID0gbm9kZS0+ cGFyZW50Tm9kZSgpOworICAgIENvbnRhaW5lck5vZGUqIHBhcmVudCA9IG5vZGUtPnBhcmVudE5v ZGUoKTsKICAgICBpZiAoIXBhcmVudCkKICAgICAgICAgcmV0dXJuIDA7Ci0KICAgICBmb3IgKGF1 dG8gc2libGluZyA9IGVsZW1lbnRDaGlsZHJlbihwYXJlbnQpLmJlZ2luKCksIGVuZCA9IGVsZW1l bnRDaGlsZHJlbihwYXJlbnQpLmVuZCgpOyBzaWJsaW5nICE9IGVuZDsgKytzaWJsaW5nKSB7CiAg ICAgICAgIGNvbnN0IEF0b21pY1N0cmluZyYgc2libGluZ0FyaWFSb2xlID0gc2libGluZy0+ZmFz dEdldEF0dHJpYnV0ZShyb2xlQXR0cik7CiAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShz aWJsaW5nQXJpYVJvbGUsIHJvbGUpKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0NoaWxkSXRl cmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vQ2hpbGRJdGVyYXRvci5o CShyZXZpc2lvbiAxNTQ3MDApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vQ2hpbGRJdGVyYXRvci5o CSh3b3JraW5nIGNvcHkpCkBAIC01NCwyMSArNTQsMTkgQEAgcHJpdmF0ZToKICNlbmRpZgogfTsK IAotdGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250YWluZXJUeXBl PgordGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgogY2xhc3MgQ2hpbGRJdGVyYXRvckFk YXB0ZXIgewogcHVibGljOgotICAgIENoaWxkSXRlcmF0b3JBZGFwdGVyKENvbnRhaW5lclR5cGUq IHJvb3QpOworICAgIENoaWxkSXRlcmF0b3JBZGFwdGVyKENvbnRhaW5lck5vZGUqIHJvb3QpOwog ICAgIENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+IGJlZ2luKCk7CiAgICAgQ2hpbGRJdGVyYXRv cjxFbGVtZW50VHlwZT4gZW5kKCk7CiAKIHByaXZhdGU6Ci0gICAgY29uc3QgQ29udGFpbmVyVHlw ZSogbV9yb290OworICAgIGNvbnN0IENvbnRhaW5lck5vZGUqIG1fcm9vdDsKIH07CiAKLUNoaWxk SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQsIENvbnRhaW5lck5vZGU+IGVsZW1lbnRDaGlsZHJlbihD b250YWluZXJOb2RlKiByb290KTsKLUNoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQsIE5vZGU+ IGVsZW1lbnRDaGlsZHJlbihOb2RlKiByb290KTsKLXRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50 VHlwZT4gQ2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGUsIENvbnRhaW5lck5vZGU+IGNo aWxkcmVuT2ZUeXBlKENvbnRhaW5lck5vZGUqIHJvb3QpOwotdGVtcGxhdGUgPHR5cGVuYW1lIEVs ZW1lbnRUeXBlPiBDaGlsZEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlwZSwgTm9kZT4gY2hpbGRy ZW5PZlR5cGUoTm9kZSogcm9vdCk7CitDaGlsZEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50PiBlbGVt ZW50Q2hpbGRyZW4oQ29udGFpbmVyTm9kZSogcm9vdCk7Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgRWxl bWVudFR5cGU+IENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPiBjaGlsZHJlbk9mVHlw ZShDb250YWluZXJOb2RlKiByb290KTsKIAogdGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBl PgogaW5saW5lIENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+OjpDaGlsZEl0ZXJhdG9yKCkKQEAg LTEzNCw0NCArMTMyLDMzIEBAIGlubGluZSBib29sIENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+ OjoKICAgICByZXR1cm4gbV9jdXJyZW50ICE9IG90aGVyLm1fY3VycmVudDsKIH0KIAotdGVtcGxh dGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250YWluZXJUeXBlPgotaW5saW5l IENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlLCBDb250YWluZXJUeXBlPjo6Q2hpbGRJ dGVyYXRvckFkYXB0ZXIoQ29udGFpbmVyVHlwZSogcm9vdCkKK3RlbXBsYXRlIDx0eXBlbmFtZSBF bGVtZW50VHlwZT4KK2lubGluZSBDaGlsZEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlwZT46OkNo aWxkSXRlcmF0b3JBZGFwdGVyKENvbnRhaW5lck5vZGUqIHJvb3QpCiAgICAgOiBtX3Jvb3Qocm9v dCkKIHsKIH0KIAotdGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250 YWluZXJUeXBlPgotaW5saW5lIENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+IENoaWxkSXRlcmF0 b3JBZGFwdGVyPEVsZW1lbnRUeXBlLCBDb250YWluZXJUeXBlPjo6YmVnaW4oKQordGVtcGxhdGUg PHR5cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5saW5lIENoaWxkSXRlcmF0b3I8RWxlbWVudFR5cGU+ IENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6YmVnaW4oKQogewogICAgIHJldHVy biBDaGlsZEl0ZXJhdG9yPEVsZW1lbnRUeXBlPihUcmF2ZXJzYWw8RWxlbWVudFR5cGU+OjpmaXJz dENoaWxkKG1fcm9vdCkpOwogfQogCi10ZW1wbGF0ZSA8dHlwZW5hbWUgRWxlbWVudFR5cGUsIHR5 cGVuYW1lIENvbnRhaW5lclR5cGU+Ci1pbmxpbmUgQ2hpbGRJdGVyYXRvcjxFbGVtZW50VHlwZT4g Q2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGUsIENvbnRhaW5lclR5cGU+OjplbmQoKQor dGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5saW5lIENoaWxkSXRlcmF0b3I8RWxl bWVudFR5cGU+IENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6ZW5kKCkKIHsKICAg ICByZXR1cm4gQ2hpbGRJdGVyYXRvcjxFbGVtZW50VHlwZT4oKTsKIH0KIAotaW5saW5lIENoaWxk SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQsIENvbnRhaW5lck5vZGU+IGVsZW1lbnRDaGlsZHJlbihD b250YWluZXJOb2RlKiByb290KQotewotICAgIHJldHVybiBDaGlsZEl0ZXJhdG9yQWRhcHRlcjxF bGVtZW50LCBDb250YWluZXJOb2RlPihyb290KTsKLX0KLQotaW5saW5lIENoaWxkSXRlcmF0b3JB ZGFwdGVyPEVsZW1lbnQsIE5vZGU+IGVsZW1lbnRDaGlsZHJlbihOb2RlKiByb290KQotewotICAg IHJldHVybiBDaGlsZEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50LCBOb2RlPihyb290KTsKLX0KLQot dGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgotaW5saW5lIENoaWxkSXRlcmF0b3JBZGFw dGVyPEVsZW1lbnRUeXBlLCBDb250YWluZXJOb2RlPiBjaGlsZHJlbk9mVHlwZShDb250YWluZXJO b2RlKiByb290KQoraW5saW5lIENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQ+IGVsZW1lbnRD aGlsZHJlbihDb250YWluZXJOb2RlKiByb290KQogewotICAgIHJldHVybiBDaGlsZEl0ZXJhdG9y QWRhcHRlcjxFbGVtZW50VHlwZSwgQ29udGFpbmVyTm9kZT4ocm9vdCk7CisgICAgcmV0dXJuIENo aWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQ+KHJvb3QpOwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5h bWUgRWxlbWVudFR5cGU+Ci1pbmxpbmUgQ2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGUs IE5vZGU+IGNoaWxkcmVuT2ZUeXBlKE5vZGUqIHJvb3QpCitpbmxpbmUgQ2hpbGRJdGVyYXRvckFk YXB0ZXI8RWxlbWVudFR5cGU+IGNoaWxkcmVuT2ZUeXBlKENvbnRhaW5lck5vZGUqIHJvb3QpCiB7 Ci0gICAgcmV0dXJuIENoaWxkSXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlLCBOb2RlPihyb290 KTsKKyAgICByZXR1cm4gQ2hpbGRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+KHJvb3QpOwog fQogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRGVzY2VuZGFudEl0ZXJhdG9yLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0Rlc2NlbmRhbnRJdGVyYXRvci5oCShyZXZp c2lvbiAxNTQ3MDApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRGVzY2VuZGFudEl0ZXJhdG9yLmgJ KHdvcmtpbmcgY29weSkKQEAgLTM3LDE1ICszNywxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB0 ZW1wbGF0ZSA8dHlwZW5hbWUgRWxlbWVudFR5cGU+CiBjbGFzcyBEZXNjZW5kYW50SXRlcmF0b3Ig ewogcHVibGljOgotICAgIERlc2NlbmRhbnRJdGVyYXRvcihjb25zdCBOb2RlKiByb290KTsKLSAg ICBEZXNjZW5kYW50SXRlcmF0b3IoY29uc3QgTm9kZSogcm9vdCwgRWxlbWVudFR5cGUqIGN1cnJl bnQpOworICAgIERlc2NlbmRhbnRJdGVyYXRvcihjb25zdCBDb250YWluZXJOb2RlKiByb290KTsK KyAgICBEZXNjZW5kYW50SXRlcmF0b3IoY29uc3QgQ29udGFpbmVyTm9kZSogcm9vdCwgRWxlbWVu dFR5cGUqIGN1cnJlbnQpOwogICAgIERlc2NlbmRhbnRJdGVyYXRvciYgb3BlcmF0b3IrKygpOwog ICAgIEVsZW1lbnRUeXBlJiBvcGVyYXRvciooKTsKICAgICBFbGVtZW50VHlwZSogb3BlcmF0b3It PigpOwogICAgIGJvb2wgb3BlcmF0b3IhPShjb25zdCBEZXNjZW5kYW50SXRlcmF0b3ImIG90aGVy KSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBjb25zdCBOb2RlKiBtX3Jvb3Q7CisgICAgY29uc3Qg Q29udGFpbmVyTm9kZSogbV9yb290OwogICAgIEVsZW1lbnRUeXBlKiBtX2N1cnJlbnQ7CiAKICNp Zm5kZWYgTkRFQlVHCkBAIC01NSwyNCArNTUsMjIgQEAgcHJpdmF0ZToKICNlbmRpZgogfTsKIAot dGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250YWluZXJUeXBlPgor dGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgogY2xhc3MgRGVzY2VuZGFudEl0ZXJhdG9y QWRhcHRlciB7CiBwdWJsaWM6Ci0gICAgRGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRlcihDb250YWlu ZXJUeXBlKiByb290KTsKKyAgICBEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyKENvbnRhaW5lck5v ZGUqIHJvb3QpOwogICAgIERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50VHlwZT4gYmVnaW4oKTsK ICAgICBEZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+IGVuZCgpOwogCiBwcml2YXRlOgot ICAgIENvbnRhaW5lclR5cGUqIG1fcm9vdDsKKyAgICBDb250YWluZXJOb2RlKiBtX3Jvb3Q7CiB9 OwogCi1EZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQsIENvbnRhaW5lck5vZGU+IGVs ZW1lbnREZXNjZW5kYW50cyhDb250YWluZXJOb2RlKiByb290KTsKLURlc2NlbmRhbnRJdGVyYXRv ckFkYXB0ZXI8RWxlbWVudCwgTm9kZT4gZWxlbWVudERlc2NlbmRhbnRzKE5vZGUqIHJvb3QpOwot dGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPiBEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVy PEVsZW1lbnRUeXBlLCBDb250YWluZXJOb2RlPiBkZXNjZW5kYW50c09mVHlwZShDb250YWluZXJO b2RlKiByb290KTsKLXRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZT4gRGVzY2VuZGFudEl0 ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlwZSwgTm9kZT4gZGVzY2VuZGFudHNPZlR5cGUoTm9kZSog cm9vdCk7CitEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQ+IGVsZW1lbnREZXNjZW5k YW50cyhDb250YWluZXJOb2RlKiByb290KTsKK3RlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlw ZT4gRGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlwZT4gZGVzY2VuZGFudHNPZlR5 cGUoQ29udGFpbmVyTm9kZSogcm9vdCk7CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlw ZT4KLWlubGluZSBEZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5cGU+OjpEZXNjZW5kYW50SXRl cmF0b3IoY29uc3QgTm9kZSogcm9vdCkKK2lubGluZSBEZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVu dFR5cGU+OjpEZXNjZW5kYW50SXRlcmF0b3IoY29uc3QgQ29udGFpbmVyTm9kZSogcm9vdCkKICAg ICA6IG1fcm9vdChyb290KQogICAgICwgbV9jdXJyZW50KG51bGxwdHIpCiAjaWZuZGVmIE5ERUJV RwpAQCAtODIsNyArODAsNyBAQCBpbmxpbmUgRGVzY2VuZGFudEl0ZXJhdG9yPEVsZW1lbnRUeXBl Pjo6CiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZT4KLWlubGluZSBEZXNjZW5k YW50SXRlcmF0b3I8RWxlbWVudFR5cGU+OjpEZXNjZW5kYW50SXRlcmF0b3IoY29uc3QgTm9kZSog cm9vdCwgRWxlbWVudFR5cGUqIGN1cnJlbnQpCitpbmxpbmUgRGVzY2VuZGFudEl0ZXJhdG9yPEVs ZW1lbnRUeXBlPjo6RGVzY2VuZGFudEl0ZXJhdG9yKGNvbnN0IENvbnRhaW5lck5vZGUqIHJvb3Qs IEVsZW1lbnRUeXBlKiBjdXJyZW50KQogICAgIDogbV9yb290KHJvb3QpCiAgICAgLCBtX2N1cnJl bnQoY3VycmVudCkKICNpZm5kZWYgTkRFQlVHCkBAIC0xMzgsNDQgKzEzNiwzMyBAQCBpbmxpbmUg Ym9vbCBEZXNjZW5kYW50SXRlcmF0b3I8RWxlbWVudFR5CiAgICAgcmV0dXJuIG1fY3VycmVudCAh PSBvdGhlci5tX2N1cnJlbnQ7CiB9CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZSwg dHlwZW5hbWUgQ29udGFpbmVyVHlwZT4KLWlubGluZSBEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVy PEVsZW1lbnRUeXBlLCBDb250YWluZXJUeXBlPjo6RGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRlcihD b250YWluZXJUeXBlKiByb290KQordGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlPgoraW5s aW5lIERlc2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpEZXNjZW5kYW50SXRl cmF0b3JBZGFwdGVyKENvbnRhaW5lck5vZGUqIHJvb3QpCiAgICAgOiBtX3Jvb3Qocm9vdCkKIHsK IH0KIAotdGVtcGxhdGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250YWluZXJU eXBlPgotaW5saW5lIERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50VHlwZT4gRGVzY2VuZGFudEl0 ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlwZSwgQ29udGFpbmVyVHlwZT46OmJlZ2luKCkKK3RlbXBs YXRlIDx0eXBlbmFtZSBFbGVtZW50VHlwZT4KK2lubGluZSBEZXNjZW5kYW50SXRlcmF0b3I8RWxl bWVudFR5cGU+IERlc2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudFR5cGU+OjpiZWdpbigp CiB7CiAgICAgcmV0dXJuIERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50VHlwZT4obV9yb290LCBU cmF2ZXJzYWw8RWxlbWVudFR5cGU+OjpmaXJzdFdpdGhpbihtX3Jvb3QpKTsKIH0KIAotdGVtcGxh dGUgPHR5cGVuYW1lIEVsZW1lbnRUeXBlLCB0eXBlbmFtZSBDb250YWluZXJUeXBlPgotaW5saW5l IERlc2NlbmRhbnRJdGVyYXRvcjxFbGVtZW50VHlwZT4gRGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRl cjxFbGVtZW50VHlwZSwgQ29udGFpbmVyVHlwZT46OmVuZCgpCit0ZW1wbGF0ZSA8dHlwZW5hbWUg RWxlbWVudFR5cGU+CitpbmxpbmUgRGVzY2VuZGFudEl0ZXJhdG9yPEVsZW1lbnRUeXBlPiBEZXNj ZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPjo6ZW5kKCkKIHsKICAgICByZXR1cm4g RGVzY2VuZGFudEl0ZXJhdG9yPEVsZW1lbnRUeXBlPihtX3Jvb3QpOwogfQogCi1pbmxpbmUgRGVz Y2VuZGFudEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50LCBDb250YWluZXJOb2RlPiBlbGVtZW50RGVz Y2VuZGFudHMoQ29udGFpbmVyTm9kZSogcm9vdCkKLXsKLSAgICByZXR1cm4gRGVzY2VuZGFudEl0 ZXJhdG9yQWRhcHRlcjxFbGVtZW50LCBDb250YWluZXJOb2RlPihyb290KTsKLX0KLQotaW5saW5l IERlc2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudCwgTm9kZT4gZWxlbWVudERlc2NlbmRh bnRzKE5vZGUqIHJvb3QpCi17Ci0gICAgcmV0dXJuIERlc2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8 RWxlbWVudCwgTm9kZT4ocm9vdCk7Ci19Ci0KLXRlbXBsYXRlIDx0eXBlbmFtZSBFbGVtZW50VHlw ZT4KLWlubGluZSBEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlLCBDb250YWlu ZXJOb2RlPiBkZXNjZW5kYW50c09mVHlwZShDb250YWluZXJOb2RlKiByb290KQoraW5saW5lIERl c2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8RWxlbWVudD4gZWxlbWVudERlc2NlbmRhbnRzKENvbnRh aW5lck5vZGUqIHJvb3QpCiB7Ci0gICAgcmV0dXJuIERlc2NlbmRhbnRJdGVyYXRvckFkYXB0ZXI8 RWxlbWVudFR5cGUsIENvbnRhaW5lck5vZGU+KHJvb3QpOworICAgIHJldHVybiBEZXNjZW5kYW50 SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnQ+KHJvb3QpOwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUg RWxlbWVudFR5cGU+Ci1pbmxpbmUgRGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRlcjxFbGVtZW50VHlw ZSwgTm9kZT4gZGVzY2VuZGFudHNPZlR5cGUoTm9kZSogcm9vdCkKK2lubGluZSBEZXNjZW5kYW50 SXRlcmF0b3JBZGFwdGVyPEVsZW1lbnRUeXBlPiBkZXNjZW5kYW50c09mVHlwZShDb250YWluZXJO b2RlKiByb290KQogewotICAgIHJldHVybiBEZXNjZW5kYW50SXRlcmF0b3JBZGFwdGVyPEVsZW1l bnRUeXBlLCBOb2RlPihyb290KTsKKyAgICByZXR1cm4gRGVzY2VuZGFudEl0ZXJhdG9yQWRhcHRl cjxFbGVtZW50VHlwZT4ocm9vdCk7CiB9CiAKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiAxNTQ2NzgpCisrKyBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDI1LDcgKzQyNSw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5UmVsYXRpdmVGb24K ICAgICAgICAgcmVtb3ZlTm9kZVByZXNlcnZpbmdDaGlsZHJlbih1bnN0eWxlZFNwYW5zW2ldLmdl dCgpKTsKIH0KIAotc3RhdGljIE5vZGUqIGR1bW15U3BhbkFuY2VzdG9yRm9yTm9kZShjb25zdCBO b2RlKiBub2RlKQorc3RhdGljIENvbnRhaW5lck5vZGUqIGR1bW15U3BhbkFuY2VzdG9yRm9yTm9k ZShjb25zdCBOb2RlKiBub2RlKQogewogICAgIHdoaWxlIChub2RlICYmICghbm9kZS0+aXNFbGVt ZW50Tm9kZSgpIHx8ICFpc1N0eWxlU3Bhbk9yU3BhbldpdGhPbmx5U3R5bGVBdHRyaWJ1dGUodG9F bGVtZW50KG5vZGUpKSkpCiAgICAgICAgIG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7CkBAIC00 MzMsNyArNDMzLDcgQEAgc3RhdGljIE5vZGUqIGR1bW15U3BhbkFuY2VzdG9yRm9yTm9kZShjbwog ICAgIHJldHVybiBub2RlID8gbm9kZS0+cGFyZW50Tm9kZSgpIDogMDsKIH0KIAotdm9pZCBBcHBs eVN0eWxlQ29tbWFuZDo6Y2xlYW51cFVuc3R5bGVkQXBwbGVTdHlsZVNwYW5zKE5vZGUqIGR1bW15 U3BhbkFuY2VzdG9yKQordm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6Y2xlYW51cFVuc3R5bGVkQXBw bGVTdHlsZVNwYW5zKENvbnRhaW5lck5vZGUqIGR1bW15U3BhbkFuY2VzdG9yKQogewogICAgIGlm ICghZHVtbXlTcGFuQW5jZXN0b3IpCiAgICAgICAgIHJldHVybjsKQEAgLTU1MSw4ICs1NTEsOCBA QCBzdGF0aWMgTm9kZSogaGlnaGVzdEVtYmVkZGluZ0FuY2VzdG9yKE5vCiAKIHZvaWQgQXBwbHlT dHlsZUNvbW1hbmQ6OmFwcGx5SW5saW5lU3R5bGUoRWRpdGluZ1N0eWxlKiBzdHlsZSkKIHsKLSAg ICBSZWZQdHI8Tm9kZT4gc3RhcnREdW1teVNwYW5BbmNlc3RvciA9IDA7Ci0gICAgUmVmUHRyPE5v ZGU+IGVuZER1bW15U3BhbkFuY2VzdG9yID0gMDsKKyAgICBSZWZQdHI8Q29udGFpbmVyTm9kZT4g c3RhcnREdW1teVNwYW5BbmNlc3RvciA9IDA7CisgICAgUmVmUHRyPENvbnRhaW5lck5vZGU+IGVu ZER1bW15U3BhbkFuY2VzdG9yID0gMDsKIAogICAgIC8vIHVwZGF0ZSBkb2N1bWVudCBsYXlvdXQg b25jZSBiZWZvcmUgcmVtb3Zpbmcgc3R5bGVzCiAgICAgLy8gc28gdGhhdCB3ZSBhdm9pZCB0aGUg ZXhwZW5zZSBvZiB1cGRhdGluZyBiZWZvcmUgZWFjaCBhbmQgZXZlcnkgY2FsbApJbmRleDogU291 cmNlL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaAkocmV2aXNpb24gMTU0Njc4 KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMDgsNyArMTA4LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGlzVmFsaWRDYXJl dFBvc2l0aW9uSW5UZXh0Tm9kZShjb25zdCBQb3NpdGlvbiYgcG9zaXRpb24pOwogICAgIGJvb2wg bWVyZ2VTdGFydFdpdGhQcmV2aW91c0lmSWRlbnRpY2FsKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwg Y29uc3QgUG9zaXRpb24mIGVuZCk7CiAgICAgYm9vbCBtZXJnZUVuZFdpdGhOZXh0SWZJZGVudGlj YWwoY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQb3NpdGlvbiYgZW5kKTsKLSAgICB2b2lk IGNsZWFudXBVbnN0eWxlZEFwcGxlU3R5bGVTcGFucyhOb2RlKiBkdW1teVNwYW5BbmNlc3Rvcik7 CisgICAgdm9pZCBjbGVhbnVwVW5zdHlsZWRBcHBsZVN0eWxlU3BhbnMoQ29udGFpbmVyTm9kZSog ZHVtbXlTcGFuQW5jZXN0b3IpOwogCiAgICAgdm9pZCBzdXJyb3VuZE5vZGVSYW5nZVdpdGhFbGVt ZW50KFBhc3NSZWZQdHI8Tm9kZT4gc3RhcnQsIFBhc3NSZWZQdHI8Tm9kZT4gZW5kLCBQYXNzUmVm UHRyPEVsZW1lbnQ+KTsKICAgICBmbG9hdCBjb21wdXRlZEZvbnRTaXplKE5vZGUqKTsK