54377 2011-02-13 23:42:05 -0800 Clean up RenderTextControlSingleLine::createSubtreeIfNeeded() 2011-02-14 06:09:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 rolandsteiner webkit-unassigned commit-queue dglazkov dominicc morrita tkent oldest_to_newest 350536 0 rolandsteiner 2011-02-13 23:42:05 -0800 RenderTextControlSingleLine::createSubtreeIfNeeded() is hard to read and contains a few superfluous conditions. Cleaning it up would help with further refactoring towards shadow DOM. 350538 1 82290 rolandsteiner 2011-02-13 23:48:17 -0800 Created attachment 82290 Patch 350540 2 82290 tkent 2011-02-13 23:51:58 -0800 Comment on attachment 82290 Patch looks good. 350546 3 82292 rolandsteiner 2011-02-14 00:14:00 -0800 Created attachment 82292 extended patch Extended patch, also removes superfluous check in createInnerBlockStyle() - inner blocks are only created for search fields, and those can never have spin buttons 350623 4 82292 commit-queue 2011-02-14 06:09:07 -0800 Comment on attachment 82292 extended patch Clearing flags on attachment: 82292 Committed r78473: <http://trac.webkit.org/changeset/78473> 350624 5 commit-queue 2011-02-14 06:09:11 -0800 All reviewed patches have been landed. Closing bug. 82290 2011-02-13 23:48:17 -0800 2011-02-14 00:13:56 -0800 Patch bug-54377-20110214164815.patch text/plain 5835 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogNzg0NTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YmU0ODFjN2U2YmE5Yjcw OGYwM2QzYzY3NGRmZjg4MDk4MGJlZDE2Li40MGU3ODc4N2M5ZTY5MWIxNDg3OTk5MWYxZWIyNjE4 ZjlmMWM1YTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMTMgIFJvbGFu ZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDU0Mzc3IC0gQ2xlYW4gdXAgUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQzNzcKKworICAgICAg ICBSZWFycmFuZ2VkIHRoZSBjb25kaXRpb24gYmxvY2tzLCByZW1vdmVkIHN1cGVyZmx1b3VzIGNv bmRpdGlvbnM6CisgICAgICAgIC4pIGlmLXN0YXRlbWVudHMgd2hlcmUgaXQncyBhbHJlYWR5IGNs ZWFyIHRoYXQgYSBzZWFyY2ggZmllbGQgaXMgYmVpbmcgZ2VuZXJhdGVkCisgICAgICAgIC4pIHRl c3RpbmcgZm9yIHNwaW4tYnV0dG9ucyBvbiBmaWVsZCB0eXBlcyB0aGF0IGNhbiBuZXZlciBoYXZl IHRoZW0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoUmVmYWN0b3JpbmcgLSBjb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzKQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s U2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OmNyZWF0ZVN1YnRyZWVJZk5lZWRlZCk6CisKIDIwMTEtMDItMTIgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3Vy eWFrb3YuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENv bnRyb2xTaW5nbGVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmUuY3BwCmluZGV4IGQ1OThjYTZlMTBkZjMxNDJjZDE3MWNiODQ4OTJh MmYyNThiYTNkM2YuLjY0MWY1Nzk1MmU4ODYzM2RmNDkyNmQ4ODE4NWE4N2NkODdmMDY5M2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bFNpbmdsZUxpbmUuY3BwCkBAIC02MDUsOSArNjA1LDEzIEBAIHZvaWQgUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lOjphZGp1c3RDb250cm9sSGVpZ2h0QmFzZWRPbkxpbmVIZWlnaHQoaW50IGxp bmVICiAKIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjcmVhdGVTdWJ0cmVlSWZO ZWVkZWQoKQogewotICAgIGJvb2wgY3JlYXRlU3VidHJlZSA9IGlucHV0RWxlbWVudCgpLT5pc1Nl YXJjaEZpZWxkKCk7Ci0gICAgaWYgKCFjcmVhdGVTdWJ0cmVlKSB7Ci0gICAgICAgIFJlbmRlclRl eHRDb250cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQobV9pbm5lckJsb2NrLmdldCgpKTsKKyAg ICBpZiAoaW5wdXRFbGVtZW50KCktPmlzU2VhcmNoRmllbGQoKSkgeworICAgICAgICBpZiAoIW1f aW5uZXJCbG9jaykgeworICAgICAgICAgICAgLy8gQ3JlYXRlIHRoZSBpbm5lciBibG9jayBlbGVt ZW50CisgICAgICAgICAgICBtX2lubmVyQmxvY2sgPSBUZXh0Q29udHJvbElubmVyRWxlbWVudDo6 Y3JlYXRlKHRvSFRNTEVsZW1lbnQobm9kZSgpKSk7CisgICAgICAgICAgICBtX2lubmVyQmxvY2st PmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0ZUlubmVyQmxvY2tTdHlsZShzdHlsZSgp KSwgcmVuZGVyQXJlbmEoKSk7CisgICAgICAgIH0KKwogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gp CiAgICAgICAgIGlmIChpbnB1dEVsZW1lbnQoKS0+aXNTcGVlY2hFbmFibGVkKCkgJiYgIW1fc3Bl ZWNoQnV0dG9uKSB7CiAgICAgICAgICAgICAvLyBDcmVhdGUgdGhlIHNwZWVjaCBidXR0b24gZWxl bWVudC4KQEAgLTYxNSw1MiArNjE5LDQyIEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoKQogICAgICAgICAgICAgbV9zcGVlY2hCdXR0b24t PmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0ZVNwZWVjaEJ1dHRvblN0eWxlKCksIHJl bmRlckFyZW5hKCkpOwogICAgICAgICB9CiAjZW5kaWYKLSAgICAgICAgYm9vbCBoYXNTcGluQnV0 dG9uID0gaW5wdXRFbGVtZW50KCktPmhhc1NwaW5CdXR0b24oKTsKLSAgICAgICAgaWYgKGhhc1Nw aW5CdXR0b24gJiYgIW1faW5uZXJTcGluQnV0dG9uKSB7Ci0gICAgICAgICAgICBtX2lubmVyU3Bp bkJ1dHRvbiA9IFNwaW5CdXR0b25FbGVtZW50OjpjcmVhdGUodG9IVE1MRWxlbWVudChub2RlKCkp KTsKLSAgICAgICAgICAgIG1faW5uZXJTcGluQnV0dG9uLT5hdHRhY2hJbm5lckVsZW1lbnQobm9k ZSgpLCBjcmVhdGVJbm5lclNwaW5CdXR0b25TdHlsZSgpLCByZW5kZXJBcmVuYSgpKTsKLSAgICAg ICAgfQotICAgICAgICBpZiAoaGFzU3BpbkJ1dHRvbiAmJiAhbV9vdXRlclNwaW5CdXR0b24pIHsK LSAgICAgICAgICAgIG1fb3V0ZXJTcGluQnV0dG9uID0gU3BpbkJ1dHRvbkVsZW1lbnQ6OmNyZWF0 ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOwotICAgICAgICAgICAgbV9vdXRlclNwaW5CdXR0b24t PmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0ZU91dGVyU3BpbkJ1dHRvblN0eWxlKCks IHJlbmRlckFyZW5hKCkpOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAKLSAg ICBpZiAoIW1faW5uZXJCbG9jaykgewotICAgICAgICAvLyBDcmVhdGUgdGhlIGlubmVyIGJsb2Nr IGVsZW1lbnQKLSAgICAgICAgbV9pbm5lckJsb2NrID0gVGV4dENvbnRyb2xJbm5lckVsZW1lbnQ6 OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOwotICAgICAgICBtX2lubmVyQmxvY2stPmF0 dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0ZUlubmVyQmxvY2tTdHlsZShzdHlsZSgpKSwg cmVuZGVyQXJlbmEoKSk7Ci0gICAgfQotI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCi0gICAgaWYg KGlucHV0RWxlbWVudCgpLT5pc1NwZWVjaEVuYWJsZWQoKSAmJiAhbV9zcGVlY2hCdXR0b24pIHsK LSAgICAgICAgLy8gQ3JlYXRlIHRoZSBzcGVlY2ggYnV0dG9uIGVsZW1lbnQuCi0gICAgICAgIG1f c3BlZWNoQnV0dG9uID0gSW5wdXRGaWVsZFNwZWVjaEJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hU TUxFbGVtZW50KG5vZGUoKSkpOwotICAgICAgICBtX3NwZWVjaEJ1dHRvbi0+YXR0YWNoSW5uZXJF bGVtZW50KG5vZGUoKSwgY3JlYXRlU3BlZWNoQnV0dG9uU3R5bGUoKSwgcmVuZGVyQXJlbmEoKSk7 Ci0gICAgfQotI2VuZGlmCi0gICAgaWYgKGlucHV0RWxlbWVudCgpLT5oYXNTcGluQnV0dG9uKCkg JiYgIW1fb3V0ZXJTcGluQnV0dG9uKSB7Ci0gICAgICAgIG1fb3V0ZXJTcGluQnV0dG9uID0gU3Bp bkJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOwotICAgICAgICBt X291dGVyU3BpbkJ1dHRvbi0+YXR0YWNoSW5uZXJFbGVtZW50KG5vZGUoKSwgY3JlYXRlT3V0ZXJT cGluQnV0dG9uU3R5bGUoKSwgcmVuZGVyQXJlbmEoKSk7Ci0gICAgfQotCi0gICAgaWYgKGlucHV0 RWxlbWVudCgpLT5pc1NlYXJjaEZpZWxkKCkpIHsKICAgICAgICAgaWYgKCFtX3Jlc3VsdHNCdXR0 b24pIHsKICAgICAgICAgICAgIC8vIENyZWF0ZSB0aGUgc2VhcmNoIHJlc3VsdHMgYnV0dG9uIGVs ZW1lbnQuCiAgICAgICAgICAgICBtX3Jlc3VsdHNCdXR0b24gPSBTZWFyY2hGaWVsZFJlc3VsdHNC dXR0b25FbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQoKSk7CiAgICAgICAgICAgICBtX3Jlc3VsdHNC dXR0b24tPmF0dGFjaElubmVyRWxlbWVudChtX2lubmVyQmxvY2suZ2V0KCksIGNyZWF0ZVJlc3Vs dHNCdXR0b25TdHlsZShtX2lubmVyQmxvY2stPnJlbmRlcmVyKCktPnN0eWxlKCkpLCByZW5kZXJB cmVuYSgpKTsKICAgICAgICAgfQotICAgIH0KIAotICAgIC8vIENyZWF0ZSBpbm5lclRleHQgZWxl bWVudCBiZWZvcmUgYWRkaW5nIHRoZSBvdGhlciBidXR0b25zLgotICAgIFJlbmRlclRleHRDb250 cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQobV9pbm5lckJsb2NrLmdldCgpKTsKKyAgICAgICAg Ly8gQ3JlYXRlIGlubmVyVGV4dCBlbGVtZW50IGJlZm9yZSBhZGRpbmcgdGhlIG90aGVyIGJ1dHRv bnMuCisgICAgICAgIFJlbmRlclRleHRDb250cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQobV9p bm5lckJsb2NrLmdldCgpKTsKIAotICAgIGlmIChpbnB1dEVsZW1lbnQoKS0+aXNTZWFyY2hGaWVs ZCgpKSB7CiAgICAgICAgIGlmICghbV9jYW5jZWxCdXR0b24pIHsKICAgICAgICAgICAgIC8vIENy ZWF0ZSB0aGUgY2FuY2VsIGJ1dHRvbiBlbGVtZW50LgogICAgICAgICAgICAgbV9jYW5jZWxCdXR0 b24gPSBTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCgpKTsK ICAgICAgICAgICAgIG1fY2FuY2VsQnV0dG9uLT5hdHRhY2hJbm5lckVsZW1lbnQobV9pbm5lckJs b2NrLmdldCgpLCBjcmVhdGVDYW5jZWxCdXR0b25TdHlsZShtX2lubmVyQmxvY2stPnJlbmRlcmVy KCktPnN0eWxlKCkpLCByZW5kZXJBcmVuYSgpKTsKICAgICAgICAgfQorICAgIH0gZWxzZSB7Cisg ICAgICAgIFJlbmRlclRleHRDb250cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoMCk7CisKKyNp ZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQorICAgICAgICBpZiAoaW5wdXRFbGVtZW50KCktPmlzU3Bl ZWNoRW5hYmxlZCgpICYmICFtX3NwZWVjaEJ1dHRvbikgeworICAgICAgICAgICAgLy8gQ3JlYXRl IHRoZSBzcGVlY2ggYnV0dG9uIGVsZW1lbnQuCisgICAgICAgICAgICBtX3NwZWVjaEJ1dHRvbiA9 IElucHV0RmllbGRTcGVlY2hCdXR0b25FbGVtZW50OjpjcmVhdGUodG9IVE1MRWxlbWVudChub2Rl KCkpKTsKKyAgICAgICAgICAgIG1fc3BlZWNoQnV0dG9uLT5hdHRhY2hJbm5lckVsZW1lbnQobm9k ZSgpLCBjcmVhdGVTcGVlY2hCdXR0b25TdHlsZSgpLCByZW5kZXJBcmVuYSgpKTsKKyAgICAgICAg fQorI2VuZGlmCisKKyAgICAgICAgYm9vbCBoYXNTcGluQnV0dG9uID0gaW5wdXRFbGVtZW50KCkt Pmhhc1NwaW5CdXR0b24oKTsKKworICAgICAgICBpZiAoaGFzU3BpbkJ1dHRvbiAmJiAhbV9pbm5l clNwaW5CdXR0b24pIHsKKyAgICAgICAgICAgIG1faW5uZXJTcGluQnV0dG9uID0gU3BpbkJ1dHRv bkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOworICAgICAgICAgICAgbV9p bm5lclNwaW5CdXR0b24tPmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0ZUlubmVyU3Bp bkJ1dHRvblN0eWxlKCksIHJlbmRlckFyZW5hKCkpOworICAgICAgICB9CisgICAgICAgIGlmICho YXNTcGluQnV0dG9uICYmICFtX291dGVyU3BpbkJ1dHRvbikgeworICAgICAgICAgICAgbV9vdXRl clNwaW5CdXR0b24gPSBTcGluQnV0dG9uRWxlbWVudDo6Y3JlYXRlKHRvSFRNTEVsZW1lbnQobm9k ZSgpKSk7CisgICAgICAgICAgICBtX291dGVyU3BpbkJ1dHRvbi0+YXR0YWNoSW5uZXJFbGVtZW50 KG5vZGUoKSwgY3JlYXRlT3V0ZXJTcGluQnV0dG9uU3R5bGUoKSwgcmVuZGVyQXJlbmEoKSk7Cisg ICAgICAgIH0KICAgICB9CiB9CiAK 82292 2011-02-14 00:14:00 -0800 2011-02-14 06:09:07 -0800 extended patch bug-54377-20110214171359.patch text/plain 6548 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogNzg0NTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YmU0ODFjN2U2YmE5Yjcw OGYwM2QzYzY3NGRmZjg4MDk4MGJlZDE2Li5lMmEyZDgxMmQzODA4YzA0MzQ1YzNhYTg3OGRmYTg2 OGRmY2Q0YjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDItMTMgIFJvbGFu ZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDU0Mzc3IC0gQ2xlYW4gdXAgUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQzNzcKKworICAgICAg ICBSZWFycmFuZ2VkIHRoZSBjb25kaXRpb24gYmxvY2tzLCByZW1vdmVkIHN1cGVyZmx1b3VzIGNv bmRpdGlvbnM6CisgICAgICAgIC4pIGlmLXN0YXRlbWVudHMgd2hlcmUgaXQncyBhbHJlYWR5IGNs ZWFyIHRoYXQgYSBzZWFyY2ggZmllbGQgaXMgYmVpbmcgZ2VuZXJhdGVkCisgICAgICAgIC4pIHRl c3RpbmcgZm9yIHNwaW4tYnV0dG9ucyBvbiBmaWVsZCB0eXBlcyB0aGF0IGNhbiBuZXZlciBoYXZl IHRoZW0uCisKKyAgICAgICAgY3JlYXRlSW5uZXJCbG9ja1N0eWxlKCk6IG9ubHkgc2VhcmNoIGZp ZWxkcyBjcmVhdGUgYW4gaW5uZXIgYmxvY2ssIGFuZAorICAgICAgICB0aGVzZSBjYW4gbmV2ZXIg aGF2ZSBzcGluIGJ1dHRvbnMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoUmVmYWN0b3Jpbmcg LSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzKQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmU6OmNyZWF0ZUlubmVyQmxvY2tTdHlsZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNyZWF0ZVN1YnRyZWVJZk5lZWRlZCk6 CisKIDIwMTEtMDItMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCmluZGV4IGQ1 OThjYTZlMTBkZjMxNDJjZDE3MWNiODQ4OTJhMmYyNThiYTNkM2YuLjRlZDI1NWU2YzNhYTFiZTA1 ZmE4YTMwY2VkZTYxNGYzMmViZTUyYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCkBAIC02MDUsOSArNjA1 LDEzIEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjphZGp1c3RDb250cm9sSGVp Z2h0QmFzZWRPbkxpbmVIZWlnaHQoaW50IGxpbmVICiAKIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xT aW5nbGVMaW5lOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoKQogewotICAgIGJvb2wgY3JlYXRlU3Vi dHJlZSA9IGlucHV0RWxlbWVudCgpLT5pc1NlYXJjaEZpZWxkKCk7Ci0gICAgaWYgKCFjcmVhdGVT dWJ0cmVlKSB7Ci0gICAgICAgIFJlbmRlclRleHRDb250cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVk ZWQobV9pbm5lckJsb2NrLmdldCgpKTsKKyAgICBpZiAoaW5wdXRFbGVtZW50KCktPmlzU2VhcmNo RmllbGQoKSkgeworICAgICAgICBpZiAoIW1faW5uZXJCbG9jaykgeworICAgICAgICAgICAgLy8g Q3JlYXRlIHRoZSBpbm5lciBibG9jayBlbGVtZW50CisgICAgICAgICAgICBtX2lubmVyQmxvY2sg PSBUZXh0Q29udHJvbElubmVyRWxlbWVudDo6Y3JlYXRlKHRvSFRNTEVsZW1lbnQobm9kZSgpKSk7 CisgICAgICAgICAgICBtX2lubmVyQmxvY2stPmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNy ZWF0ZUlubmVyQmxvY2tTdHlsZShzdHlsZSgpKSwgcmVuZGVyQXJlbmEoKSk7CisgICAgICAgIH0K KwogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAgICAgICAgIGlmIChpbnB1dEVsZW1lbnQoKS0+ aXNTcGVlY2hFbmFibGVkKCkgJiYgIW1fc3BlZWNoQnV0dG9uKSB7CiAgICAgICAgICAgICAvLyBD cmVhdGUgdGhlIHNwZWVjaCBidXR0b24gZWxlbWVudC4KQEAgLTYxNSw1MiArNjE5LDQyIEBAIHZv aWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQoKQog ICAgICAgICAgICAgbV9zcGVlY2hCdXR0b24tPmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNy ZWF0ZVNwZWVjaEJ1dHRvblN0eWxlKCksIHJlbmRlckFyZW5hKCkpOwogICAgICAgICB9CiAjZW5k aWYKLSAgICAgICAgYm9vbCBoYXNTcGluQnV0dG9uID0gaW5wdXRFbGVtZW50KCktPmhhc1NwaW5C dXR0b24oKTsKLSAgICAgICAgaWYgKGhhc1NwaW5CdXR0b24gJiYgIW1faW5uZXJTcGluQnV0dG9u KSB7Ci0gICAgICAgICAgICBtX2lubmVyU3BpbkJ1dHRvbiA9IFNwaW5CdXR0b25FbGVtZW50Ojpj cmVhdGUodG9IVE1MRWxlbWVudChub2RlKCkpKTsKLSAgICAgICAgICAgIG1faW5uZXJTcGluQnV0 dG9uLT5hdHRhY2hJbm5lckVsZW1lbnQobm9kZSgpLCBjcmVhdGVJbm5lclNwaW5CdXR0b25TdHls ZSgpLCByZW5kZXJBcmVuYSgpKTsKLSAgICAgICAgfQotICAgICAgICBpZiAoaGFzU3BpbkJ1dHRv biAmJiAhbV9vdXRlclNwaW5CdXR0b24pIHsKLSAgICAgICAgICAgIG1fb3V0ZXJTcGluQnV0dG9u ID0gU3BpbkJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOwotICAg ICAgICAgICAgbV9vdXRlclNwaW5CdXR0b24tPmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNy ZWF0ZU91dGVyU3BpbkJ1dHRvblN0eWxlKCksIHJlbmRlckFyZW5hKCkpOwotICAgICAgICB9Ci0g ICAgICAgIHJldHVybjsKLSAgICB9CiAKLSAgICBpZiAoIW1faW5uZXJCbG9jaykgewotICAgICAg ICAvLyBDcmVhdGUgdGhlIGlubmVyIGJsb2NrIGVsZW1lbnQKLSAgICAgICAgbV9pbm5lckJsb2Nr ID0gVGV4dENvbnRyb2xJbm5lckVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkp OwotICAgICAgICBtX2lubmVyQmxvY2stPmF0dGFjaElubmVyRWxlbWVudChub2RlKCksIGNyZWF0 ZUlubmVyQmxvY2tTdHlsZShzdHlsZSgpKSwgcmVuZGVyQXJlbmEoKSk7Ci0gICAgfQotI2lmIEVO QUJMRShJTlBVVF9TUEVFQ0gpCi0gICAgaWYgKGlucHV0RWxlbWVudCgpLT5pc1NwZWVjaEVuYWJs ZWQoKSAmJiAhbV9zcGVlY2hCdXR0b24pIHsKLSAgICAgICAgLy8gQ3JlYXRlIHRoZSBzcGVlY2gg YnV0dG9uIGVsZW1lbnQuCi0gICAgICAgIG1fc3BlZWNoQnV0dG9uID0gSW5wdXRGaWVsZFNwZWVj aEJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50KG5vZGUoKSkpOwotICAgICAgICBt X3NwZWVjaEJ1dHRvbi0+YXR0YWNoSW5uZXJFbGVtZW50KG5vZGUoKSwgY3JlYXRlU3BlZWNoQnV0 dG9uU3R5bGUoKSwgcmVuZGVyQXJlbmEoKSk7Ci0gICAgfQotI2VuZGlmCi0gICAgaWYgKGlucHV0 RWxlbWVudCgpLT5oYXNTcGluQnV0dG9uKCkgJiYgIW1fb3V0ZXJTcGluQnV0dG9uKSB7Ci0gICAg ICAgIG1fb3V0ZXJTcGluQnV0dG9uID0gU3BpbkJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxF bGVtZW50KG5vZGUoKSkpOwotICAgICAgICBtX291dGVyU3BpbkJ1dHRvbi0+YXR0YWNoSW5uZXJF bGVtZW50KG5vZGUoKSwgY3JlYXRlT3V0ZXJTcGluQnV0dG9uU3R5bGUoKSwgcmVuZGVyQXJlbmEo KSk7Ci0gICAgfQotCi0gICAgaWYgKGlucHV0RWxlbWVudCgpLT5pc1NlYXJjaEZpZWxkKCkpIHsK ICAgICAgICAgaWYgKCFtX3Jlc3VsdHNCdXR0b24pIHsKICAgICAgICAgICAgIC8vIENyZWF0ZSB0 aGUgc2VhcmNoIHJlc3VsdHMgYnV0dG9uIGVsZW1lbnQuCiAgICAgICAgICAgICBtX3Jlc3VsdHNC dXR0b24gPSBTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b25FbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQo KSk7CiAgICAgICAgICAgICBtX3Jlc3VsdHNCdXR0b24tPmF0dGFjaElubmVyRWxlbWVudChtX2lu bmVyQmxvY2suZ2V0KCksIGNyZWF0ZVJlc3VsdHNCdXR0b25TdHlsZShtX2lubmVyQmxvY2stPnJl bmRlcmVyKCktPnN0eWxlKCkpLCByZW5kZXJBcmVuYSgpKTsKICAgICAgICAgfQotICAgIH0KIAot ICAgIC8vIENyZWF0ZSBpbm5lclRleHQgZWxlbWVudCBiZWZvcmUgYWRkaW5nIHRoZSBvdGhlciBi dXR0b25zLgotICAgIFJlbmRlclRleHRDb250cm9sOjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQobV9p bm5lckJsb2NrLmdldCgpKTsKKyAgICAgICAgLy8gQ3JlYXRlIGlubmVyVGV4dCBlbGVtZW50IGJl Zm9yZSBhZGRpbmcgdGhlIG90aGVyIGJ1dHRvbnMuCisgICAgICAgIFJlbmRlclRleHRDb250cm9s OjpjcmVhdGVTdWJ0cmVlSWZOZWVkZWQobV9pbm5lckJsb2NrLmdldCgpKTsKIAotICAgIGlmIChp bnB1dEVsZW1lbnQoKS0+aXNTZWFyY2hGaWVsZCgpKSB7CiAgICAgICAgIGlmICghbV9jYW5jZWxC dXR0b24pIHsKICAgICAgICAgICAgIC8vIENyZWF0ZSB0aGUgY2FuY2VsIGJ1dHRvbiBlbGVtZW50 LgogICAgICAgICAgICAgbV9jYW5jZWxCdXR0b24gPSBTZWFyY2hGaWVsZENhbmNlbEJ1dHRvbkVs ZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCgpKTsKICAgICAgICAgICAgIG1fY2FuY2VsQnV0dG9uLT5h dHRhY2hJbm5lckVsZW1lbnQobV9pbm5lckJsb2NrLmdldCgpLCBjcmVhdGVDYW5jZWxCdXR0b25T dHlsZShtX2lubmVyQmxvY2stPnJlbmRlcmVyKCktPnN0eWxlKCkpLCByZW5kZXJBcmVuYSgpKTsK ICAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIFJlbmRlclRleHRDb250cm9sOjpjcmVh dGVTdWJ0cmVlSWZOZWVkZWQoMCk7CisKKyNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQorICAgICAg ICBpZiAoaW5wdXRFbGVtZW50KCktPmlzU3BlZWNoRW5hYmxlZCgpICYmICFtX3NwZWVjaEJ1dHRv bikgeworICAgICAgICAgICAgLy8gQ3JlYXRlIHRoZSBzcGVlY2ggYnV0dG9uIGVsZW1lbnQuCisg ICAgICAgICAgICBtX3NwZWVjaEJ1dHRvbiA9IElucHV0RmllbGRTcGVlY2hCdXR0b25FbGVtZW50 OjpjcmVhdGUodG9IVE1MRWxlbWVudChub2RlKCkpKTsKKyAgICAgICAgICAgIG1fc3BlZWNoQnV0 dG9uLT5hdHRhY2hJbm5lckVsZW1lbnQobm9kZSgpLCBjcmVhdGVTcGVlY2hCdXR0b25TdHlsZSgp LCByZW5kZXJBcmVuYSgpKTsKKyAgICAgICAgfQorI2VuZGlmCisKKyAgICAgICAgYm9vbCBoYXNT cGluQnV0dG9uID0gaW5wdXRFbGVtZW50KCktPmhhc1NwaW5CdXR0b24oKTsKKworICAgICAgICBp ZiAoaGFzU3BpbkJ1dHRvbiAmJiAhbV9pbm5lclNwaW5CdXR0b24pIHsKKyAgICAgICAgICAgIG1f aW5uZXJTcGluQnV0dG9uID0gU3BpbkJ1dHRvbkVsZW1lbnQ6OmNyZWF0ZSh0b0hUTUxFbGVtZW50 KG5vZGUoKSkpOworICAgICAgICAgICAgbV9pbm5lclNwaW5CdXR0b24tPmF0dGFjaElubmVyRWxl bWVudChub2RlKCksIGNyZWF0ZUlubmVyU3BpbkJ1dHRvblN0eWxlKCksIHJlbmRlckFyZW5hKCkp OworICAgICAgICB9CisgICAgICAgIGlmIChoYXNTcGluQnV0dG9uICYmICFtX291dGVyU3BpbkJ1 dHRvbikgeworICAgICAgICAgICAgbV9vdXRlclNwaW5CdXR0b24gPSBTcGluQnV0dG9uRWxlbWVu dDo6Y3JlYXRlKHRvSFRNTEVsZW1lbnQobm9kZSgpKSk7CisgICAgICAgICAgICBtX291dGVyU3Bp bkJ1dHRvbi0+YXR0YWNoSW5uZXJFbGVtZW50KG5vZGUoKSwgY3JlYXRlT3V0ZXJTcGluQnV0dG9u U3R5bGUoKSwgcmVuZGVyQXJlbmEoKSk7CisgICAgICAgIH0KICAgICB9CiB9CiAKQEAgLTcyOSw3 ICs3MjMsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OmNyZWF0ZUlubmVyQmxvY2tTdHlsZShjb25zdAogICAgIFJlZlB0cjxSZW5kZXJTdHls ZT4gaW5uZXJCbG9ja1N0eWxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZSgpOwogICAgIGlubmVyQmxv Y2tTdHlsZS0+aW5oZXJpdEZyb20oc3RhcnRTdHlsZSk7CiAKLSAgICBpbm5lckJsb2NrU3R5bGUt PnNldERpc3BsYXkoaW5wdXRFbGVtZW50KCktPmhhc1NwaW5CdXR0b24oKSA/IElOTElORV9CTE9D SyA6IEJMT0NLKTsKKyAgICBpbm5lckJsb2NrU3R5bGUtPnNldERpc3BsYXkoQkxPQ0spOwogICAg IGlubmVyQmxvY2tTdHlsZS0+c2V0RGlyZWN0aW9uKExUUik7CiAKICAgICAvLyBXZSBkb24ndCB3 YW50IHRoZSBzaGFkb3cgZG9tIHRvIGJlIGVkaXRhYmxlLCBzbyB3ZSBzZXQgdGhpcyBibG9jayB0 byByZWFkLW9ubHkgaW4gY2FzZSB0aGUgaW5wdXQgaXRzZWxmIGlzIGVkaXRhYmxlLgo=