107496 2013-01-21 20:04:43 -0800 [Refactoring] Remove elementParentStyle from SelectorCheckerContext 2013-01-23 02:53:16 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tasak tasak allan.jensen cmarcelo koivisto macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 812554 0 tasak 2013-01-21 20:04:43 -0800 Currently elementParentStyle is not used in SelectorChecker and StyleResolver. A parent style was used to cache whether a child of the parent node matches some n-th, first-child, last-child selector. The information was used to check whether a given element can share its sibling element's style or not. However, now the information is stored in a parent element, not style. So we don't need to provide elementParentStyle for SelectorChecker. (c.f. StyleResolver::parentElementPreventsSharing) 812560 1 183877 tasak 2013-01-21 20:15:45 -0800 Created attachment 183877 WIP 812561 2 183878 tasak 2013-01-21 20:18:28 -0800 Created attachment 183878 Patch 812563 3 tasak 2013-01-21 20:21:27 -0800 (In reply to comment #0) > A parent style was used to cache whether a child of the parent node matches some n-th, first-child, last-child selector. The information was used to check whether a given element can share its sibling element's style or not. I mean, childrenAffectedBy bits were moved from RenderStyle to Element, c.f. https://bugs.webkit.org/show_bug.cgi?id=101448 814049 4 183878 webkit.review.bot 2013-01-23 02:53:12 -0800 Comment on attachment 183878 Patch Clearing flags on attachment: 183878 Committed r140531: <http://trac.webkit.org/changeset/140531> 814050 5 webkit.review.bot 2013-01-23 02:53:16 -0800 All reviewed patches have been landed. Closing bug. 183877 2013-01-21 20:15:45 -0800 2013-01-21 20:18:25 -0800 WIP bug-107496-20130122131240.patch text/plain 5615 tasak U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgwNzQ5ZmFmODg5MmZh N2Q1ZWIzMGY0NWRmNzQ3ZTMxYmM4Y2VmOS4uYjI4MDg5NGMwMGFiZjYyMjNkYmQ3Y2NmNWYyZTY1 NGYwZTEyNTk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIxICBUYWth c2hpIFNha2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBbUmVmYWN0b3Jpbmdd IFJlbW92ZSBlbGVtZW50UGFyZW50U3R5bGUgZnJvbSBTZWxlY3RvckNoZWNrZXJDb250ZXh0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc0OTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSBjaGls ZHJlbkFmZmVjdEJ5IGJpdHMgd2VyZSBtb3ZlZCBmcm9tIFJlbmRlclN0eWxlIHRvIGVsZW1lbnQs CisgICAgICAgIG5vdyBlbGVtZW50UGFyZW50U3R5bGUgaXMgbm90IHVzZWQgaW4gU2VsZWN0b3JD aGVja2VyIGFuZAorICAgICAgICBTdHlsZVJlc29sdmVyLiBXZSBzaG91bGQgcmVtb3ZlIHRoZSBt ZW1iZXIgdmFyYWlhYmxlIGZyb20KKyAgICAgICAgU2VsZWN0b3JDaGVja2VyQ29udGV4dC4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGJlY2F1c2UganVzdCByZWZhY3RvcmluZy4KKworICAgICAg ICAqIGNzcy9TZWxlY3RvckNoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JD aGVja2VyOjptYXRjaCk6CisgICAgICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5oOgorICAgICAg ICAoV2ViQ29yZTo6U2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNraW5nQ29udGV4dDo6U2Vs ZWN0b3JDaGVja2luZ0NvbnRleHQpOgorICAgICAgICAoU2VsZWN0b3JDaGVja2luZ0NvbnRleHQp OgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlUmVzb2x2ZXI6OnJ1bGVNYXRjaGVzKToKKyAgICAgICAgUmVtb3ZlZCBlbGVtZW50UGFyZW50 U3R5bGUuCisKIDIwMTMtMDEtMjEgIERpcmsgU2NodWx6ZSAgPGRzY2h1bHplQGFkb2JlLmNvbT4K IAogICAgICAgICBBZGQgYnVpbGQgZmxhZyBmb3IgQ2FudmFzJ3MgUGF0aCBvYmplY3QgKGRpc2Fi bGVkIGJ5IGRlZmF1bHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JD aGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCmluZGV4 IDRjN2EyY2I1ZDAyZDAwMTY3NTI2ZGUxM2UyNmZlOTU3MjIxYzFkNWEuLjZhYzY5ZmExMjgxNDlm YTBmODVmNDU5YTg3NGY4ZGFhYjIyOGJhNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNo ZWNrZXIuY3BwCkBAIC0zMTAsNyArMzEwLDYgQEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBTZWxl Y3RvckNoZWNrZXI6Om1hdGNoKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb24KICAg ICAgICAgbmV4dENvbnRleHQuZWxlbWVudCA9IGNvbnRleHQuZWxlbWVudC0+cGFyZW50RWxlbWVu dCgpOwogICAgICAgICBuZXh0Q29udGV4dC5pc1N1YlNlbGVjdG9yID0gZmFsc2U7CiAgICAgICAg IG5leHRDb250ZXh0LmVsZW1lbnRTdHlsZSA9IDA7Ci0gICAgICAgIG5leHRDb250ZXh0LmVsZW1l bnRQYXJlbnRTdHlsZSA9IDA7CiAgICAgICAgIGZvciAoOyBuZXh0Q29udGV4dC5lbGVtZW50OyBu ZXh0Q29udGV4dC5lbGVtZW50ID0gbmV4dENvbnRleHQuZWxlbWVudC0+cGFyZW50RWxlbWVudCgp KSB7CiAgICAgICAgICAgICBNYXRjaCBtYXRjaCA9IHRoaXMtPm1hdGNoKG5leHRDb250ZXh0LCBp Z25vcmVEeW5hbWljUHNldWRvLCBzaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3kpOwogICAgICAgICAg ICAgaWYgKG1hdGNoID09IFNlbGVjdG9yTWF0Y2hlcyB8fCBtYXRjaCA9PSBTZWxlY3RvckZhaWxz Q29tcGxldGVseSkKQEAgLTMyNiw3ICszMjUsNiBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIFNl bGVjdG9yQ2hlY2tlcjo6bWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQmIGNvbgog ICAgICAgICAgICAgcmV0dXJuIFNlbGVjdG9yRmFpbHNDb21wbGV0ZWx5OwogICAgICAgICBuZXh0 Q29udGV4dC5pc1N1YlNlbGVjdG9yID0gZmFsc2U7CiAgICAgICAgIG5leHRDb250ZXh0LmVsZW1l bnRTdHlsZSA9IDA7Ci0gICAgICAgIG5leHRDb250ZXh0LmVsZW1lbnRQYXJlbnRTdHlsZSA9IDA7 CiAgICAgICAgIHJldHVybiBtYXRjaChuZXh0Q29udGV4dCwgaWdub3JlRHluYW1pY1BzZXVkbywg c2libGluZ1RyYXZlcnNhbFN0cmF0ZWd5KTsKIAogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkRpcmVj dEFkamFjZW50OgpAQCAtMzM5LDcgKzMzNyw2IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2ggU2Vs ZWN0b3JDaGVja2VyOjptYXRjaChjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYgY29uCiAg ICAgICAgICAgICByZXR1cm4gU2VsZWN0b3JGYWlsc0FsbFNpYmxpbmdzOwogICAgICAgICBuZXh0 Q29udGV4dC5pc1N1YlNlbGVjdG9yID0gZmFsc2U7CiAgICAgICAgIG5leHRDb250ZXh0LmVsZW1l bnRTdHlsZSA9IDA7Ci0gICAgICAgIG5leHRDb250ZXh0LmVsZW1lbnRQYXJlbnRTdHlsZSA9IDA7 CiAgICAgICAgIHJldHVybiBtYXRjaChuZXh0Q29udGV4dCwgaWdub3JlRHluYW1pY1BzZXVkbywg c2libGluZ1RyYXZlcnNhbFN0cmF0ZWd5KTsKIAogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkluZGly ZWN0QWRqYWNlbnQ6CkBAIC0zNTAsNyArMzQ3LDYgQEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBT ZWxlY3RvckNoZWNrZXI6Om1hdGNoKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb24K ICAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudCA9IGNvbnRleHQuZWxlbWVudC0+cHJldmlvdXNF bGVtZW50U2libGluZygpOwogICAgICAgICBuZXh0Q29udGV4dC5pc1N1YlNlbGVjdG9yID0gZmFs c2U7CiAgICAgICAgIG5leHRDb250ZXh0LmVsZW1lbnRTdHlsZSA9IDA7Ci0gICAgICAgIG5leHRD b250ZXh0LmVsZW1lbnRQYXJlbnRTdHlsZSA9IDA7CiAgICAgICAgIGZvciAoOyBuZXh0Q29udGV4 dC5lbGVtZW50OyBuZXh0Q29udGV4dC5lbGVtZW50ID0gbmV4dENvbnRleHQuZWxlbWVudC0+cHJl dmlvdXNFbGVtZW50U2libGluZygpKSB7CiAgICAgICAgICAgICBNYXRjaCBtYXRjaCA9IHRoaXMt Pm1hdGNoKG5leHRDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvLCBzaWJsaW5nVHJhdmVyc2Fs U3RyYXRlZ3kpOwogICAgICAgICAgICAgaWYgKG1hdGNoID09IFNlbGVjdG9yTWF0Y2hlcyB8fCBt YXRjaCA9PSBTZWxlY3RvckZhaWxzQWxsU2libGluZ3MgfHwgbWF0Y2ggPT0gU2VsZWN0b3JGYWls c0NvbXBsZXRlbHkpCkBAIC0zODIsNyArMzc4LDYgQEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBT ZWxlY3RvckNoZWNrZXI6Om1hdGNoKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb24K ICAgICAgICAgICAgIG5leHRDb250ZXh0LmVsZW1lbnQgPSBzaGFkb3dIb3N0Tm9kZTsKICAgICAg ICAgICAgIG5leHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAgICAgICAgIG5l eHRDb250ZXh0LmVsZW1lbnRTdHlsZSA9IDA7Ci0gICAgICAgICAgICBuZXh0Q29udGV4dC5lbGVt ZW50UGFyZW50U3R5bGUgPSAwOwogICAgICAgICAgICAgcmV0dXJuIG1hdGNoKG5leHRDb250ZXh0 LCBpZ25vcmVEeW5hbWljUHNldWRvLCBzaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3kpOwogICAgICAg ICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tl ci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oCmluZGV4IDkyZjg2MjE2 Y2FlNzIwNjE2MjhiNjcxNGZiMzNhYjdkZDY4ZTRlMTAuLjkyOTg3OGFkZjQ5NDEwOGU1M2RlZmQ1 ODg3NzgyYmY3Y2EzODlkYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3Rv ckNoZWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmgKQEAg LTU5LDcgKzU5LDYgQEAgcHVibGljOgogICAgICAgICAgICAgLCB2aXNpdGVkTWF0Y2hUeXBlKHZp c2l0ZWRNYXRjaFR5cGUpCiAgICAgICAgICAgICAsIHBzZXVkb1N0eWxlKE5PUFNFVURPKQogICAg ICAgICAgICAgLCBlbGVtZW50U3R5bGUoMCkKLSAgICAgICAgICAgICwgZWxlbWVudFBhcmVudFN0 eWxlKDApCiAgICAgICAgICAgICAsIGlzU3ViU2VsZWN0b3IoZmFsc2UpCiAgICAgICAgICAgICAs IGhhc1Njcm9sbGJhclBzZXVkbyhmYWxzZSkKICAgICAgICAgICAgICwgaGFzU2VsZWN0aW9uUHNl dWRvKGZhbHNlKQpAQCAtNzEsNyArNzAsNiBAQCBwdWJsaWM6CiAgICAgICAgIFZpc2l0ZWRNYXRj aFR5cGUgdmlzaXRlZE1hdGNoVHlwZTsKICAgICAgICAgUHNldWRvSWQgcHNldWRvU3R5bGU7CiAg ICAgICAgIFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGU7Ci0gICAgICAgIFJlbmRlclN0eWxlKiBl bGVtZW50UGFyZW50U3R5bGU7CiAgICAgICAgIGJvb2wgaXNTdWJTZWxlY3RvcjsKICAgICAgICAg Ym9vbCBoYXNTY3JvbGxiYXJQc2V1ZG87CiAgICAgICAgIGJvb2wgaGFzU2VsZWN0aW9uUHNldWRv OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGQ4ZDY5YzMyZmM1MWNiNmY0 YWJlODhmMDEyZGZjMmE5NWYwNmQ3ZDkuLmZlNzdiNDhjYjU1YjFjNzgzZTE4YmI3NmI4ZTI3Mjc0 ZTFiZWE5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTIyODMsNyAr MjI4Myw2IEBAIGlubGluZSBib29sIFN0eWxlUmVzb2x2ZXI6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1 bGVEYXRhJiBydWxlRGF0YSwgY29uc3QgQ29udGFpbmVyCiAgICAgLy8gU2xvdyBwYXRoLgogICAg IFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQgY29udGV4dChydWxlRGF0 YS5zZWxlY3RvcigpLCBtX2VsZW1lbnQsIFNlbGVjdG9yQ2hlY2tlcjo6VmlzaXRlZE1hdGNoRW5h YmxlZCk7CiAgICAgY29udGV4dC5lbGVtZW50U3R5bGUgPSBzdHlsZSgpOwotICAgIGNvbnRleHQu ZWxlbWVudFBhcmVudFN0eWxlID0gbV9wYXJlbnROb2RlID8gbV9wYXJlbnROb2RlLT5yZW5kZXJT dHlsZSgpIDogMDsKICAgICBjb250ZXh0LnNjb3BlID0gc2NvcGU7CiAgICAgY29udGV4dC5wc2V1 ZG9TdHlsZSA9IG1fcHNldWRvU3R5bGU7CiAgICAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBtYXRj aCA9IG1fc2VsZWN0b3JDaGVja2VyLm1hdGNoKGNvbnRleHQsIG1fZHluYW1pY1BzZXVkbywgRE9N U2libGluZ1RyYXZlcnNhbFN0cmF0ZWd5KCkpOwo= 183878 2013-01-21 20:18:28 -0800 2013-01-23 02:53:12 -0800 Patch bug-107496-20130122131523.patch text/plain 5617 tasak U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgwNzQ5ZmFmODg5MmZh N2Q1ZWIzMGY0NWRmNzQ3ZTMxYmM4Y2VmOS4uNmFlODhiYWJjZjEwYzMxYTA2NDc0Y2JiZWMzYWYz MDNhODU2MjkxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTIxICBUYWth c2hpIFNha2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBbUmVmYWN0b3Jpbmdd IFJlbW92ZSBlbGVtZW50UGFyZW50U3R5bGUgZnJvbSBTZWxlY3RvckNoZWNrZXJDb250ZXh0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc0OTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSBjaGls ZHJlbkFmZmVjdGVkQnkgYml0cyB3ZXJlIG1vdmVkIGZyb20gUmVuZGVyU3R5bGUgdG8gZWxlbWVu dCwKKyAgICAgICAgbm93IGVsZW1lbnRQYXJlbnRTdHlsZSBpcyBub3QgdXNlZCBpbiBTZWxlY3Rv ckNoZWNrZXIgYW5kCisgICAgICAgIFN0eWxlUmVzb2x2ZXIuIFdlIHNob3VsZCByZW1vdmUgdGhl IG1lbWJlciB2YXJhaWFibGUgZnJvbQorICAgICAgICBTZWxlY3RvckNoZWNrZXJDb250ZXh0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgYmVjYXVzZSBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAg ICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rv ckNoZWNrZXI6Om1hdGNoKToKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmg6CisgICAg ICAgIChXZWJDb3JlOjpTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0OjpT ZWxlY3RvckNoZWNraW5nQ29udGV4dCk6CisgICAgICAgIChTZWxlY3RvckNoZWNraW5nQ29udGV4 dCk6CisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVSZXNvbHZlcjo6cnVsZU1hdGNoZXMpOgorICAgICAgICBSZW1vdmVkIGVsZW1lbnRQYXJl bnRTdHlsZS4KKwogMjAxMy0wMS0yMSAgRGlyayBTY2h1bHplICA8ZHNjaHVsemVAYWRvYmUuY29t PgogCiAgICAgICAgIEFkZCBidWlsZCBmbGFnIGZvciBDYW52YXMncyBQYXRoIG9iamVjdCAoZGlz YWJsZWQgYnkgZGVmYXVsdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3Rv ckNoZWNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKaW5k ZXggNGM3YTJjYjVkMDJkMDAxNjc1MjZkZTEzZTI2ZmU5NTcyMjFjMWQ1YS4uNmFjNjlmYTEyODE0 OWZhMGY4NWY0NTlhODc0ZjhkYWFiMjI4YmE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9y Q2hlY2tlci5jcHAKQEAgLTMxMCw3ICszMTAsNiBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIFNl bGVjdG9yQ2hlY2tlcjo6bWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQmIGNvbgog ICAgICAgICBuZXh0Q29udGV4dC5lbGVtZW50ID0gY29udGV4dC5lbGVtZW50LT5wYXJlbnRFbGVt ZW50KCk7CiAgICAgICAgIG5leHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAg ICAgbmV4dENvbnRleHQuZWxlbWVudFN0eWxlID0gMDsKLSAgICAgICAgbmV4dENvbnRleHQuZWxl bWVudFBhcmVudFN0eWxlID0gMDsKICAgICAgICAgZm9yICg7IG5leHRDb250ZXh0LmVsZW1lbnQ7 IG5leHRDb250ZXh0LmVsZW1lbnQgPSBuZXh0Q29udGV4dC5lbGVtZW50LT5wYXJlbnRFbGVtZW50 KCkpIHsKICAgICAgICAgICAgIE1hdGNoIG1hdGNoID0gdGhpcy0+bWF0Y2gobmV4dENvbnRleHQs IGlnbm9yZUR5bmFtaWNQc2V1ZG8sIHNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSk7CiAgICAgICAg ICAgICBpZiAobWF0Y2ggPT0gU2VsZWN0b3JNYXRjaGVzIHx8IG1hdGNoID09IFNlbGVjdG9yRmFp bHNDb21wbGV0ZWx5KQpAQCAtMzI2LDcgKzMyNSw2IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2gg U2VsZWN0b3JDaGVja2VyOjptYXRjaChjb25zdCBTZWxlY3RvckNoZWNraW5nQ29udGV4dCYgY29u CiAgICAgICAgICAgICByZXR1cm4gU2VsZWN0b3JGYWlsc0NvbXBsZXRlbHk7CiAgICAgICAgIG5l eHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAgICAgbmV4dENvbnRleHQuZWxl bWVudFN0eWxlID0gMDsKLSAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudFBhcmVudFN0eWxlID0g MDsKICAgICAgICAgcmV0dXJuIG1hdGNoKG5leHRDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRv LCBzaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3kpOwogCiAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6RGly ZWN0QWRqYWNlbnQ6CkBAIC0zMzksNyArMzM3LDYgQEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBT ZWxlY3RvckNoZWNrZXI6Om1hdGNoKGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb24K ICAgICAgICAgICAgIHJldHVybiBTZWxlY3RvckZhaWxzQWxsU2libGluZ3M7CiAgICAgICAgIG5l eHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBmYWxzZTsKICAgICAgICAgbmV4dENvbnRleHQuZWxl bWVudFN0eWxlID0gMDsKLSAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudFBhcmVudFN0eWxlID0g MDsKICAgICAgICAgcmV0dXJuIG1hdGNoKG5leHRDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRv LCBzaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3kpOwogCiAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6SW5k aXJlY3RBZGphY2VudDoKQEAgLTM1MCw3ICszNDcsNiBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNo IFNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQmIGNv bgogICAgICAgICBuZXh0Q29udGV4dC5lbGVtZW50ID0gY29udGV4dC5lbGVtZW50LT5wcmV2aW91 c0VsZW1lbnRTaWJsaW5nKCk7CiAgICAgICAgIG5leHRDb250ZXh0LmlzU3ViU2VsZWN0b3IgPSBm YWxzZTsKICAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudFN0eWxlID0gMDsKLSAgICAgICAgbmV4 dENvbnRleHQuZWxlbWVudFBhcmVudFN0eWxlID0gMDsKICAgICAgICAgZm9yICg7IG5leHRDb250 ZXh0LmVsZW1lbnQ7IG5leHRDb250ZXh0LmVsZW1lbnQgPSBuZXh0Q29udGV4dC5lbGVtZW50LT5w cmV2aW91c0VsZW1lbnRTaWJsaW5nKCkpIHsKICAgICAgICAgICAgIE1hdGNoIG1hdGNoID0gdGhp cy0+bWF0Y2gobmV4dENvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIHNpYmxpbmdUcmF2ZXJz YWxTdHJhdGVneSk7CiAgICAgICAgICAgICBpZiAobWF0Y2ggPT0gU2VsZWN0b3JNYXRjaGVzIHx8 IG1hdGNoID09IFNlbGVjdG9yRmFpbHNBbGxTaWJsaW5ncyB8fCBtYXRjaCA9PSBTZWxlY3RvckZh aWxzQ29tcGxldGVseSkKQEAgLTM4Miw3ICszNzgsNiBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNo IFNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQmIGNv bgogICAgICAgICAgICAgbmV4dENvbnRleHQuZWxlbWVudCA9IHNoYWRvd0hvc3ROb2RlOwogICAg ICAgICAgICAgbmV4dENvbnRleHQuaXNTdWJTZWxlY3RvciA9IGZhbHNlOwogICAgICAgICAgICAg bmV4dENvbnRleHQuZWxlbWVudFN0eWxlID0gMDsKLSAgICAgICAgICAgIG5leHRDb250ZXh0LmVs ZW1lbnRQYXJlbnRTdHlsZSA9IDA7CiAgICAgICAgICAgICByZXR1cm4gbWF0Y2gobmV4dENvbnRl eHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIHNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSk7CiAgICAg ICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVj a2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmgKaW5kZXggOTJmODYy MTZjYWU3MjA2MTYyOGI2NzE0ZmIzM2FiN2RkNjhlNGUxMC4uOTI5ODc4YWRmNDk0MTA4ZTUzZGVm ZDU4ODc3ODJiZjdjYTM4OWRhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVj dG9yQ2hlY2tlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuaApA QCAtNTksNyArNTksNiBAQCBwdWJsaWM6CiAgICAgICAgICAgICAsIHZpc2l0ZWRNYXRjaFR5cGUo dmlzaXRlZE1hdGNoVHlwZSkKICAgICAgICAgICAgICwgcHNldWRvU3R5bGUoTk9QU0VVRE8pCiAg ICAgICAgICAgICAsIGVsZW1lbnRTdHlsZSgwKQotICAgICAgICAgICAgLCBlbGVtZW50UGFyZW50 U3R5bGUoMCkKICAgICAgICAgICAgICwgaXNTdWJTZWxlY3RvcihmYWxzZSkKICAgICAgICAgICAg ICwgaGFzU2Nyb2xsYmFyUHNldWRvKGZhbHNlKQogICAgICAgICAgICAgLCBoYXNTZWxlY3Rpb25Q c2V1ZG8oZmFsc2UpCkBAIC03MSw3ICs3MCw2IEBAIHB1YmxpYzoKICAgICAgICAgVmlzaXRlZE1h dGNoVHlwZSB2aXNpdGVkTWF0Y2hUeXBlOwogICAgICAgICBQc2V1ZG9JZCBwc2V1ZG9TdHlsZTsK ICAgICAgICAgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHlsZTsKLSAgICAgICAgUmVuZGVyU3R5bGUq IGVsZW1lbnRQYXJlbnRTdHlsZTsKICAgICAgICAgYm9vbCBpc1N1YlNlbGVjdG9yOwogICAgICAg ICBib29sIGhhc1Njcm9sbGJhclBzZXVkbzsKICAgICAgICAgYm9vbCBoYXNTZWxlY3Rpb25Qc2V1 ZG87CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggZDhkNjljMzJmYzUxY2I2 ZjRhYmU4OGYwMTJkZmMyYTk1ZjA2ZDdkOS4uZmU3N2I0OGNiNTViMWM3ODNlMThiYjc2YjhlMjcy NzRlMWJlYTk0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtMjI4Myw3 ICsyMjgzLDYgQEAgaW5saW5lIGJvb2wgU3R5bGVSZXNvbHZlcjo6cnVsZU1hdGNoZXMoY29uc3Qg UnVsZURhdGEmIHJ1bGVEYXRhLCBjb25zdCBDb250YWluZXIKICAgICAvLyBTbG93IHBhdGguCiAg ICAgU2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNraW5nQ29udGV4dCBjb250ZXh0KHJ1bGVE YXRhLnNlbGVjdG9yKCksIG1fZWxlbWVudCwgU2VsZWN0b3JDaGVja2VyOjpWaXNpdGVkTWF0Y2hF bmFibGVkKTsKICAgICBjb250ZXh0LmVsZW1lbnRTdHlsZSA9IHN0eWxlKCk7Ci0gICAgY29udGV4 dC5lbGVtZW50UGFyZW50U3R5bGUgPSBtX3BhcmVudE5vZGUgPyBtX3BhcmVudE5vZGUtPnJlbmRl clN0eWxlKCkgOiAwOwogICAgIGNvbnRleHQuc2NvcGUgPSBzY29wZTsKICAgICBjb250ZXh0LnBz ZXVkb1N0eWxlID0gbV9wc2V1ZG9TdHlsZTsKICAgICBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIG1h dGNoID0gbV9zZWxlY3RvckNoZWNrZXIubWF0Y2goY29udGV4dCwgbV9keW5hbWljUHNldWRvLCBE T01TaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3koKSk7Cg==