89241 2012-06-15 12:50:25 -0700 Align RenderLayer's descendant dependent flags semantics 2012-06-19 16:39:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 88888 1 jchaffraix jchaffraix eric simon.fraser webkit.review.bot oldest_to_newest 650414 0 jchaffraix 2012-06-15 12:50:25 -0700 After bug 88888, we have a new descendant dependent flag (has-self-painting-layer-descendant) on RenderLayer that behaves slightly differently than the existing flags (visible descendant mostly and visible content to some extend). One of the review comment of bug 88888 was to bring their implementation and naming closer to avoid un-intended difference in behavior. 650478 1 147892 jchaffraix 2012-06-15 13:59:43 -0700 Created attachment 147892 Proposed change v1. 652652 2 147892 simon.fraser 2012-06-19 11:41:58 -0700 Comment on attachment 147892 Proposed change v1. View in context: https://bugs.webkit.org/attachment.cgi?id=147892&action=review > Source/WebCore/ChangeLog:16 > + Changed this method to not take a boolean as every callers where passing "as every caller was passing" > Source/WebCore/rendering/RenderLayer.cpp:648 > + sc->dirtyZOrderLists(); > + if (sc->hasVisibleContent()) I'd like to see a comment explaining why z-order lists are dirtied. I think we also don't omit hidden layers from the z-order lists when compositing, so you may be able to avoid this dirty in some cases. 652816 3 147892 jchaffraix 2012-06-19 14:29:11 -0700 Comment on attachment 147892 Proposed change v1. View in context: https://bugs.webkit.org/attachment.cgi?id=147892&action=review >> Source/WebCore/rendering/RenderLayer.cpp:648 >> + if (sc->hasVisibleContent()) > > I'd like to see a comment explaining why z-order lists are dirtied. I think we also don't omit hidden layers from the z-order lists when compositing, so you may be able to avoid this dirty in some cases. Here is what I have added to the patch for landing: // We don't collect invisible layers in z-order lists if we are not in compositing mode. // As we became visible, we need to dirty our stacking contexts ancestors to be properly // collected. FIXME: When compositing, we could skip this dirtying phase. 652817 4 148424 jchaffraix 2012-06-19 14:29:56 -0700 Created attachment 148424 Patch for landing 652960 5 148424 webkit.review.bot 2012-06-19 16:39:34 -0700 Comment on attachment 148424 Patch for landing Clearing flags on attachment: 148424 Committed r120770: <http://trac.webkit.org/changeset/120770> 652961 6 webkit.review.bot 2012-06-19 16:39:38 -0700 All reviewed patches have been landed. Closing bug. 147892 2012-06-15 13:59:43 -0700 2012-06-19 14:29:52 -0700 Proposed change v1. bug-89241-20120615135942.patch text/plain 9587 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBhY2E0ZDhjMjhlMTY3 MWI4YjJiNGI4ZjhiZDJkZDk2YjllMTBlMy4uZjMxYmRhYWI5ZDA0NzU1MTQyNTExMjNmYmE5Njcz NjY5YjQ4ZWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEyLTA2LTE1ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIEFsaWduIFJl bmRlckxheWVyJ3MgZGVzY2VuZGFudCBkZXBlbmRlbnQgZmxhZ3Mgc2VtYW50aWNzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI0MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yaW5nIG9ubHks IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxpZ25z IHRoZSBuYW1pbmcgYW5kIGltcGxlbWVudGF0aW9uIG9mIHRoZSBkaWZmZXJlbnQgZGVzY2VuZGFu dAorICAgICAgICBkZXBlbmRlbnQgZmxhZ3MuIFdoaWxlIGFsaWduaW5nLCBJIGZvdW5kIHNvbWUg YnVncyAoaW5lZmZpY2llbmNpZXMpIHdpdGggaG93CisgICAgICAgIHRoZSB2aXNpYmxlIGRlc2Nl bmRhbnQgZmxhZ3Mgd2FzIGNvbXB1dGVkLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRIYXNWaXNpYmxlQ29u dGVudCk6CisgICAgICAgIENoYW5nZWQgdGhpcyBtZXRob2QgdG8gbm90IHRha2UgYSBib29sZWFu IGFzIGV2ZXJ5IGNhbGxlcnMgd2hlcmUgcGFzc2luZworICAgICAgICAndHJ1ZScuIFJld29ya2Vk IHRoZSBsb2dpYyB1bmRlciB0aGlzIGFzc3VtcHRpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjpkaXJ0eVZpc2libGVDb250ZW50U3RhdHVzKToKKyAgICAgICAgVXBkYXRlZCBh ZnRlciB0aGUgZm9sbG93aW5nIHJlbmFtaW5nLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6ZGlydHlBbmNlc3RvckNoYWluVmlzaWJsZURlc2NlbmRhbnRTdGF0dXMpOgorICAgICAg ICBSZW5hbWVkIHRoaXMgZnVuY3Rpb24gZnJvbSBkaXJ0eVZpc2libGVEZXNjZW5kYW50U3RhdHVz IHRvIG1hdGNoIHRoZSBoYXNTZWxmUGFpbnRpbmdMYXllcgorICAgICAgICBuYW1pbmcgYW5kIGlt cGxlbWVudGF0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2V0QW5jZXN0 b3JDaGFpbkhhc1Zpc2libGVEZXNjZW5kYW50KToKKyAgICAgICAgQWRkZWQgdGhpcyBmdW5jdGlv biB0byBmYWN0b3IgdGhlIHZpc2libGUgZGVzY2VuZGFudCBzZXR0aW5nIG91dCBvZiBkZWZ1bmN0 IGNoaWxkVmlzaWJpbGl0eUNoYW5nZWQuCisgICAgICAgIEFsc28gaW1wcm92ZWQgdGhlIGVmZmlj aWVuY3kgb2YgdGhlIGZ1bmN0aW9uIGJ5IGNsZWFyaW5nIHRoZSBkaXJ0eSBmbGFnIGFzIGl0IGdv ZXMgdXAgKGFuIHVubm90aWNlZCBidWcpLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6YWRkQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxk KToKKyAgICAgICAgVXBkYXRlZCB0byB1c2UgdGhlIG5ldyBmdW5jdGlvbnMgbGlldSBvZiBjaGls ZFZpc2liaWxpdHlDaGFuZ2VkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgor ICAgICAgICAoUmVuZGVyTGF5ZXI6OmNoaWxkVmlzaWJpbGl0eUNoYW5nZWQpOgorICAgICAgICBS ZW1vdmVkIHRoaXMgZnVuY3Rpb24gYXMgaXQgd2Fzbid0IGFkZGluZyBtdWNoIGFuZCBpdCdzIGEg bG90IG1vcmUgY2xlYXIgdG8gY2FsbAorICAgICAgICBkaXJ0eUFuY2VzdG9yQ2hhaW5WaXNpYmxl RGVzY2VuZGFudFN0YXR1cyAvIHNldEFuY2VzdG9yQ2hhaW5IYXNWaXNpYmxlRGVzY2VuZGFudC4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyT2JqZWN0OjpzdHlsZVdpbGxDaGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0 Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2Jq ZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGlsZE5vZGUpOgorICAgICAgICBVcGRhdGVkIHRob3NlIGNh bGxlcnMgYWZ0ZXIgcmVtb3ZpbmcgdGhlIGJvb2xlYW4gcGFyYW1ldGVyIGZyb20gc2V0SGFzVmlz aWJsZUNvbnRlbnQuCisKIDIwMTItMDYtMTUgIFRhaWp1IFRzdWlraSAgPHR6aWtAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vdmUgRmlsZVN5c3RlbSBmcmFtZSBtYW5h Z2VtZW50IGZyb20gZnJvbnRlbmQgdG8gYmFja2VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKaW5kZXggZWMzNjMyY2IyMzM2MzE1OTBjMDU5YTI5MDk3MTk0ZjM4YTA0 OTFhMS4uOWE0NTUyMjc4YWI2ZTlkOTdhN2MxOTZlM2EyNmM4MDYwZWIwOTRmZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC02MzIsNTMgKzYzMiw1MyBAQCB2 b2lkIFJlbmRlckxheWVyOjp1cGRhdGVQYWdpbmF0aW9uKCkKICAgICB9CiB9CiAKLXZvaWQgUmVu ZGVyTGF5ZXI6OnNldEhhc1Zpc2libGVDb250ZW50KGJvb2wgYikKK3ZvaWQgUmVuZGVyTGF5ZXI6 OnNldEhhc1Zpc2libGVDb250ZW50KCkKIHsgCi0gICAgaWYgKG1faGFzVmlzaWJsZUNvbnRlbnQg PT0gYiAmJiAhbV92aXNpYmxlQ29udGVudFN0YXR1c0RpcnR5KQorICAgIGlmIChtX2hhc1Zpc2li bGVDb250ZW50ICYmICFtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkpIHsKKyAgICAgICAgQVNT RVJUKCFwYXJlbnQoKSB8fCBwYXJlbnQoKS0+aGFzVmlzaWJsZURlc2NlbmRhbnQoKSk7CiAgICAg ICAgIHJldHVybjsKKyAgICB9CisKICAgICBtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkgPSBm YWxzZTsgCi0gICAgbV9oYXNWaXNpYmxlQ29udGVudCA9IGI7Ci0gICAgaWYgKG1faGFzVmlzaWJs ZUNvbnRlbnQpIHsKLSAgICAgICAgY29tcHV0ZVJlcGFpbnRSZWN0cygpOwotICAgICAgICBpZiAo IWlzTm9ybWFsRmxvd09ubHkoKSkgewotICAgICAgICAgICAgZm9yIChSZW5kZXJMYXllciogc2Mg PSBzdGFja2luZ0NvbnRleHQoKTsgc2M7IHNjID0gc2MtPnN0YWNraW5nQ29udGV4dCgpKSB7Ci0g ICAgICAgICAgICAgICAgc2MtPmRpcnR5Wk9yZGVyTGlzdHMoKTsKLSAgICAgICAgICAgICAgICBp ZiAoc2MtPmhhc1Zpc2libGVDb250ZW50KCkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgfQorICAgIG1faGFzVmlzaWJsZUNvbnRlbnQgPSB0cnVlOworICAgIGNvbXB1 dGVSZXBhaW50UmVjdHMoKTsKKyAgICBpZiAoIWlzTm9ybWFsRmxvd09ubHkoKSkgeworICAgICAg ICBmb3IgKFJlbmRlckxheWVyKiBzYyA9IHN0YWNraW5nQ29udGV4dCgpOyBzYzsgc2MgPSBzYy0+ c3RhY2tpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgICAgIHNjLT5kaXJ0eVpPcmRlckxpc3RzKCk7 CisgICAgICAgICAgICBpZiAoc2MtPmhhc1Zpc2libGVDb250ZW50KCkpCisgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CisKICAgICBpZiAocGFyZW50KCkpCi0gICAgICAg IHBhcmVudCgpLT5jaGlsZFZpc2liaWxpdHlDaGFuZ2VkKG1faGFzVmlzaWJsZUNvbnRlbnQpOwor ICAgICAgICBwYXJlbnQoKS0+c2V0QW5jZXN0b3JDaGFpbkhhc1Zpc2libGVEZXNjZW5kYW50KCk7 CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXI6OmRpcnR5VmlzaWJsZUNvbnRlbnRTdGF0dXMoKSAKIHsg CiAgICAgbV92aXNpYmxlQ29udGVudFN0YXR1c0RpcnR5ID0gdHJ1ZTsgCiAgICAgaWYgKHBhcmVu dCgpKQotICAgICAgICBwYXJlbnQoKS0+ZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpOwor ICAgICAgICBwYXJlbnQoKS0+ZGlydHlBbmNlc3RvckNoYWluVmlzaWJsZURlc2NlbmRhbnRTdGF0 dXMoKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6Y2hpbGRWaXNpYmlsaXR5Q2hhbmdlZChib29s IG5ld1Zpc2liaWxpdHkpIAoteyAKLSAgICBpZiAobV9oYXNWaXNpYmxlRGVzY2VuZGFudCA9PSBu ZXdWaXNpYmlsaXR5IHx8IG1fdmlzaWJsZURlc2NlbmRhbnRTdGF0dXNEaXJ0eSkKLSAgICAgICAg cmV0dXJuOwotICAgIGlmIChuZXdWaXNpYmlsaXR5KSB7Ci0gICAgICAgIFJlbmRlckxheWVyKiBs ID0gdGhpczsKLSAgICAgICAgd2hpbGUgKGwgJiYgIWwtPm1fdmlzaWJsZURlc2NlbmRhbnRTdGF0 dXNEaXJ0eSAmJiAhbC0+bV9oYXNWaXNpYmxlRGVzY2VuZGFudCkgewotICAgICAgICAgICAgbC0+ bV9oYXNWaXNpYmxlRGVzY2VuZGFudCA9IHRydWU7Ci0gICAgICAgICAgICBsID0gbC0+cGFyZW50 KCk7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgCi0gICAgICAgIGRpcnR5VmlzaWJsZURlc2NlbmRh bnRTdGF0dXMoKTsKK3ZvaWQgUmVuZGVyTGF5ZXI6OmRpcnR5QW5jZXN0b3JDaGFpblZpc2libGVE ZXNjZW5kYW50U3RhdHVzKCkKK3sKKyAgICBmb3IgKFJlbmRlckxheWVyKiBsYXllciA9IHRoaXM7 IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAobGF5ZXItPm1f dmlzaWJsZURlc2NlbmRhbnRTdGF0dXNEaXJ0eSkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAg ICAgIGxheWVyLT5tX3Zpc2libGVEZXNjZW5kYW50U3RhdHVzRGlydHkgPSB0cnVlOworICAgIH0K IH0KIAotdm9pZCBSZW5kZXJMYXllcjo6ZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpCit2 b2lkIFJlbmRlckxheWVyOjpzZXRBbmNlc3RvckNoYWluSGFzVmlzaWJsZURlc2NlbmRhbnQoKQog ewotICAgIFJlbmRlckxheWVyKiBsID0gdGhpczsKLSAgICB3aGlsZSAobCAmJiAhbC0+bV92aXNp YmxlRGVzY2VuZGFudFN0YXR1c0RpcnR5KSB7Ci0gICAgICAgIGwtPm1fdmlzaWJsZURlc2NlbmRh bnRTdGF0dXNEaXJ0eSA9IHRydWU7Ci0gICAgICAgIGwgPSBsLT5wYXJlbnQoKTsKKyAgICBmb3Ig KFJlbmRlckxheWVyKiBsYXllciA9IHRoaXM7IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQo KSkgeworICAgICAgICBpZiAoIWxheWVyLT5tX3Zpc2libGVEZXNjZW5kYW50U3RhdHVzRGlydHkg JiYgbGF5ZXItPmhhc1Zpc2libGVEZXNjZW5kYW50KCkpCisgICAgICAgICAgICBicmVhazsKKwor ICAgICAgICBsYXllci0+bV9oYXNWaXNpYmxlRGVzY2VuZGFudCA9IHRydWU7CisgICAgICAgIGxh eWVyLT5tX3Zpc2libGVEZXNjZW5kYW50U3RhdHVzRGlydHkgPSBmYWxzZTsKICAgICB9CiB9CiAK QEAgLTEyNzcsNyArMTI3Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmFkZENoaWxkKFJlbmRlckxh eWVyKiBjaGlsZCwgUmVuZGVyTGF5ZXIqIGJlZm9yZUNoaWxkKQogCiAgICAgY2hpbGQtPnVwZGF0 ZURlc2NlbmRhbnREZXBlbmRlbnRGbGFncygpOwogICAgIGlmIChjaGlsZC0+bV9oYXNWaXNpYmxl Q29udGVudCB8fCBjaGlsZC0+bV9oYXNWaXNpYmxlRGVzY2VuZGFudCkKLSAgICAgICAgY2hpbGRW aXNpYmlsaXR5Q2hhbmdlZCh0cnVlKTsKKyAgICAgICAgc2V0QW5jZXN0b3JDaGFpbkhhc1Zpc2li bGVEZXNjZW5kYW50KCk7CiAKICAgICBpZiAoY2hpbGQtPmlzU2VsZlBhaW50aW5nTGF5ZXIoKSB8 fCBjaGlsZC0+aGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIHNldEFu Y2VzdG9yQ2hhaW5IYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKTsKQEAgLTEzMjAsNyAr MTMyMCw3IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6cmVtb3ZlQ2hpbGQoUmVuZGVyTGF5 ZXIqIG9sZENoaWxkKQogICAgIAogICAgIG9sZENoaWxkLT51cGRhdGVEZXNjZW5kYW50RGVwZW5k ZW50RmxhZ3MoKTsKICAgICBpZiAob2xkQ2hpbGQtPm1faGFzVmlzaWJsZUNvbnRlbnQgfHwgb2xk Q2hpbGQtPm1faGFzVmlzaWJsZURlc2NlbmRhbnQpCi0gICAgICAgIGNoaWxkVmlzaWJpbGl0eUNo YW5nZWQoZmFsc2UpOworICAgICAgICBkaXJ0eUFuY2VzdG9yQ2hhaW5WaXNpYmxlRGVzY2VuZGFu dFN0YXR1cygpOwogCiAgICAgaWYgKG9sZENoaWxkLT5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwg b2xkQ2hpbGQtPmhhc1NlbGZQYWludGluZ0xheWVyRGVzY2VuZGFudCgpKQogICAgICAgICBkaXJ0 eUFuY2VzdG9yQ2hhaW5IYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnRTdGF0dXMoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggNWE1ZTI0NDZkNDUxMjk4OTVk ZDA4ZmQzNDAyMTQ0MmQ0OGQzZGZhOS4uMjhkN2U1NjI3Yzc3Y2YwODNkNGEyYzY1ZTgwZGExMmI5 MTdkZTdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTQ0MSw3 ICs0NDEsOCBAQCBwdWJsaWM6CiAgICAgLy8gZGl0dG8gZm9yIGhhc1Zpc2libGVEZXNjZW5kYW50 KCksIHNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEyNzcKICAg ICBib29sIGhhc1Zpc2libGVDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV9oYXNWaXNpYmxlQ29u dGVudDsgfQogICAgIGJvb2wgaGFzVmlzaWJsZURlc2NlbmRhbnQoKSBjb25zdCB7IHJldHVybiBt X2hhc1Zpc2libGVEZXNjZW5kYW50OyB9Ci0gICAgdm9pZCBzZXRIYXNWaXNpYmxlQ29udGVudChi b29sKTsKKworICAgIHZvaWQgc2V0SGFzVmlzaWJsZUNvbnRlbnQoKTsKICAgICB2b2lkIGRpcnR5 VmlzaWJsZUNvbnRlbnRTdGF0dXMoKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgQVNTRVJU KCFtX2hhc1NlbGZQYWludGluZ0xheWVyRGVzY2VuZGFudERpcnR5KTsgaGVyZSBidXQgd2UgaGl0 IHRoZSBzYW1lIGJ1Z3MgYXMgdmlzaWJsZSBjb250ZW50IGFib3ZlLgpAQCAtNzgyLDggKzc4Myw4 IEBAIHByaXZhdGU6CiAgICAgCiAgICAgdm9pZCB1cGRhdGVTY3JvbGxhYmxlQXJlYVNldChib29s IGhhc092ZXJmbG93KTsKIAotICAgIHZvaWQgY2hpbGRWaXNpYmlsaXR5Q2hhbmdlZChib29sIG5l d1Zpc2liaWxpdHkpOwotICAgIHZvaWQgZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpOwor ICAgIHZvaWQgZGlydHlBbmNlc3RvckNoYWluVmlzaWJsZURlc2NlbmRhbnRTdGF0dXMoKTsKKyAg ICB2b2lkIHNldEFuY2VzdG9yQ2hhaW5IYXNWaXNpYmxlRGVzY2VuZGFudCgpOwogCiAgICAgdm9p ZCB1cGRhdGVEZXNjZW5kYW50RGVwZW5kZW50RmxhZ3MoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA1NjNlNTk0M2FkOTExNTljODUzMzdhN2Q3Y2U5 NGQ4YWU5OGM2YThkLi5iOTA4NjMwM2Q4NTgzOWM5NzRlODY4ZjhjNWZjOTE0Yjk4YjRjZGU5IDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMTc2OCw3ICsx NzY4LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnN0eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVu Y2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG5ld1MKICAgICAgICAgICAgIGlmIChtX3N0eWxl LT52aXNpYmlsaXR5KCkgIT0gbmV3U3R5bGUtPnZpc2liaWxpdHkoKSkgewogICAgICAgICAgICAg ICAgIGlmIChSZW5kZXJMYXllciogbCA9IGVuY2xvc2luZ0xheWVyKCkpIHsKICAgICAgICAgICAg ICAgICAgICAgaWYgKG5ld1N0eWxlLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkKLSAgICAgICAg ICAgICAgICAgICAgICAgIGwtPnNldEhhc1Zpc2libGVDb250ZW50KHRydWUpOworICAgICAgICAg ICAgICAgICAgICAgICAgbC0+c2V0SGFzVmlzaWJsZUNvbnRlbnQoKTsKICAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAobC0+aGFzVmlzaWJsZUNvbnRlbnQoKSAmJiAodGhpcyA9PSBsLT5yZW5k ZXJlcigpIHx8IGwtPnJlbmRlcmVyKCktPnN0eWxlKCktPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxF KSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbC0+ZGlydHlWaXNpYmxlQ29udGVudFN0YXR1 cygpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRpZmYgPiBTdHlsZURpZmZlcmVuY2VS ZXBhaW50TGF5ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0Q2hpbGRMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3RDaGlsZExpc3QuY3BwCmluZGV4IGYwY2Y2YWZmOGU3NWM1OWY2ZmZjNTExYTU1ZjA1NmRiNjVi NDkzOWMuLmY1NDUyOTdkOTlkOGRhMjdjZjc0YjMyMzMxMmQ2NWVmYzhlMmY5MmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCkBA IC0xOTQsNyArMTk0LDcgQEAgdm9pZCBSZW5kZXJPYmplY3RDaGlsZExpc3Q6OmFwcGVuZENoaWxk Tm9kZShSZW5kZXJPYmplY3QqIG93bmVyLCBSZW5kZXJPYmplY3QqIG4KICAgICAgICAgICAgIGlm ICghbGF5ZXIpCiAgICAgICAgICAgICAgICAgbGF5ZXIgPSBvd25lci0+ZW5jbG9zaW5nTGF5ZXIo KTsKICAgICAgICAgICAgIGlmIChsYXllcikKLSAgICAgICAgICAgICAgICBsYXllci0+c2V0SGFz VmlzaWJsZUNvbnRlbnQodHJ1ZSk7CisgICAgICAgICAgICAgICAgbGF5ZXItPnNldEhhc1Zpc2li bGVDb250ZW50KCk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobmV3Q2hpbGQtPmlzTGlzdEl0 ZW0oKSkKQEAgLTI2MSw3ICsyNjEsNyBAQCB2b2lkIFJlbmRlck9iamVjdENoaWxkTGlzdDo6aW5z ZXJ0Q2hpbGROb2RlKFJlbmRlck9iamVjdCogb3duZXIsIFJlbmRlck9iamVjdCogYwogICAgICAg ICAgICAgaWYgKCFsYXllcikKICAgICAgICAgICAgICAgICBsYXllciA9IG93bmVyLT5lbmNsb3Np bmdMYXllcigpOwogICAgICAgICAgICAgaWYgKGxheWVyKQotICAgICAgICAgICAgICAgIGxheWVy LT5zZXRIYXNWaXNpYmxlQ29udGVudCh0cnVlKTsKKyAgICAgICAgICAgICAgICBsYXllci0+c2V0 SGFzVmlzaWJsZUNvbnRlbnQoKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChjaGlsZC0+aXNM aXN0SXRlbSgpKQo= 148424 2012-06-19 14:29:56 -0700 2012-06-19 16:39:34 -0700 Patch for landing bug-89241-20120619142956.patch text/plain 9854 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y2YTlkZjg0OThhYTIz MTI5MzA0NzU4OTE1NWQ2NjcyODZjNDJlYy4uY2ViYzFkNWI0ZjJjYmUwNmNjM2I0YjMyN2QzMWIx ZTBkNjE0MDdkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEyLTA2LTE5ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIEFsaWduIFJl bmRlckxheWVyJ3MgZGVzY2VuZGFudCBkZXBlbmRlbnQgZmxhZ3Mgc2VtYW50aWNzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI0MQorCisgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBSZWZhY3RvcmluZyBvbmx5LCBj b3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFsaWducyB0 aGUgbmFtaW5nIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgZGlmZmVyZW50IGRlc2NlbmRhbnQK KyAgICAgICAgZGVwZW5kZW50IGZsYWdzLiBXaGlsZSBhbGlnbmluZywgSSBmb3VuZCBzb21lIGJ1 Z3MgKGluZWZmaWNpZW5jaWVzKSB3aXRoIGhvdworICAgICAgICB0aGUgdmlzaWJsZSBkZXNjZW5k YW50IGZsYWdzIHdhcyBjb21wdXRlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2V0SGFzVmlzaWJsZUNvbnRl bnQpOgorICAgICAgICBDaGFuZ2VkIHRoaXMgbWV0aG9kIHRvIG5vdCB0YWtlIGEgYm9vbGVhbiBh cyBldmVyeSBjYWxsZXJzIHdhcyBwYXNzaW5nICd0cnVlJy4KKyAgICAgICAgUmV3b3JrZWQgdGhl IGxvZ2ljIHVuZGVyIHRoaXMgYXNzdW1wdGlvbi4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OmRpcnR5VmlzaWJsZUNvbnRlbnRTdGF0dXMpOgorICAgICAgICBVcGRhdGVkIGFmdGVy IHRoZSBmb2xsb3dpbmcgcmVuYW1pbmcuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjpkaXJ0eUFuY2VzdG9yQ2hhaW5WaXNpYmxlRGVzY2VuZGFudFN0YXR1cyk6CisgICAgICAgIFJl bmFtZWQgdGhpcyBmdW5jdGlvbiBmcm9tIGRpcnR5VmlzaWJsZURlc2NlbmRhbnRTdGF0dXMgdG8g bWF0Y2ggdGhlIGhhc1NlbGZQYWludGluZ0xheWVyCisgICAgICAgIG5hbWluZyBhbmQgaW1wbGVt ZW50YXRpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRBbmNlc3RvckNo YWluSGFzVmlzaWJsZURlc2NlbmRhbnQpOgorICAgICAgICBBZGRlZCB0aGlzIGZ1bmN0aW9uIHRv IGZhY3RvciB0aGUgdmlzaWJsZSBkZXNjZW5kYW50IHNldHRpbmcgb3V0IG9mIGRlZnVuY3QgY2hp bGRWaXNpYmlsaXR5Q2hhbmdlZC4KKyAgICAgICAgQWxzbyBpbXByb3ZlZCB0aGUgZWZmaWNpZW5j eSBvZiB0aGUgZnVuY3Rpb24gYnkgY2xlYXJpbmcgdGhlIGRpcnR5IGZsYWcgYXMgaXQgZ29lcyB1 cCAoYW4gdW5ub3RpY2VkIGJ1ZykuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjph ZGRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVtb3ZlQ2hpbGQpOgor ICAgICAgICBVcGRhdGVkIHRvIHVzZSB0aGUgbmV3IGZ1bmN0aW9ucyBsaWV1IG9mIGNoaWxkVmlz aWJpbGl0eUNoYW5nZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAg ICAgIChSZW5kZXJMYXllcjo6Y2hpbGRWaXNpYmlsaXR5Q2hhbmdlZCk6CisgICAgICAgIFJlbW92 ZWQgdGhpcyBmdW5jdGlvbiBhcyBpdCB3YXNuJ3QgYWRkaW5nIG11Y2ggYW5kIGl0J3MgYSBsb3Qg bW9yZSBjbGVhciB0byBjYWxsCisgICAgICAgIGRpcnR5QW5jZXN0b3JDaGFpblZpc2libGVEZXNj ZW5kYW50U3RhdHVzIC8gc2V0QW5jZXN0b3JDaGFpbkhhc1Zpc2libGVEZXNjZW5kYW50LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJPYmplY3Q6OnN0eWxlV2lsbENoYW5nZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdENoaWxkTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3RDaGls ZExpc3Q6OmFwcGVuZENoaWxkTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3RD aGlsZExpc3Q6Omluc2VydENoaWxkTm9kZSk6CisgICAgICAgIFVwZGF0ZWQgdGhvc2UgY2FsbGVy cyBhZnRlciByZW1vdmluZyB0aGUgYm9vbGVhbiBwYXJhbWV0ZXIgZnJvbSBzZXRIYXNWaXNpYmxl Q29udGVudC4KKwogMjAxMi0wNi0xOSAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29t PgogCiAgICAgICAgIEZpeCBzY3JvbGxiYXIgbGF5ZXJzIGJlaW5nIG1pc3BsYWNlZCB3aXRoIGEg Y2xpcHBlZCBvd25lciBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAKaW5kZXggZWMzNjMyY2IyMzM2MzE1OTBjMDU5YTI5MDk3MTk0ZjM4YTA0OTFhMS4uOTRhODM3 ODAwZmEwM2QyMGUzMmVhNzljNDQ1YmUyMjMyYzcxY2UwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC02MzIsNTMgKzYzMiw1NiBAQCB2b2lkIFJlbmRlckxh eWVyOjp1cGRhdGVQYWdpbmF0aW9uKCkKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnNl dEhhc1Zpc2libGVDb250ZW50KGJvb2wgYikKK3ZvaWQgUmVuZGVyTGF5ZXI6OnNldEhhc1Zpc2li bGVDb250ZW50KCkKIHsgCi0gICAgaWYgKG1faGFzVmlzaWJsZUNvbnRlbnQgPT0gYiAmJiAhbV92 aXNpYmxlQ29udGVudFN0YXR1c0RpcnR5KQorICAgIGlmIChtX2hhc1Zpc2libGVDb250ZW50ICYm ICFtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkpIHsKKyAgICAgICAgQVNTRVJUKCFwYXJlbnQo KSB8fCBwYXJlbnQoKS0+aGFzVmlzaWJsZURlc2NlbmRhbnQoKSk7CiAgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkgPSBmYWxzZTsgCi0gICAg bV9oYXNWaXNpYmxlQ29udGVudCA9IGI7Ci0gICAgaWYgKG1faGFzVmlzaWJsZUNvbnRlbnQpIHsK LSAgICAgICAgY29tcHV0ZVJlcGFpbnRSZWN0cygpOwotICAgICAgICBpZiAoIWlzTm9ybWFsRmxv d09ubHkoKSkgewotICAgICAgICAgICAgZm9yIChSZW5kZXJMYXllciogc2MgPSBzdGFja2luZ0Nv bnRleHQoKTsgc2M7IHNjID0gc2MtPnN0YWNraW5nQ29udGV4dCgpKSB7Ci0gICAgICAgICAgICAg ICAgc2MtPmRpcnR5Wk9yZGVyTGlzdHMoKTsKLSAgICAgICAgICAgICAgICBpZiAoc2MtPmhhc1Zp c2libGVDb250ZW50KCkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg fQorICAgIG1faGFzVmlzaWJsZUNvbnRlbnQgPSB0cnVlOworICAgIGNvbXB1dGVSZXBhaW50UmVj dHMoKTsKKyAgICBpZiAoIWlzTm9ybWFsRmxvd09ubHkoKSkgeworICAgICAgICAvLyBXZSBkb24n dCBjb2xsZWN0IGludmlzaWJsZSBsYXllcnMgaW4gei1vcmRlciBsaXN0cyBpZiB3ZSBhcmUgbm90 IGluIGNvbXBvc2l0aW5nIG1vZGUuCisgICAgICAgIC8vIEFzIHdlIGJlY2FtZSB2aXNpYmxlLCB3 ZSBuZWVkIHRvIGRpcnR5IG91ciBzdGFja2luZyBjb250ZXh0cyBhbmNlc3RvcnMgdG8gYmUgcHJv cGVybHkKKyAgICAgICAgLy8gY29sbGVjdGVkLiBGSVhNRTogV2hlbiBjb21wb3NpdGluZywgd2Ug Y291bGQgc2tpcCB0aGlzIGRpcnR5aW5nIHBoYXNlLgorICAgICAgICBmb3IgKFJlbmRlckxheWVy KiBzYyA9IHN0YWNraW5nQ29udGV4dCgpOyBzYzsgc2MgPSBzYy0+c3RhY2tpbmdDb250ZXh0KCkp IHsKKyAgICAgICAgICAgIHNjLT5kaXJ0eVpPcmRlckxpc3RzKCk7CisgICAgICAgICAgICBpZiAo c2MtPmhhc1Zpc2libGVDb250ZW50KCkpCisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KICAgICB9CisKICAgICBpZiAocGFyZW50KCkpCi0gICAgICAgIHBhcmVudCgpLT5jaGlsZFZp c2liaWxpdHlDaGFuZ2VkKG1faGFzVmlzaWJsZUNvbnRlbnQpOworICAgICAgICBwYXJlbnQoKS0+ c2V0QW5jZXN0b3JDaGFpbkhhc1Zpc2libGVEZXNjZW5kYW50KCk7CiB9CiAKIHZvaWQgUmVuZGVy TGF5ZXI6OmRpcnR5VmlzaWJsZUNvbnRlbnRTdGF0dXMoKSAKIHsgCiAgICAgbV92aXNpYmxlQ29u dGVudFN0YXR1c0RpcnR5ID0gdHJ1ZTsgCiAgICAgaWYgKHBhcmVudCgpKQotICAgICAgICBwYXJl bnQoKS0+ZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpOworICAgICAgICBwYXJlbnQoKS0+ ZGlydHlBbmNlc3RvckNoYWluVmlzaWJsZURlc2NlbmRhbnRTdGF0dXMoKTsKIH0KIAotdm9pZCBS ZW5kZXJMYXllcjo6Y2hpbGRWaXNpYmlsaXR5Q2hhbmdlZChib29sIG5ld1Zpc2liaWxpdHkpIAot eyAKLSAgICBpZiAobV9oYXNWaXNpYmxlRGVzY2VuZGFudCA9PSBuZXdWaXNpYmlsaXR5IHx8IG1f dmlzaWJsZURlc2NlbmRhbnRTdGF0dXNEaXJ0eSkKLSAgICAgICAgcmV0dXJuOwotICAgIGlmIChu ZXdWaXNpYmlsaXR5KSB7Ci0gICAgICAgIFJlbmRlckxheWVyKiBsID0gdGhpczsKLSAgICAgICAg d2hpbGUgKGwgJiYgIWwtPm1fdmlzaWJsZURlc2NlbmRhbnRTdGF0dXNEaXJ0eSAmJiAhbC0+bV9o YXNWaXNpYmxlRGVzY2VuZGFudCkgewotICAgICAgICAgICAgbC0+bV9oYXNWaXNpYmxlRGVzY2Vu ZGFudCA9IHRydWU7Ci0gICAgICAgICAgICBsID0gbC0+cGFyZW50KCk7Ci0gICAgICAgIH0KLSAg ICB9IGVsc2UgCi0gICAgICAgIGRpcnR5VmlzaWJsZURlc2NlbmRhbnRTdGF0dXMoKTsKK3ZvaWQg UmVuZGVyTGF5ZXI6OmRpcnR5QW5jZXN0b3JDaGFpblZpc2libGVEZXNjZW5kYW50U3RhdHVzKCkK K3sKKyAgICBmb3IgKFJlbmRlckxheWVyKiBsYXllciA9IHRoaXM7IGxheWVyOyBsYXllciA9IGxh eWVyLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAobGF5ZXItPm1fdmlzaWJsZURlc2NlbmRhbnRT dGF0dXNEaXJ0eSkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGxheWVyLT5tX3Zpc2li bGVEZXNjZW5kYW50U3RhdHVzRGlydHkgPSB0cnVlOworICAgIH0KIH0KIAotdm9pZCBSZW5kZXJM YXllcjo6ZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpCit2b2lkIFJlbmRlckxheWVyOjpz ZXRBbmNlc3RvckNoYWluSGFzVmlzaWJsZURlc2NlbmRhbnQoKQogewotICAgIFJlbmRlckxheWVy KiBsID0gdGhpczsKLSAgICB3aGlsZSAobCAmJiAhbC0+bV92aXNpYmxlRGVzY2VuZGFudFN0YXR1 c0RpcnR5KSB7Ci0gICAgICAgIGwtPm1fdmlzaWJsZURlc2NlbmRhbnRTdGF0dXNEaXJ0eSA9IHRy dWU7Ci0gICAgICAgIGwgPSBsLT5wYXJlbnQoKTsKKyAgICBmb3IgKFJlbmRlckxheWVyKiBsYXll ciA9IHRoaXM7IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAo IWxheWVyLT5tX3Zpc2libGVEZXNjZW5kYW50U3RhdHVzRGlydHkgJiYgbGF5ZXItPmhhc1Zpc2li bGVEZXNjZW5kYW50KCkpCisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBsYXllci0+bV9o YXNWaXNpYmxlRGVzY2VuZGFudCA9IHRydWU7CisgICAgICAgIGxheWVyLT5tX3Zpc2libGVEZXNj ZW5kYW50U3RhdHVzRGlydHkgPSBmYWxzZTsKICAgICB9CiB9CiAKQEAgLTEyNzcsNyArMTI4MCw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmFkZENoaWxkKFJlbmRlckxheWVyKiBjaGlsZCwgUmVuZGVy TGF5ZXIqIGJlZm9yZUNoaWxkKQogCiAgICAgY2hpbGQtPnVwZGF0ZURlc2NlbmRhbnREZXBlbmRl bnRGbGFncygpOwogICAgIGlmIChjaGlsZC0+bV9oYXNWaXNpYmxlQ29udGVudCB8fCBjaGlsZC0+ bV9oYXNWaXNpYmxlRGVzY2VuZGFudCkKLSAgICAgICAgY2hpbGRWaXNpYmlsaXR5Q2hhbmdlZCh0 cnVlKTsKKyAgICAgICAgc2V0QW5jZXN0b3JDaGFpbkhhc1Zpc2libGVEZXNjZW5kYW50KCk7CiAK ICAgICBpZiAoY2hpbGQtPmlzU2VsZlBhaW50aW5nTGF5ZXIoKSB8fCBjaGlsZC0+aGFzU2VsZlBh aW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIHNldEFuY2VzdG9yQ2hhaW5IYXNTZWxm UGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKTsKQEAgLTEzMjAsNyArMTMyMyw3IEBAIFJlbmRlckxh eWVyKiBSZW5kZXJMYXllcjo6cmVtb3ZlQ2hpbGQoUmVuZGVyTGF5ZXIqIG9sZENoaWxkKQogICAg IAogICAgIG9sZENoaWxkLT51cGRhdGVEZXNjZW5kYW50RGVwZW5kZW50RmxhZ3MoKTsKICAgICBp ZiAob2xkQ2hpbGQtPm1faGFzVmlzaWJsZUNvbnRlbnQgfHwgb2xkQ2hpbGQtPm1faGFzVmlzaWJs ZURlc2NlbmRhbnQpCi0gICAgICAgIGNoaWxkVmlzaWJpbGl0eUNoYW5nZWQoZmFsc2UpOworICAg ICAgICBkaXJ0eUFuY2VzdG9yQ2hhaW5WaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpOwogCiAgICAg aWYgKG9sZENoaWxkLT5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwgb2xkQ2hpbGQtPmhhc1NlbGZQ YWludGluZ0xheWVyRGVzY2VuZGFudCgpKQogICAgICAgICBkaXJ0eUFuY2VzdG9yQ2hhaW5IYXNT ZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnRTdGF0dXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKaW5kZXggNWE1ZTI0NDZkNDUxMjk4OTVkZDA4ZmQzNDAyMTQ0MmQ0OGQz ZGZhOS4uMjhkN2U1NjI3Yzc3Y2YwODNkNGEyYzY1ZTgwZGExMmI5MTdkZTdlMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTQ0MSw3ICs0NDEsOCBAQCBwdWJsaWM6 CiAgICAgLy8gZGl0dG8gZm9yIGhhc1Zpc2libGVEZXNjZW5kYW50KCksIHNlZSBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEyNzcKICAgICBib29sIGhhc1Zpc2libGVD b250ZW50KCkgY29uc3QgeyByZXR1cm4gbV9oYXNWaXNpYmxlQ29udGVudDsgfQogICAgIGJvb2wg aGFzVmlzaWJsZURlc2NlbmRhbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc1Zpc2libGVEZXNjZW5k YW50OyB9Ci0gICAgdm9pZCBzZXRIYXNWaXNpYmxlQ29udGVudChib29sKTsKKworICAgIHZvaWQg c2V0SGFzVmlzaWJsZUNvbnRlbnQoKTsKICAgICB2b2lkIGRpcnR5VmlzaWJsZUNvbnRlbnRTdGF0 dXMoKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgQVNTRVJUKCFtX2hhc1NlbGZQYWludGlu Z0xheWVyRGVzY2VuZGFudERpcnR5KTsgaGVyZSBidXQgd2UgaGl0IHRoZSBzYW1lIGJ1Z3MgYXMg dmlzaWJsZSBjb250ZW50IGFib3ZlLgpAQCAtNzgyLDggKzc4Myw4IEBAIHByaXZhdGU6CiAgICAg CiAgICAgdm9pZCB1cGRhdGVTY3JvbGxhYmxlQXJlYVNldChib29sIGhhc092ZXJmbG93KTsKIAot ICAgIHZvaWQgY2hpbGRWaXNpYmlsaXR5Q2hhbmdlZChib29sIG5ld1Zpc2liaWxpdHkpOwotICAg IHZvaWQgZGlydHlWaXNpYmxlRGVzY2VuZGFudFN0YXR1cygpOworICAgIHZvaWQgZGlydHlBbmNl c3RvckNoYWluVmlzaWJsZURlc2NlbmRhbnRTdGF0dXMoKTsKKyAgICB2b2lkIHNldEFuY2VzdG9y Q2hhaW5IYXNWaXNpYmxlRGVzY2VuZGFudCgpOwogCiAgICAgdm9pZCB1cGRhdGVEZXNjZW5kYW50 RGVwZW5kZW50RmxhZ3MoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAppbmRleCA5MmRmZTI4MjFjZTI3YjA0ZmEyNDM2MWI3YzcxYjBlNDdlODA0ZjAyLi4xZWI4 N2YxNDZiYzdkOWRhM2ZiMWIwOWE4ODY5Y2QzYmI3MjM3OTM0IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMTc3Niw3ICsxNzc2LDcgQEAgdm9pZCBSZW5k ZXJPYmplY3Q6OnN0eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVu ZGVyU3R5bGUqIG5ld1MKICAgICAgICAgICAgIGlmIChtX3N0eWxlLT52aXNpYmlsaXR5KCkgIT0g bmV3U3R5bGUtPnZpc2liaWxpdHkoKSkgewogICAgICAgICAgICAgICAgIGlmIChSZW5kZXJMYXll ciogbCA9IGVuY2xvc2luZ0xheWVyKCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKG5ld1N0 eWxlLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGwt PnNldEhhc1Zpc2libGVDb250ZW50KHRydWUpOworICAgICAgICAgICAgICAgICAgICAgICAgbC0+ c2V0SGFzVmlzaWJsZUNvbnRlbnQoKTsKICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAobC0+ aGFzVmlzaWJsZUNvbnRlbnQoKSAmJiAodGhpcyA9PSBsLT5yZW5kZXJlcigpIHx8IGwtPnJlbmRl cmVyKCktPnN0eWxlKCktPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxFKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgbC0+ZGlydHlWaXNpYmxlQ29udGVudFN0YXR1cygpOwogICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKGRpZmYgPiBTdHlsZURpZmZlcmVuY2VSZXBhaW50TGF5ZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0Q2hpbGRMaXN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCmlu ZGV4IGYwY2Y2YWZmOGU3NWM1OWY2ZmZjNTExYTU1ZjA1NmRiNjViNDkzOWMuLmY1NDUyOTdkOTlk OGRhMjdjZjc0YjMyMzMxMmQ2NWVmYzhlMmY5MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCkBAIC0xOTQsNyArMTk0LDcgQEAg dm9pZCBSZW5kZXJPYmplY3RDaGlsZExpc3Q6OmFwcGVuZENoaWxkTm9kZShSZW5kZXJPYmplY3Qq IG93bmVyLCBSZW5kZXJPYmplY3QqIG4KICAgICAgICAgICAgIGlmICghbGF5ZXIpCiAgICAgICAg ICAgICAgICAgbGF5ZXIgPSBvd25lci0+ZW5jbG9zaW5nTGF5ZXIoKTsKICAgICAgICAgICAgIGlm IChsYXllcikKLSAgICAgICAgICAgICAgICBsYXllci0+c2V0SGFzVmlzaWJsZUNvbnRlbnQodHJ1 ZSk7CisgICAgICAgICAgICAgICAgbGF5ZXItPnNldEhhc1Zpc2libGVDb250ZW50KCk7CiAgICAg ICAgIH0KIAogICAgICAgICBpZiAobmV3Q2hpbGQtPmlzTGlzdEl0ZW0oKSkKQEAgLTI2MSw3ICsy NjEsNyBAQCB2b2lkIFJlbmRlck9iamVjdENoaWxkTGlzdDo6aW5zZXJ0Q2hpbGROb2RlKFJlbmRl ck9iamVjdCogb3duZXIsIFJlbmRlck9iamVjdCogYwogICAgICAgICAgICAgaWYgKCFsYXllcikK ICAgICAgICAgICAgICAgICBsYXllciA9IG93bmVyLT5lbmNsb3NpbmdMYXllcigpOwogICAgICAg ICAgICAgaWYgKGxheWVyKQotICAgICAgICAgICAgICAgIGxheWVyLT5zZXRIYXNWaXNpYmxlQ29u dGVudCh0cnVlKTsKKyAgICAgICAgICAgICAgICBsYXllci0+c2V0SGFzVmlzaWJsZUNvbnRlbnQo KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChjaGlsZC0+aXNMaXN0SXRlbSgpKQo=