79220 2012-02-22 03:56:48 -0800 [Refactoring] NodeRenderingContext::AttachingPhase is redundant. 2012-06-24 19:26:06 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 79180 85263 1 shinyak morrita dglazkov morrita shinyak webkit.review.bot oldest_to_newest 561825 0 shinyak 2012-02-22 03:56:48 -0800 AttachingXXX has become very confusing now. We should consider better name for them. 635626 1 morrita 2012-05-28 23:40:11 -0700 Moving to flakiness subgroup since this doesn't block Bug 77503. 655313 2 148981 morrita 2012-06-22 02:10:58 -0700 Created attachment 148981 Patch 655510 3 148981 dglazkov 2012-06-22 09:37:42 -0700 Comment on attachment 148981 Patch This is glorious! Thank you for persevering, Morrita-san! 656310 4 morrita 2012-06-24 18:21:12 -0700 (In reply to comment #3) > (From update of attachment 148981 [details]) > This is glorious! Thank you for persevering, Morrita-san! Thanks :-) I expect more to come. 656332 5 148981 webkit.review.bot 2012-06-24 19:26:01 -0700 Comment on attachment 148981 Patch Clearing flags on attachment: 148981 Committed r121131: <http://trac.webkit.org/changeset/121131> 656333 6 webkit.review.bot 2012-06-24 19:26:06 -0700 All reviewed patches have been landed. Closing bug. 148981 2012-06-22 02:10:58 -0700 2012-06-24 19:26:00 -0700 Patch bug-79220-20120622181057.patch text/plain 12771 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU1MjJmZDRiYmFmYWRh OTE2NmUzOGI1ZDIyOWViMmQ4MDM3MmE3NC4uODhjYzczYTU2OTk3MWQ0ZDY0M2JlZTY2MTBhMWRi MGZlMTA4ZTgzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA2LTIyICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIE5vZGVSZW5kZXJpbmdD b250ZXh0OjpBdHRhY2hpbmdQaGFzZSBpcyByZWR1bmRhbnQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTIyMAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHJlbW92ZXMgTm9kZVJlbmRl cmluZ0NvbnRleHQ6OkF0dGFjaGluZ1BoYXNlIGFuZAorICAgICAgICBOb2RlUmVuZGVyaW5nQ29u dGV4dDo6bV9waGFzZSByZXNwZWN0aXZlbHkuIFRoZSBzdGF0ZSBvcmlnaW5hbGx5CisgICAgICAg IHJlcHJlc2VudGVkIGFzIG1fcGhhc2UgaXMgbmF0dXJhbGx5IGVuY29kZWQgaW50byBvdGhlciBt ZW1iZXIgdmFyaWFibGVzLgorCisgICAgICAgIE5vZGVSZW5kZXJpbmdDb250ZXh0OjptX3Zpc3Vh bFBhcmVudFNoYWRvdyBpcyBhbHNvIHJlcGxhY2VkLCB3aXRoCisgICAgICAgIGEgbG9jYWwgdmFy aWFibGUgcGFyZW50U2NvcGUuCisKKyAgICAgICAgQmFzaWNhbGx5LCB3aGF0IE5vZGVSZW5kZXJp bmdDb250ZXh0IHdhbnRzIHRvIGtub3cgaXMgdGhlIHBhcmVudCBvZgorICAgICAgICB0aGUgY29t cG9zZWQgc2hhZG93IHRyZWUgYW5kIGFuIG9wdGlvbmFsIGluc2VydGlvbiBwb2ludCB3aGVyZSB0 aGUKKyAgICAgICAgbm9kZSBpcyBkaXN0cmlidXRlZC4gT25jZSB0aGVzZSBiZWNvbWVzIGNsZWFy LCBtX3BoYXNlIGlzIG5vIGxvbmdlciByZXF1aXJlZC4KKyAgICAgICAgSXQgd2FzIHJhdGhlciBh IGhpc3RvcmljYWwgYXJ0aWZhY3QuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBiZWhhdmlv cmFsIGNoYW5nZS4KKworICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHA6IFJl cGxhY2VkIG1fcGhhc2Ugd2l0aCBpbXBsaWNpdCBzdGF0ZXMuCisgICAgICAgIChXZWJDb3JlOjpO b2RlUmVuZGVyaW5nQ29udGV4dDo6Tm9kZVJlbmRlcmluZ0NvbnRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6Om5leHRSZW5kZXJlcik6CisgICAgICAgIChXZWJD b3JlOjpOb2RlUmVuZGVyaW5nQ29udGV4dDo6cHJldmlvdXNSZW5kZXJlcik6CisgICAgICAgIChX ZWJDb3JlOjpOb2RlUmVuZGVyaW5nQ29udGV4dDo6cGFyZW50UmVuZGVyZXIpOgorICAgICAgICAo V2ViQ29yZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6OnNob3VsZENyZWF0ZVJlbmRlcmVyKToKKyAg ICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0Ojppc09uRW5jYXBzdWxhdGlvbkJv dW5kYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0Ojppc09uVXBw ZXJFbmNhcHN1bGF0aW9uQm91bmRhcnkpOgorICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyaW5nQ29u dGV4dC5oOgorICAgICAgICAoTm9kZVJlbmRlcmluZ0NvbnRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6OnBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSk6 IFJlbW92ZWQgYW4gYXNzZXJ0IHdoaWNoIGNoZWNrcyBtX3BoYXNlLgorICAgICAgICAoV2ViQ29y ZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6OnJlc2V0U3R5bGVJbmhlcml0YW5jZSk6IFJlbW92ZWQg YW4gYXNzZXJ0IHdoaWNoIGNoZWNrcyBtX3BoYXNlLgorICAgICAgICAqIGh0bWwvc2hhZG93L0lu c2VydGlvblBvaW50Lmg6CisgICAgICAgIChXZWJDb3JlOjppc0luc2VydGlvblBvaW50KTogRml4 IG51bGwgY2FzZSBjaGVjay4KKyAgICAgICAgKFdlYkNvcmU6OmlzTG93ZXJFbmNhcHN1bGF0aW9u Qm91bmRhcnkpOiBSZW5hbWVkIGZyb20gaXNTaGFkb3dCb3VuZGFyeSgpCisKIDIwMTItMDYtMjEg IEFsZXhlaSBGaWxpcHBvdiAgPGFsZXhlaWZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFByb3Blcmx5IGRpc3BsYXkgbmF0aXZlIG1lbW9yeSBzaXplcyBiaWdnZXIgdGhh biAyR0IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4 IGI0ZDZkNDY4NmZkNjRmMDI0MjI4OWViYmMwN2JmMzU3NTI0NWNhMGYuLmI2MmZmZTIwZTY5OGU4 ZWFiMzRiOTQ5MDYzYjQyYTMxMWVkZTY1MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGVS ZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtNTIsMTEgKzUyLDkgQEAgc3RhdGljIFJlbmRlck9iamVj dCogZmlyc3RSZW5kZXJlck9mKE5vZGUqKTsKIHN0YXRpYyBSZW5kZXJPYmplY3QqIGxhc3RSZW5k ZXJlck9mKE5vZGUqKTsKIAogTm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5kZXJpbmdDb250 ZXh0KE5vZGUqIG5vZGUpCi0gICAgOiBtX3BoYXNlKEF0dGFjaGluZ05vdEluVHJlZSkKLSAgICAs IG1fbm9kZShub2RlKQorICAgIDogbV9ub2RlKG5vZGUpCiAgICAgLCBtX3BhcmVudE5vZGVGb3JS ZW5kZXJpbmdBbmRTdHlsZSgwKQogICAgICwgbV9yZXNldFN0eWxlSW5oZXJpdGFuY2UoZmFsc2Up Ci0gICAgLCBtX3Zpc3VhbFBhcmVudFNoYWRvdygwKQogICAgICwgbV9pbnNlcnRpb25Qb2ludCgw KQogICAgICwgbV9zdHlsZSgwKQogICAgICwgbV9wYXJlbnRGbG93UmVuZGVyZXIoMCkKQEAgLTY2 LDcxICs2NCw2OCBAQCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6Tm9kZVJlbmRlcmluZ0NvbnRleHQo Tm9kZSogbm9kZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHBhcmVudC0+aXNTaGFkb3dS b290KCkgJiYgdG9TaGFkb3dSb290KHBhcmVudCktPmlzWW91bmdlc3QoKSkgewotICAgICAgICBt X3BoYXNlID0gQXR0YWNoaW5nU2hhZG93Q2hpbGQ7CiAgICAgICAgIG1fcGFyZW50Tm9kZUZvclJl bmRlcmluZ0FuZFN0eWxlID0gdG9TaGFkb3dSb290KHBhcmVudCktPmhvc3QoKTsKICAgICAgICAg bV9yZXNldFN0eWxlSW5oZXJpdGFuY2UgPSB0b1NoYWRvd1Jvb3QocGFyZW50KS0+cmVzZXRTdHls ZUluaGVyaXRhbmNlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAocGFyZW50 LT5pc0VsZW1lbnROb2RlKCkgfHwgcGFyZW50LT5pc1NoYWRvd1Jvb3QoKSkgeworICAgICAgICBF bGVtZW50U2hhZG93KiBwYXJlbnRTaGFkb3cgPSAwOworCiAgICAgICAgIGlmIChwYXJlbnQtPmlz RWxlbWVudE5vZGUoKSkKLSAgICAgICAgICAgIG1fdmlzdWFsUGFyZW50U2hhZG93ID0gdG9FbGVt ZW50KHBhcmVudCktPnNoYWRvdygpOworICAgICAgICAgICAgcGFyZW50U2hhZG93ID0gdG9FbGVt ZW50KHBhcmVudCktPnNoYWRvdygpOwogICAgICAgICBlbHNlIGlmIChwYXJlbnQtPmlzU2hhZG93 Um9vdCgpKQotICAgICAgICAgICAgbV92aXN1YWxQYXJlbnRTaGFkb3cgPSB0b1NoYWRvd1Jvb3Qo cGFyZW50KS0+b3duZXIoKTsKKyAgICAgICAgICAgIHBhcmVudFNoYWRvdyA9IHRvU2hhZG93Um9v dChwYXJlbnQpLT5vd25lcigpOwogCi0gICAgICAgIGlmIChtX3Zpc3VhbFBhcmVudFNoYWRvdykg ewotICAgICAgICAgICAgbV92aXN1YWxQYXJlbnRTaGFkb3ctPmVuc3VyZURpc3RyaWJ1dGlvbigp OworICAgICAgICBpZiAocGFyZW50U2hhZG93KSB7CisgICAgICAgICAgICBwYXJlbnRTaGFkb3ct PmVuc3VyZURpc3RyaWJ1dGlvbigpOwogCi0gICAgICAgICAgICBpZiAoKG1faW5zZXJ0aW9uUG9p bnQgPSBtX3Zpc3VhbFBhcmVudFNoYWRvdy0+aW5zZXJ0aW9uUG9pbnRGb3IobV9ub2RlKSkpIHsK LSAgICAgICAgICAgICAgICBpZiAobV9pbnNlcnRpb25Qb2ludC0+c2hhZG93Um9vdCgpLT5pc1Vz ZWRGb3JSZW5kZXJpbmcoKSkgewotICAgICAgICAgICAgICAgICAgICBtX3BoYXNlID0gQXR0YWNo aW5nRGlzdHJpYnV0ZWQ7Ci0gICAgICAgICAgICAgICAgICAgIE5vZGVSZW5kZXJpbmdDb250ZXh0 IGluc2VydGlvblBvaW50Q29udGV4dChtX2luc2VydGlvblBvaW50KTsKKyAgICAgICAgICAgIGlm IChJbnNlcnRpb25Qb2ludCogaW5zZXJ0aW9uUG9pbnQgPSBwYXJlbnRTaGFkb3ctPmluc2VydGlv blBvaW50Rm9yKG1fbm9kZSkpIHsKKyAgICAgICAgICAgICAgICBpZiAoaW5zZXJ0aW9uUG9pbnQt PnNoYWRvd1Jvb3QoKS0+aXNVc2VkRm9yUmVuZGVyaW5nKCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgTm9kZVJlbmRlcmluZ0NvbnRleHQgaW5zZXJ0aW9uUG9pbnRDb250ZXh0KGluc2VydGlvblBv aW50KTsKICAgICAgICAgICAgICAgICAgICAgbV9wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5 bGUgPSBpbnNlcnRpb25Qb2ludENvbnRleHQucGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxl KCk7CiAgICAgICAgICAgICAgICAgICAgIG1fcmVzZXRTdHlsZUluaGVyaXRhbmNlID0gaW5zZXJ0 aW9uUG9pbnRDb250ZXh0LnJlc2V0U3R5bGVJbmhlcml0YW5jZSgpOworICAgICAgICAgICAgICAg ICAgICBtX2luc2VydGlvblBvaW50ID0gaW5zZXJ0aW9uUG9pbnQ7CiAgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKLSAgICAgICAg ICAgIG1fcGhhc2UgPSBBdHRhY2hpbmdOb3REaXN0cmlidXRlZDsKLSAgICAgICAgICAgIG1fcGFy ZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlID0gcGFyZW50OwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGlzU2hhZG93Qm91bmRhcnkocGFyZW50KSkgewot ICAgICAgICAgICAgU2hhZG93Um9vdCogcGFyZW50U2hhZG93Um9vdCA9IHBhcmVudC0+c2hhZG93 Um9vdCgpOwotICAgICAgICAgICAgcGFyZW50U2hhZG93Um9vdC0+b3duZXIoKS0+ZW5zdXJlRGlz dHJpYnV0aW9uKCk7CisgICAgICAgIGlmIChpc0xvd2VyRW5jYXBzdWxhdGlvbkJvdW5kYXJ5KHBh cmVudCkpIHsKKyAgICAgICAgICAgIFNoYWRvd1Jvb3QqIHBhcmVudFNjb3BlID0gcGFyZW50LT5z aGFkb3dSb290KCk7CisgICAgICAgICAgICBwYXJlbnRTY29wZS0+b3duZXIoKS0+ZW5zdXJlRGlz dHJpYnV0aW9uKCk7CiAKLSAgICAgICAgICAgIGlmICghcGFyZW50U2hhZG93Um9vdC0+aXNVc2Vk Rm9yUmVuZGVyaW5nKCkpIHsKLSAgICAgICAgICAgICAgICBtX3BoYXNlID0gQXR0YWNoaW5nTm90 RGlzdHJpYnV0ZWQ7Ci0gICAgICAgICAgICAgICAgbV9wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5k U3R5bGUgPSBwYXJlbnQ7CisgICAgICAgICAgICAvLyBUaGUgc2hhZG93IHRyZWUgaXNuJ3QgcGFy dCBvZiBjb21wb3NlZCB0cmVlLgorICAgICAgICAgICAgaWYgKCFwYXJlbnRTY29wZS0+aXNVc2Vk Rm9yUmVuZGVyaW5nKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQog CisgICAgICAgICAgICAvLyB0aGUgcGFyZW50IGluc2VydGlvbiBwb2ludCBkb2Vzbid0IG5lZWQg YW55IGZhbGxiYWNrIGNvbnRlbnQuCiAgICAgICAgICAgICBpZiAodG9JbnNlcnRpb25Qb2ludChw YXJlbnQpLT5oYXNEaXN0cmlidXRpb24oKSkKLSAgICAgICAgICAgICAgICBtX3BoYXNlID0gQXR0 YWNoaW5nTm90RmFsbGJhY2tlZDsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBt X3BoYXNlID0gQXR0YWNoaW5nRmFsbGJhY2tlZDsKKyAgICAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgICAgIGlmICh0b0luc2VydGlvblBvaW50KHBhcmVudCktPmlzQWN0aXZlKCkpIHsK KyAgICAgICAgICAgICAgICAvLyBVc2VzIG1fbm9kZSBhcyBhIGZhbGxiYWNrIG5vZGUgb2YgdGhl IGluc2VydGlvbiBwb2ludC4KICAgICAgICAgICAgICAgICBOb2RlUmVuZGVyaW5nQ29udGV4dCBw YXJlbnRDb250ZXh0KHBhcmVudCk7CiAgICAgICAgICAgICAgICAgbV9wYXJlbnROb2RlRm9yUmVu ZGVyaW5nQW5kU3R5bGUgPSBwYXJlbnRDb250ZXh0LnBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRT dHlsZSgpOwogICAgICAgICAgICAgICAgIG1fcmVzZXRTdHlsZUluaGVyaXRhbmNlID0gcGFyZW50 Q29udGV4dC5yZXNldFN0eWxlSW5oZXJpdGFuY2UoKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAg ICAgICAgICAgICAgIG1fcGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlID0gcGFyZW50Owor ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8g VGhlIGluc2VydGlvbiBwb2ludCBpc24ndCBhY3RpdmUgdGh1cyBiZWhhdmVzIGFzIGEgcGxhaW4g b2xkIGVsZW1lbnQuCisgICAgICAgICAgICBtX3BhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHls ZSA9IHBhcmVudDsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KIAotICAg IG1fcGhhc2UgPSBBdHRhY2hpbmdTdHJhaWdodDsKICAgICBtX3BhcmVudE5vZGVGb3JSZW5kZXJp bmdBbmRTdHlsZSA9IHBhcmVudDsKIH0KIAogTm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5k ZXJpbmdDb250ZXh0KE5vZGUqIG5vZGUsIFJlbmRlclN0eWxlKiBzdHlsZSkKLSAgICA6IG1fcGhh c2UoQ2FsY3VsYXRpbmcpCi0gICAgLCBtX25vZGUobm9kZSkKKyAgICA6IG1fbm9kZShub2RlKQog ICAgICwgbV9wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUoMCkKICAgICAsIG1fcmVzZXRT dHlsZUluaGVyaXRhbmNlKGZhbHNlKQotICAgICwgbV92aXN1YWxQYXJlbnRTaGFkb3coMCkKICAg ICAsIG1faW5zZXJ0aW9uUG9pbnQoMCkKICAgICAsIG1fc3R5bGUoc3R5bGUpCiAgICAgLCBtX3Bh cmVudEZsb3dSZW5kZXJlcigwKQpAQCAtMjQxLDE0ICsyMzYsMTMgQEAgc3RhdGljIGlubGluZSBS ZW5kZXJPYmplY3QqIGxhc3RSZW5kZXJlck9mKE5vZGUqIG5vZGUpCiAKIFJlbmRlck9iamVjdCog Tm9kZVJlbmRlcmluZ0NvbnRleHQ6Om5leHRSZW5kZXJlcigpIGNvbnN0CiB7Ci0gICAgQVNTRVJU KG1fbm9kZS0+cmVuZGVyZXIoKSB8fCBtX3BoYXNlICE9IENhbGN1bGF0aW5nKTsKICAgICBpZiAo UmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG1fbm9kZS0+cmVuZGVyZXIoKSkKICAgICAgICAgcmV0 dXJuIHJlbmRlcmVyLT5uZXh0U2libGluZygpOwogCiAgICAgaWYgKG1fcGFyZW50Rmxvd1JlbmRl cmVyKQogICAgICAgICByZXR1cm4gbV9wYXJlbnRGbG93UmVuZGVyZXItPm5leHRSZW5kZXJlckZv ck5vZGUobV9ub2RlKTsKIAotICAgIGlmIChtX3BoYXNlID09IEF0dGFjaGluZ0Rpc3RyaWJ1dGVk KSB7CisgICAgaWYgKG1faW5zZXJ0aW9uUG9pbnQpIHsKICAgICAgICAgaWYgKFJlbmRlck9iamVj dCogZm91bmQgPSBuZXh0UmVuZGVyZXJPZkluc2VydGlvblBvaW50KG1faW5zZXJ0aW9uUG9pbnQs IG1fbm9kZSkpCiAgICAgICAgICAgICByZXR1cm4gZm91bmQ7CiAgICAgICAgIHJldHVybiBOb2Rl UmVuZGVyaW5nQ29udGV4dChtX2luc2VydGlvblBvaW50KS5uZXh0UmVuZGVyZXIoKTsKQEAgLTI2 NCwxNSArMjU4LDEzIEBAIFJlbmRlck9iamVjdCogTm9kZVJlbmRlcmluZ0NvbnRleHQ6Om5leHRS ZW5kZXJlcigpIGNvbnN0CiAKIFJlbmRlck9iamVjdCogTm9kZVJlbmRlcmluZ0NvbnRleHQ6OnBy ZXZpb3VzUmVuZGVyZXIoKSBjb25zdAogewotICAgIEFTU0VSVChtX25vZGUtPnJlbmRlcmVyKCkg fHwgbV9waGFzZSAhPSBDYWxjdWxhdGluZyk7Ci0KICAgICBpZiAoUmVuZGVyT2JqZWN0KiByZW5k ZXJlciA9IG1fbm9kZS0+cmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIHJlbmRlcmVyLT5wcmV2 aW91c1NpYmxpbmcoKTsKIAogICAgIGlmIChtX3BhcmVudEZsb3dSZW5kZXJlcikKICAgICAgICAg cmV0dXJuIG1fcGFyZW50Rmxvd1JlbmRlcmVyLT5wcmV2aW91c1JlbmRlcmVyRm9yTm9kZShtX25v ZGUpOwogCi0gICAgaWYgKG1fcGhhc2UgPT0gQXR0YWNoaW5nRGlzdHJpYnV0ZWQpIHsKKyAgICBp ZiAobV9pbnNlcnRpb25Qb2ludCkgewogICAgICAgICBpZiAoUmVuZGVyT2JqZWN0KiBmb3VuZCA9 IHByZXZpb3VzUmVuZGVyZXJPZkluc2VydGlvblBvaW50KG1faW5zZXJ0aW9uUG9pbnQsIG1fbm9k ZSkpCiAgICAgICAgICAgICByZXR1cm4gZm91bmQ7CiAgICAgICAgIHJldHVybiBOb2RlUmVuZGVy aW5nQ29udGV4dChtX2luc2VydGlvblBvaW50KS5wcmV2aW91c1JlbmRlcmVyKCk7CkBAIC0yODUs MjQgKzI3NywxNyBAQCBSZW5kZXJPYmplY3QqIE5vZGVSZW5kZXJpbmdDb250ZXh0OjpwcmV2aW91 c1JlbmRlcmVyKCkgY29uc3QKIAogUmVuZGVyT2JqZWN0KiBOb2RlUmVuZGVyaW5nQ29udGV4dDo6 cGFyZW50UmVuZGVyZXIoKSBjb25zdAogewotICAgIGlmIChSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gbV9ub2RlLT5yZW5kZXJlcigpKSB7Ci0gICAgICAgIEFTU0VSVChtX3BoYXNlID09IENhbGN1 bGF0aW5nKTsKKyAgICBpZiAoUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG1fbm9kZS0+cmVuZGVy ZXIoKSkKICAgICAgICAgcmV0dXJuIHJlbmRlcmVyLT5wYXJlbnQoKTsKLSAgICB9Ci0KICAgICBp ZiAobV9wYXJlbnRGbG93UmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBtX3BhcmVudEZsb3dSZW5k ZXJlcjsKIAotICAgIEFTU0VSVChtX3BoYXNlICE9IENhbGN1bGF0aW5nKTsKICAgICByZXR1cm4g bV9wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUgPyBtX3BhcmVudE5vZGVGb3JSZW5kZXJp bmdBbmRTdHlsZS0+cmVuZGVyZXIoKSA6IDA7CiB9CiAKIGJvb2wgTm9kZVJlbmRlcmluZ0NvbnRl eHQ6OnNob3VsZENyZWF0ZVJlbmRlcmVyKCkgY29uc3QKIHsKLSAgICBBU1NFUlQobV9waGFzZSAh PSBDYWxjdWxhdGluZyk7Ci0gICAgQVNTRVJUKHBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHls ZSgpKTsKLQotICAgIGlmIChtX3BoYXNlID09IEF0dGFjaGluZ05vdEluVHJlZSB8fCBtX3BoYXNl ID09IEF0dGFjaGluZ05vdERpc3RyaWJ1dGVkIHx8IG1fcGhhc2UgPT0gQXR0YWNoaW5nTm90RmFs bGJhY2tlZCkKKyAgICBpZiAoIW1fcGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgUmVuZGVyT2JqZWN0KiBwYXJlbnRSZW5kZXJlciA9IHRo aXMtPnBhcmVudFJlbmRlcmVyKCk7CiAgICAgaWYgKCFwYXJlbnRSZW5kZXJlcikKQEAgLTM0MCw2 ICszMjUsMTYgQEAgdm9pZCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6bW92ZVRvRmxvd1RocmVhZElm TmVlZGVkKCkKICAgICBmbG93VGhyZWFkQ29udHJvbGxlci0+cmVnaXN0ZXJOYW1lZEZsb3dDb250 ZW50Tm9kZShtX25vZGUsIG1fcGFyZW50Rmxvd1JlbmRlcmVyKTsKIH0KIAorYm9vbCBOb2RlUmVu ZGVyaW5nQ29udGV4dDo6aXNPbkVuY2Fwc3VsYXRpb25Cb3VuZGFyeSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIGlzT25VcHBlckVuY2Fwc3VsYXRpb25Cb3VuZGFyeSgpIHx8IGlzTG93ZXJFbmNhcHN1 bGF0aW9uQm91bmRhcnkobV9pbnNlcnRpb25Qb2ludCkgfHwgaXNMb3dlckVuY2Fwc3VsYXRpb25C b3VuZGFyeShtX25vZGUtPnBhcmVudE5vZGUoKSk7Cit9CisKK2Jvb2wgTm9kZVJlbmRlcmluZ0Nv bnRleHQ6OmlzT25VcHBlckVuY2Fwc3VsYXRpb25Cb3VuZGFyeSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fbm9kZS0+cGFyZW50Tm9kZSgpICYmIG1fbm9kZS0+cGFyZW50Tm9kZSgpLT5pc1NoYWRv d1Jvb3QoKTsKK30KKwogTm9kZVJlbmRlcmVyRmFjdG9yeTo6Tm9kZVJlbmRlcmVyRmFjdG9yeShO b2RlKiBub2RlKQogICAgIDogbV9jb250ZXh0KG5vZGUpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlUmVuZGVyaW5nQ29udGV4dC5oCmluZGV4IDYwNzkyY2I0N2YwZjRlMmJkYzNjNWRiOWQxZjU1 ZWQxNTFlMTM4N2YuLjI4ZjAyOGZlOTU2NjA3ZmY2NTRlYTlmMTQxMmUyNDAwYmI5MmIxMTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5oCkBAIC02OCwyMiArNjgs OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb3ZlVG9GbG93VGhyZWFkSWZOZWVkZWQoKTsKIAogcHJp dmF0ZToKLSAgICBlbnVtIEF0dGFjaGluZ1BoYXNlIHsKLSAgICAgICAgQ2FsY3VsYXRpbmcsCi0g ICAgICAgIEF0dGFjaGluZ1N0cmFpZ2h0LAotICAgICAgICBBdHRhY2hpbmdOb3RJblRyZWUsCi0g ICAgICAgIEF0dGFjaGluZ0Rpc3RyaWJ1dGVkLAotICAgICAgICBBdHRhY2hpbmdOb3REaXN0cmli dXRlZCwKLSAgICAgICAgQXR0YWNoaW5nRmFsbGJhY2tlZCwKLSAgICAgICAgQXR0YWNoaW5nTm90 RmFsbGJhY2tlZCwKLSAgICAgICAgQXR0YWNoaW5nU2hhZG93Q2hpbGQsCi0gICAgfTsKLQotICAg IEF0dGFjaGluZ1BoYXNlIG1fcGhhc2U7CiAgICAgTm9kZSogbV9ub2RlOwogICAgIENvbnRhaW5l ck5vZGUqIG1fcGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlOwogICAgIGJvb2wgbV9yZXNl dFN0eWxlSW5oZXJpdGFuY2U7Ci0gICAgRWxlbWVudFNoYWRvdyogbV92aXN1YWxQYXJlbnRTaGFk b3c7CiAgICAgSW5zZXJ0aW9uUG9pbnQqIG1faW5zZXJ0aW9uUG9pbnQ7CiAgICAgUmVmUHRyPFJl bmRlclN0eWxlPiBtX3N0eWxlOwogICAgIFJlbmRlck5hbWVkRmxvd1RocmVhZCogbV9wYXJlbnRG bG93UmVuZGVyZXI7CkBAIC05NywxMyArODQsMTEgQEAgaW5saW5lIE5vZGUqIE5vZGVSZW5kZXJp bmdDb250ZXh0Ojpub2RlKCkgY29uc3QKIAogaW5saW5lIENvbnRhaW5lck5vZGUqIE5vZGVSZW5k ZXJpbmdDb250ZXh0OjpwYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUoKSBjb25zdAogewot ICAgIEFTU0VSVChtX3BoYXNlICE9IENhbGN1bGF0aW5nKTsKICAgICByZXR1cm4gbV9wYXJlbnRO b2RlRm9yUmVuZGVyaW5nQW5kU3R5bGU7CiB9CiAKIGlubGluZSBib29sIE5vZGVSZW5kZXJpbmdD b250ZXh0OjpyZXNldFN0eWxlSW5oZXJpdGFuY2UoKSBjb25zdAogewotICAgIEFTU0VSVChtX3Bo YXNlICE9IENhbGN1bGF0aW5nKTsKICAgICByZXR1cm4gbV9yZXNldFN0eWxlSW5oZXJpdGFuY2U7 CiB9CiAKQEAgLTExNywxOCArMTAyLDYgQEAgaW5saW5lIEluc2VydGlvblBvaW50KiBOb2RlUmVu ZGVyaW5nQ29udGV4dDo6aW5zZXJ0aW9uUG9pbnQoKSBjb25zdAogICAgIHJldHVybiBtX2luc2Vy dGlvblBvaW50OwogfQogCi1pbmxpbmUgYm9vbCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6aXNPbkVu Y2Fwc3VsYXRpb25Cb3VuZGFyeSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIChtX3BoYXNlID09IEF0 dGFjaGluZ0Rpc3RyaWJ1dGVkCi0gICAgICAgICAgICB8fCBtX3BoYXNlID09IEF0dGFjaGluZ1No YWRvd0NoaWxkCi0gICAgICAgICAgICB8fCBtX3BoYXNlID09IEF0dGFjaGluZ0ZhbGxiYWNrZWQp OwotfQotCi1pbmxpbmUgYm9vbCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6aXNPblVwcGVyRW5jYXBz dWxhdGlvbkJvdW5kYXJ5KCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9waGFzZSA9PSBBdHRhY2hp bmdTaGFkb3dDaGlsZDsKLX0KLQogY2xhc3MgTm9kZVJlbmRlcmVyRmFjdG9yeSB7CiAgICAgV1RG X01BS0VfTk9OQ09QWUFCTEUoTm9kZVJlbmRlcmVyRmFjdG9yeSk7CiAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNl cnRpb25Qb2ludC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQu aAppbmRleCA5OGNhMTU0ODY1Y2NmZDdmNmQxNjYxMDgzNDY3NjNhNzU1OTA3YTgwLi5kN2NiYWMz YmY5NjE0NmFiOTgzMjRhMjY2OWNlMmVjM2JhZmNlMjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0luc2VydGlvblBvaW50LmgKQEAgLTc5LDcgKzc5LDcgQEAgcHJpdmF0ZToKIGlu bGluZSBib29sIGlzSW5zZXJ0aW9uUG9pbnQoY29uc3QgTm9kZSogbm9kZSkKIHsKICAgICBpZiAo IW5vZGUpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBpZiAobm9kZS0+aXNIVE1MRWxlbWVudCgpICYmIHRvSFRNTEVsZW1lbnQobm9kZSktPmlzSW5z ZXJ0aW9uUG9pbnQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xMDQsNyArMTA0LDcgQEAg aW5saW5lIGJvb2wgaXNBY3RpdmVJbnNlcnRpb25Qb2ludChjb25zdCBOb2RlKiBub2RlKQogICAg IHJldHVybiBpc0luc2VydGlvblBvaW50KG5vZGUpICYmIHRvSW5zZXJ0aW9uUG9pbnQobm9kZSkt PmlzQWN0aXZlKCk7CiB9CiAKLWlubGluZSBib29sIGlzU2hhZG93Qm91bmRhcnkoTm9kZSogbm9k ZSkKK2lubGluZSBib29sIGlzTG93ZXJFbmNhcHN1bGF0aW9uQm91bmRhcnkoTm9kZSogbm9kZSkK IHsKICAgICBpZiAoIWlzSW5zZXJ0aW9uUG9pbnQobm9kZSkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsK