64134 2011-07-07 16:52:18 -0700 Move innerTextElement() from RenderTextControl to HTMLTextFormControlHTMLTextFormControlElement 2011-07-11 12:06:40 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64133 47865 60403 1 rniwa rniwa adele ap darin dglazkov inferno mjs tkent oldest_to_newest 433792 0 rniwa 2011-07-07 16:52:18 -0700 Now that shadow DOM no longer hangs off of renderer, it seems more natural for HTMLTextFormControl instead of RenderTextControl to have inner*Element(). 434327 1 100167 rniwa 2011-07-08 15:07:14 -0700 Created attachment 100167 Patch 434328 2 100167 rniwa 2011-07-08 15:08:57 -0700 Comment on attachment 100167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100167&action=review > Source/WebCore/ChangeLog:14 > + shadow DOM for input and textarea elements clear. It accessing shadow DOM of input and textarea elements > + are now less error-prone because it doesn't depend on the lifetime of the render tree. Oops, typo. It should read "Accessing the shadow DOM of input and textarea elements are now less error prone because it no longer depends on the lifetime of the render tree". 434390 3 100167 tkent 2011-07-08 16:44:12 -0700 Comment on attachment 100167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100167&action=review > Source/WebCore/rendering/RenderTextControl.h:56 > + HTMLElement* innerTextElement() const; Let's add a comment that this function should not be public. Otherwise, one who doesn't know the intention of this patch might make it public and revert the AccessibilityRenderObject.cpp change. 434392 4 100167 rniwa 2011-07-08 16:47:44 -0700 Comment on attachment 100167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100167&action=review >> Source/WebCore/rendering/RenderTextControl.h:56 >> + HTMLElement* innerTextElement() const; > > Let's add a comment that this function should not be public. > Otherwise, one who doesn't know the intention of this patch might make it public and revert the AccessibilityRenderObject.cpp change. That makes sense. 434393 5 rniwa 2011-07-08 16:48:20 -0700 Now that r90662 has been reverted, I'd have to reland the patch for the bug 64133 first. 435094 6 rniwa 2011-07-11 12:06:40 -0700 Committed r90775: <http://trac.webkit.org/changeset/90775> 100167 2011-07-08 15:07:14 -0700 2011-07-08 16:47:44 -0700 Patch bug-64134-20110708150713.patch text/plain 14464 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwNjY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDYgQEAKKzIwMTEtMDctMDggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBpbm5lclRleHRFbGVtZW50 KCkgZnJvbSBSZW5kZXJUZXh0Q29udHJvbCB0byBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQxMzQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCBpbm5l clRleHRFbGVtZW50IGZyb20gUmVuZGVyVGV4dENvbnRyb2wgdG8gSFRNTFRleHRGb3JtQ29udHJv bEVsZW1lbnQuIEl0IGlzIGltcGxlbWVudGVkIGJ5CisgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQg YW5kIEhUTUxUZXh0QXJlYUVsZW1lbnQgaW5zdGVhZCBvZiBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmUgYW5kCisgICAgICAgIFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLgorCisgICAgICAg IFRoaXMgcmVmYWN0b3JpbmcgcmVtb3ZlcyB0aGUgaW5kaXJlY3Rpb24gdGhyb3VnaCBSZW5kZXJU ZXh0Q29udHJvbCBhbmQgbWFrZXMgdGhlIG93bmVyc2hpcCBvZgorICAgICAgICBzaGFkb3cgRE9N IGZvciBpbnB1dCBhbmQgdGV4dGFyZWEgZWxlbWVudHMgY2xlYXIuIEl0IGFjY2Vzc2luZyBzaGFk b3cgRE9NIG9mIGlucHV0IGFuZCB0ZXh0YXJlYSBlbGVtZW50cworICAgICAgICBhcmUgbm93IGxl c3MgZXJyb3ItcHJvbmUgYmVjYXVzZSBpdCBkb2Vzbid0IGRlcGVuZCBvbiB0aGUgbGlmZXRpbWUg b2YgdGhlIHJlbmRlciB0cmVlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKTogQWNjZXNzIGlubmVyVGV4dEVsZW1l bnQgdmlhCisgICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LgorICAgICAgICAqIGRv bS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYXZlcnNlVHJlZUFuZE1hcmspOiBObyBs b25nZXIgY2FsbHMgaW5uZXJUZXh0RWxlbWVudCBiZWNhdXNlIHRoaXMgd2FzIGEgd29yay1hcm91 bmQKKyAgICAgICAgbmVlZGVkIGJlZm9yZSBtYWtpbmcgaW5wdXQgYW5kIHRleHRhcmVhIGVsZW1l bnRzIHVzZSB0aGUgbmV3IHNoYWRvdyBET00gbW9kZWwuCisgICAgICAgICogZWRpdGluZy9UZXh0 SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEl0ZXJhdG9yOjpoYW5kbGVSZXBs YWNlZEVsZW1lbnQpOiBBY2Nlc3MgaW5uZXJUZXh0RWxlbWVudCB2aWEgSFRNTFRleHRGb3JtQ29u dHJvbEVsZW1lbnQuCisgICAgICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Omhhc1Zpc2libGVUZXh0QXJlYSk6IFRha2VzIGlubmVyVGV4dEVs ZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2V0 U2VsZWN0aW9uUmFuZ2UpOiBDYWxscyBpbm5lclRleHRFbGVtZW50KCkuCisgICAgICAgIChXZWJD b3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW9uKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW9uU3RhcnQp OiBEaXR0bzsgbm8gbG9uZ2VyIHVzZXMgYSB0ZW1wb3JhcnkgbG9jYWwgdmFyaWFibGUKKyAgICAg ICAgZm9yIGlubmVyVGV4dEVsZW1lbnQgYmVjYXVzZSBpbm5lclRleHRFbGVtZW50KCkgbm8gbG9u Z2VyIGRlcGVuZHMgb24gdGhlIGxpZmV0aW1lIG9mIHRoZSByZW5kZXIgdHJlZS4KKyAgICAgICAg KFdlYkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb25FbmQpOiBEaXR0 by4KKyAgICAgICAgKiBodG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaDoKKyAgICAgICAgKiBo dG1sL0hUTUxUZXh0QXJlYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRB cmVhRWxlbWVudDo6aW5uZXJUZXh0RWxlbWVudCk6IEFkZGVkLgorICAgICAgICAqIGh0bWwvSFRN TFRleHRBcmVhRWxlbWVudC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6dGV4dEZvcm1Db250 cm9sRWxlbWVudCk6IE1hZGUgdGhpcyBmdW5jdGlvbiBhIGNvbnN0IG1lbWJlci4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sOjppbm5lclRleHRFbGVtZW50KTogQWRkZWQuCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4 dENvbnRyb2xTaW5nbGVMaW5lLmg6CisKIDIwMTEtMDctMDcgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CiAKICAgICAgICAgTW92ZSBzZWxlY3Rpb24gcmVsYXRlZCBjb2RlIGZyb20g UmVuZGVyVGV4dENvbnRyb2wgdG8gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gOTA2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNDkzLDkgKzI0OTMsMTEgQEAgVmlzaWJsZVBvc2l0aW9uIEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplYwogICAgIAogaW50IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4Rm9yVmlzaWJs ZVBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgcG9zKSBjb25zdAogewotICAgIGlmIChp c05hdGl2ZVRleHRDb250cm9sKCkpCi0gICAgICAgIHJldHVybiBSZW5kZXJUZXh0Q29udHJvbDo6 aW5kZXhGb3JWaXNpYmxlUG9zaXRpb24odG9SZW5kZXJUZXh0Q29udHJvbChtX3JlbmRlcmVyKS0+ aW5uZXJUZXh0RWxlbWVudCgpLCBwb3MpOwotICAgIAorICAgIGlmIChpc05hdGl2ZVRleHRDb250 cm9sKCkpIHsKKyAgICAgICAgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQqIHRleHRDb250cm9s ID0gdG9SZW5kZXJUZXh0Q29udHJvbChtX3JlbmRlcmVyKS0+dGV4dEZvcm1Db250cm9sRWxlbWVu dCgpOworICAgICAgICByZXR1cm4gUmVuZGVyVGV4dENvbnRyb2w6OmluZGV4Rm9yVmlzaWJsZVBv c2l0aW9uKHRleHRDb250cm9sLT5pbm5lclRleHRFbGVtZW50KCksIHBvcyk7CisgICAgfQorCiAg ICAgaWYgKCFpc1RleHRDb250cm9sKCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIApJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9Ob2RlLmNwcAkocmV2aXNpb24gOTA2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vTm9k ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNDMsOSArMjM0Myw2IEBAIHN0YXRpYyB2b2lkIHRy YXZlcnNlVHJlZUFuZE1hcmsoY29uc3QgU3QKIAogICAgICAgICBDb250YWluZXJOb2RlKiByb290 Tm9kZSA9IHNoYWRvd1Jvb3QoY29uc3RfY2FzdDxOb2RlKj4obm9kZSkpOwogCi0gICAgICAgIGlm ICghcm9vdE5vZGUgJiYgbm9kZS0+cmVuZGVyZXIoKSAmJiBub2RlLT5yZW5kZXJlcigpLT5pc1Rl eHRDb250cm9sKCkpCi0gICAgICAgICAgICByb290Tm9kZSA9IHN0YXRpY19jYXN0PFJlbmRlclRl eHRDb250cm9sKj4obm9kZS0+cmVuZGVyZXIoKSktPmlubmVyVGV4dEVsZW1lbnQoKTsKLQogICAg ICAgICBpZiAocm9vdE5vZGUpIHsKICAgICAgICAgICAgIGluZGVudCArPSAiXHQiOwogICAgICAg ICAgICAgdHJhdmVyc2VUcmVlQW5kTWFyayhpbmRlbnQsIHJvb3ROb2RlLCBtYXJrZWROb2RlMSwg bWFya2VkTGFiZWwxLCBtYXJrZWROb2RlMiwgbWFya2VkTGFiZWwyKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHJldmlzaW9uIDkwNjYzKQorKysgU291cmNl L1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw2 ICszMCw3IEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2lu Y2x1ZGUgIkhUTUxFbGVtZW50LmgiCisjaW5jbHVkZSAiSFRNTEZvcm1Db250cm9sRWxlbWVudC5o IgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCiAjaW5j bHVkZSAiSW5saW5lVGV4dEJveC5oIgpAQCAtNjM3LDcgKzYzOCw3IEBAIGJvb2wgVGV4dEl0ZXJh dG9yOjpoYW5kbGVSZXBsYWNlZEVsZW1lbnQKICAgICB9CiAKICAgICBpZiAobV9lbnRlcnNUZXh0 Q29udHJvbHMgJiYgcmVuZGVyZXItPmlzVGV4dENvbnRyb2woKSkgewotICAgICAgICBpZiAoSFRN TEVsZW1lbnQqIGlubmVyVGV4dEVsZW1lbnQgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVy KS0+aW5uZXJUZXh0RWxlbWVudCgpKSB7CisgICAgICAgIGlmIChIVE1MRWxlbWVudCogaW5uZXJU ZXh0RWxlbWVudCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIpLT50ZXh0Rm9ybUNvbnRy b2xFbGVtZW50KCktPmlubmVyVGV4dEVsZW1lbnQoKSkgewogICAgICAgICAgICAgbV9ub2RlID0g aW5uZXJUZXh0RWxlbWVudC0+c2hhZG93VHJlZVJvb3ROb2RlKCk7CiAgICAgICAgICAgICBwdXNo RnVsbHlDbGlwcGVkU3RhdGUobV9mdWxseUNsaXBwZWRTdGFjaywgbV9ub2RlKTsKICAgICAgICAg ICAgIG1fb2Zmc2V0ID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250 cm9sRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9y bUNvbnRyb2xFbGVtZW50LmNwcAkocmV2aXNpb24gOTA2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02ODEsMTAg KzY4MSw5IEBAIHZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OmRpc3BhdGMKICAgICBz ZXRDaGFuZ2VkU2luY2VMYXN0Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudChmYWxzZSk7CiB9CiAKLXN0 YXRpYyBpbmxpbmUgYm9vbCBoYXNWaXNpYmxlVGV4dEFyZWEoUmVuZGVyVGV4dENvbnRyb2wqIHRl eHRDb250cm9sKQorc3RhdGljIGlubGluZSBib29sIGhhc1Zpc2libGVUZXh0QXJlYShSZW5kZXJU ZXh0Q29udHJvbCogdGV4dENvbnRyb2wsIEhUTUxFbGVtZW50KiBpbm5lclRleHQpCiB7CiAgICAg QVNTRVJUKHRleHRDb250cm9sKTsKLSAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gdGV4dENv bnRyb2wtPmlubmVyVGV4dEVsZW1lbnQoKTsKICAgICByZXR1cm4gdGV4dENvbnRyb2wtPnN0eWxl KCktPnZpc2liaWxpdHkoKSAhPSBISURERU4gJiYgaW5uZXJUZXh0ICYmIGlubmVyVGV4dC0+cmVu ZGVyZXIoKSAmJiBpbm5lclRleHQtPnJlbmRlckJveCgpLT5oZWlnaHQoKTsKIH0KIApAQCAtNjk5 LDcgKzY5OCw3IEBAIHZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNldFNlbGUKICAg ICBzdGFydCA9IG1pbihtYXgoc3RhcnQsIDApLCBlbmQpOwogCiAgICAgUmVuZGVyVGV4dENvbnRy b2wqIGNvbnRyb2wgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkpOwotICAgIGlmICgh aGFzVmlzaWJsZVRleHRBcmVhKGNvbnRyb2wpKSB7CisgICAgaWYgKCFoYXNWaXNpYmxlVGV4dEFy ZWEoY29udHJvbCwgaW5uZXJUZXh0RWxlbWVudCgpKSkgewogICAgICAgICBjYWNoZVNlbGVjdGlv bihzdGFydCwgZW5kKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTczMSwxNCArNzMwLDEw IEBAIGludCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW8KICAgICAgICAgcmV0 dXJuIG1fY2FjaGVkU2VsZWN0aW9uU3RhcnQ7CiAKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVu dCgpLT5mcmFtZSgpOwotICAgIGlmICghcmVuZGVyZXIoKSB8fCAhZnJhbWUpCisgICAgaWYgKCFm cmFtZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0g dG9SZW5kZXJUZXh0Q29udHJvbChyZW5kZXJlcigpKS0+aW5uZXJUZXh0RWxlbWVudCgpOwotICAg IC8vIERvIG5vdCBjYWxsIGlubmVyVGV4dEVsZW1lbnQoKSBpbiB0aGUgZnVuY3Rpb24gYXJndW1l bnRzIGFzIGNyZWF0aW5nIGEgVmlzaWJsZVBvc2l0aW9uCi0gICAgLy8gZnJvbSBmcmFtZS0+c2Vs ZWN0aW9uLT5zdGFydCgpIGNhbiBibG93IHVzIGZyb20gdW5kZXJuZWF0aC4gQWxzbywgZnVuY3Rp b24gb3JkZXJpbmcgaXMKLSAgICAvLyB1c3VhbGx5IGRlcGVuZGVudCBvbiB0aGUgY29tcGlsZXIu Ci0gICAgcmV0dXJuIFJlbmRlclRleHRDb250cm9sOjppbmRleEZvclZpc2libGVQb3NpdGlvbihp bm5lclRleHQsIGZyYW1lLT5zZWxlY3Rpb24oKS0+c3RhcnQoKSk7CisgICAgcmV0dXJuIFJlbmRl clRleHRDb250cm9sOjppbmRleEZvclZpc2libGVQb3NpdGlvbihpbm5lclRleHRFbGVtZW50KCks IGZyYW1lLT5zZWxlY3Rpb24oKS0+c3RhcnQoKSk7CiB9CiAKIGludCBIVE1MVGV4dEZvcm1Db250 cm9sRWxlbWVudDo6c2VsZWN0aW9uRW5kKCkgY29uc3QKQEAgLTc0OSwxNCArNzQ0LDEwIEBAIGlu dCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW8KICAgICAgICAgcmV0dXJuIG1f Y2FjaGVkU2VsZWN0aW9uRW5kOwogCiAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJh bWUoKTsKLSAgICBpZiAoIXJlbmRlcmVyKCkgfHwgIWZyYW1lKQorICAgIGlmICghZnJhbWUpCiAg ICAgICAgIHJldHVybiAwOwogCi0gICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4dCA9IHRvUmVuZGVy VGV4dENvbnRyb2wocmVuZGVyZXIoKSktPmlubmVyVGV4dEVsZW1lbnQoKTsKLSAgICAvLyBEbyBu b3QgY2FsbCBpbm5lclRleHRFbGVtZW50KCkgaW4gdGhlIGZ1bmN0aW9uIGFyZ3VtZW50cyBhcyBj cmVhdGluZyBhIFZpc2libGVQb3NpdGlvbgotICAgIC8vIGZyb20gZnJhbWUtPnNlbGVjdGlvbi0+ c3RhcnQoKSBjYW4gYmxvdyB1cyBmcm9tIHVuZGVybmVhdGguIEFsc28sIGZ1bmN0aW9uIG9yZGVy aW5nIGlzCi0gICAgLy8gdXN1YWxseSBkZXBlbmRlbnQgb24gdGhlIGNvbXBpbGVyLgotICAgIHJl dHVybiBSZW5kZXJUZXh0Q29udHJvbDo6aW5kZXhGb3JWaXNpYmxlUG9zaXRpb24oaW5uZXJUZXh0 LCBmcmFtZS0+c2VsZWN0aW9uKCktPmVuZCgpKTsKKyAgICByZXR1cm4gUmVuZGVyVGV4dENvbnRy b2w6OmluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKGlubmVyVGV4dEVsZW1lbnQoKSwgZnJhbWUtPnNl bGVjdGlvbigpLT5lbmQoKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRDb250YWluZXJB bmRPZmZzZXRGb3JSYW5nZShOb2RlKiBub2RlLCBpbnQgb2Zmc2V0LCBOb2RlKiYgY29udGFpbmVy Tm9kZSwgaW50JiBvZmZzZXRJbkNvbnRhaW5lcikKQEAgLTc3OSw3ICs3NzAsNyBAQCBQYXNzUmVm UHRyPFJhbmdlPiBIVE1MVGV4dEZvcm1Db250cm9sRWxlCiAgICAgaW50IGVuZCA9IG1fY2FjaGVk U2VsZWN0aW9uRW5kOwogCiAgICAgQVNTRVJUKHN0YXJ0IDw9IGVuZCk7Ci0gICAgSFRNTEVsZW1l bnQqIGlubmVyVGV4dCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSktPmlubmVyVGV4 dEVsZW1lbnQoKTsKKyAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gaW5uZXJUZXh0RWxlbWVu dCgpOwogICAgIGlmICghaW5uZXJUZXh0KQogICAgICAgICByZXR1cm4gMDsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgJKHJldmlzaW9uIDkw NjYzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTIxNCw2ICsyMTQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQg bWF4TGVuZ3RoKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgU3RyaW5nIHZhbHVlKCkgY29uc3Qg PSAwOwogCisgICAgdmlydHVhbCBIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0 ID0gMDsKKwogICAgIHZvaWQgY2FjaGVTZWxlY3Rpb24oaW50IHN0YXJ0LCBpbnQgZW5kKQogICAg IHsKICAgICAgICAgbV9jYWNoZWRTZWxlY3Rpb25TdGFydCA9IHN0YXJ0OwpJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0QXJlYUVsZW1lbnQuY3BwCShyZXZpc2lvbiA5MDY2MykK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI2OSw2ICsyNjksMTMgQEAgU3RyaW5nIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnNh bml0aXplVXNlcgogICAgIHJldHVybiBwcm9wb3NlZFZhbHVlLmxlZnQobnVtQ2hhcmFjdGVyc0lu R3JhcGhlbWVDbHVzdGVycyhwcm9wb3NlZFZhbHVlLCBtYXhMZW5ndGgpKTsKIH0KIAorSFRNTEVs ZW1lbnQqIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OmlubmVyVGV4dEVsZW1lbnQoKSBjb25zdAorewor ICAgIE5vZGUqIG5vZGUgPSBzaGFkb3dSb290KCktPmZpcnN0Q2hpbGQoKTsKKyAgICBBU1NFUlQo IW5vZGUgfHwgbm9kZS0+aGFzVGFnTmFtZShkaXZUYWcpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8SFRNTEVsZW1lbnQqPihub2RlKTsKK30KKwogdm9pZCBIVE1MVGV4dEFyZWFFbGVtZW50Ojpy ZW5kZXJlcldpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgdXBkYXRlVmFsdWUoKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCShyZXZpc2lvbiA5MDY2MykK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC01MSw4ICs1MSwxMCBAQCBwdWJsaWM6CiAgICAgYm9vbCB0b29Mb25nKGNvbnN0IFN0 cmluZyYsIE5lZWRzVG9DaGVja0RpcnR5RmxhZykgY29uc3Q7CiAgICAgYm9vbCBpc1ZhbGlkVmFs dWUoY29uc3QgU3RyaW5nJikgY29uc3Q7CiAgICAgCisgICAgdmlydHVhbCBIVE1MRWxlbWVudCog aW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0OworCiAgICAgdm9pZCByZW5kZXJlcldpbGxCZURlc3Ry b3llZCgpOwotICAgIAorCiAgICAgdm9pZCBzZXRDb2xzKGludCk7CiAgICAgdm9pZCBzZXRSb3dz KGludCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sLmNwcAkocmV2aXNpb24gOTA2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dENvbnRyb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSwxMSArODEsMTYgQEAg UmVuZGVyVGV4dENvbnRyb2w6On5SZW5kZXJUZXh0Q29udHJvbCgpCiB7CiB9CiAKLUhUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50KiBSZW5kZXJUZXh0Q29udHJvbDo6dGV4dEZvcm1Db250cm9sRWxl bWVudCgpCitIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudCogUmVuZGVyVGV4dENvbnRyb2w6OnRl eHRGb3JtQ29udHJvbEVsZW1lbnQoKSBjb25zdAogewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxI VE1MVGV4dEZvcm1Db250cm9sRWxlbWVudCo+KG5vZGUoKSk7CiB9CiAKK0hUTUxFbGVtZW50KiBS ZW5kZXJUZXh0Q29udHJvbDo6aW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0Cit7CisgICAgcmV0dXJu IHRleHRGb3JtQ29udHJvbEVsZW1lbnQoKS0+aW5uZXJUZXh0RWxlbWVudCgpOworfQorCiB2b2lk IFJlbmRlclRleHRDb250cm9sOjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwg Y29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKQogewogICAgIFJlbmRlckJsb2NrOjpzdHlsZURp ZENoYW5nZShkaWZmLCBvbGRTdHlsZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dENvbnRyb2wuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2wuaAkocmV2aXNpb24gOTA2NjMpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsOCAr MzUsNyBAQCBjbGFzcyBSZW5kZXJUZXh0Q29udHJvbCA6IHB1YmxpYyBSZW5kZXJCCiBwdWJsaWM6 CiAgICAgdmlydHVhbCB+UmVuZGVyVGV4dENvbnRyb2woKTsKIAotICAgIEhUTUxUZXh0Rm9ybUNv bnRyb2xFbGVtZW50KiB0ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCk7Ci0gICAgdmlydHVhbCBIVE1M RWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0ID0gMDsKKyAgICBIVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudCogdGV4dEZvcm1Db250cm9sRWxlbWVudCgpIGNvbnN0OwogICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gY3JlYXRlSW5uZXJUZXh0U3R5bGUoY29uc3QgUmVu ZGVyU3R5bGUqIHN0YXJ0U3R5bGUpIGNvbnN0ID0gMDsKIAogICAgIGJvb2wgbGFzdENoYW5nZVdh c1VzZXJFZGl0KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0Q2hhbmdlV2FzVXNlckVkaXQ7IH0KQEAg LTU0LDYgKzUzLDggQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIFJlbmRlclRleHRDb250cm9s KE5vZGUqLCBib29sKTsKIAorICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHRFbGVtZW50KCkgY29u c3Q7CisKICAgICBpbnQgc2Nyb2xsYmFyVGhpY2tuZXNzKCkgY29uc3Q7CiAgICAgdm9pZCBhZGp1 c3RJbm5lclRleHRTdHlsZShjb25zdCBSZW5kZXJTdHlsZSogc3RhcnRTdHlsZSwgUmVuZGVyU3R5 bGUqIHRleHRCbG9ja1N0eWxlKSBjb25zdDsKICAgICB2b2lkIHNldElubmVyVGV4dFZhbHVlKGNv bnN0IFN0cmluZyYpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sTXVsdGlMaW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuY3BwCShyZXZpc2lvbiA5MDY2MykKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ0LDExICs0NCw2IEBAIFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5l Ojp+UmVuZGVyVGV4dEMKICAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTFRleHRBcmVhRWxlbWVudCo+ KG5vZGUoKSktPnJlbmRlcmVyV2lsbEJlRGVzdHJveWVkKCk7CiB9CiAKLUhUTUxFbGVtZW50KiBS ZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZTo6aW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0Ci17Ci0g ICAgcmV0dXJuIHRvSFRNTEVsZW1lbnQodG9FbGVtZW50KG5vZGUoKSktPnNoYWRvd1Jvb3QoKS0+ Zmlyc3RDaGlsZCgpKTsKLX0KLQogdm9pZCBSZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZTo6c3Vi dHJlZUhhc0NoYW5nZWQoKQogewogICAgIFJlbmRlclRleHRDb250cm9sOjpzdWJ0cmVlSGFzQ2hh bmdlZCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s TXVsdGlMaW5lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sTXVsdGlMaW5lLmgJKHJldmlzaW9uIDkwNjYzKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmgJKHdvcmtpbmcgY29weSkK QEAgLTMxLDggKzMxLDYgQEAgcHVibGljOgogICAgIFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5l KE5vZGUqLCBib29sKTsKICAgICB2aXJ0dWFsIH5SZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZSgp OwogCi0gICAgdmlydHVhbCBIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0Owot CiAgICAgdm9pZCBmb3J3YXJkRXZlbnQoRXZlbnQqKTsKIAogcHJpdmF0ZToKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmUuY3BwCShyZXZpc2lvbiA5MDY2MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCwxMSAr OTQsNiBAQCBpbmxpbmUgSFRNTEVsZW1lbnQqIFJlbmRlclRleHRDb250cm9sU2luCiAgICAgcmV0 dXJuIGlucHV0RWxlbWVudCgpLT5jb250YWluZXJFbGVtZW50KCk7CiB9CiAKLWlubGluZSBIVE1M RWxlbWVudCogUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjppbm5lclRleHRFbGVtZW50KCkg Y29uc3QKLXsKLSAgICByZXR1cm4gaW5wdXRFbGVtZW50KCktPmlubmVyVGV4dEVsZW1lbnQoKTsK LX0KLQogaW5saW5lIEhUTUxFbGVtZW50KiBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6Omlu bmVyQmxvY2tFbGVtZW50KCkgY29uc3QKIHsKICAgICByZXR1cm4gaW5wdXRFbGVtZW50KCktPmlu bmVyQmxvY2tFbGVtZW50KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oCShyZXZpc2lvbiA5MDY2MykKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAko d29ya2luZyBjb3B5KQpAQCAtMTMxLDcgKzEzMSw2IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBp bnQgdGV4dEJsb2NrSW5zZXRUb3AoKSBjb25zdDsKIAogICAgIEhUTUxFbGVtZW50KiBjb250YWlu ZXJFbGVtZW50KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxl bWVudCgpIGNvbnN0OwogICAgIEhUTUxFbGVtZW50KiBpbm5lckJsb2NrRWxlbWVudCgpIGNvbnN0 OwogICAgIEhUTUxFbGVtZW50KiBpbm5lclNwaW5CdXR0b25FbGVtZW50KCkgY29uc3Q7CiAgICAg SFRNTEVsZW1lbnQqIHJlc3VsdHNCdXR0b25FbGVtZW50KCkgY29uc3Q7Cg==