116236 2013-05-16 11:24:54 -0700 [css exclusions] Clean up ExclusionShapeInsideInfo dynamic removal code 2013-06-07 14:50:01 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111029 89256 116187 1 betravis betravis commit-queue esprehn+autocc glenn oldest_to_newest 889920 0 betravis 2013-05-16 11:24:54 -0700 Bug 111029 introduced some code that can be cleaned up. The cleanest way to do this is probably to keep ExclusionShapeInsideInfo in sync with the style info, and mark all descendants with inline content for layout. 889929 1 201977 betravis 2013-05-16 11:38:42 -0700 Created attachment 201977 Proposed Patch 895113 2 203252 betravis 2013-05-29 11:49:39 -0700 Created attachment 203252 Updated patch 897551 3 203252 hyatt 2013-06-05 14:18:12 -0700 Comment on attachment 203252 Updated patch r=me 897555 4 203252 commit-queue 2013-06-05 14:25:28 -0700 Comment on attachment 203252 Updated patch Clearing flags on attachment: 203252 Committed r151237: <http://trac.webkit.org/changeset/151237> 897556 5 commit-queue 2013-06-05 14:25:30 -0700 All reviewed patches have been landed. Closing bug. 201977 2013-05-16 11:38:42 -0700 2013-05-29 11:49:37 -0700 Proposed Patch bug-116236-20130516113737.patch text/plain 10965 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDcyM2ExMGE1M2M4YjVl NDY3MzJmY2QxZDgzZmZiYmU5N2Q0MDkyNC4uODBlZjliN2M2NjBhZmYxNjdmZGUwOGUyNDc2NDJl NDNkMjhiN2FhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTE2ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbY3NzIGV4Y2x1c2lvbnNd IENsZWFuIHVwIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyBkeW5hbWljIHJlbW92YWwgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MjM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBv ZiBrZWVwaW5nIHRoZSBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8gYXJvdW5kIGFmdGVyIGl0IGhh cworICAgICAgICBiZWNvbWUgc3RhbGUsIHdlIGNhbiBpbW1lZGlhdGVseSByZW1vdmUgaXQgYW5k IGp1c3QgbWFyayBkZXNjZW5kYW50cworICAgICAgICBmb3IgcmVsYXlvdXQuIFRoaXMgcGF0Y2gg cmVtb3ZlcyBtb3N0IG9mIHRoZSBjb2RlIGFkZGVkIGJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEwMjkKKyAgICAgICAgSW4gZmF2b3Igb2YgYSBz aW1wbGVyIG1lY2hhbmlzbS4KKworICAgICAgICBUaGlzIHBhdGNoIGRvZXMgbm90IGludHJvZHVj ZSBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9FeGNsdXNpb25TaGFw ZUluc2lkZUluZm8uaDoKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m bzo6RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAgKEV4Y2x1c2lvblNoYXBlSW5z aWRlSW5mbyk6IFJlbW92ZSBuZWVkc1JlbW92YWwgY29kZS4KKyAgICAgICAgKiByZW5kZXJpbmcv TGF5b3V0U3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OkxheW91dFN0 YXRlKTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjp1cGRhdGVFeGNsdXNpb25TaGFwZUluc2lkZUluZm9B ZnRlclN0eWxlQ2hhbmdlKTogUmVtb3ZlCisgICAgICAgIG5lZWRzUmVtb3ZhbCBjb2RlIGFuZCBt YXJrIGRlc2NlbmRhbnRzIGZvciBsYXlvdXQuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjptYXJrU2hhcGVJbnNpZGVEZXNjZW5kYW50c0ZvckxheW91 dCk6IE1ldGhvZCB0byBtYXJrCisgICAgICAgIGRlc2NlbmRhbnRzIG9mIGEgc2hhcGUgaW5zaWRl IHdpdGggaW5saW5lIGNvbnRlbnQgZm9yIGxheW91dC4KKyAgICAgICAgKFdlYkNvcmU6OmV4Y2x1 c2lvbkluZm9SZXF1aXJlc1JlbGF5b3V0KTogUmVtb3ZlIG5lZWRzUmVtb3ZhbCBjb2RlLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNpb25zQWZ0 ZXJDaGlsZExheW91dCk6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5o OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m byk6IERpdHRvLgorICAgICAgICAoUmVuZGVyQmxvY2spOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmxheW91dEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyk6IERpdHRvLgorCiAyMDEzLTA1LTE0ICBN YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBB ZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcgV2ViQ29yZSB0byB0aGUgY21ha2UgYnVpbGQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8u aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uaApp bmRleCBhYzM5NzYxYWI0OWY1ZWVmMTMyZGM0YjllYzY1YjdhYTcwYzg3NDcyLi5hYWM2N2JmNTY4 ZTMzNGQ2ZTliZWQwNGNlZGM1ZTZhMDg0ZWZkMTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5oCkBAIC03MCw3ICs3MCw2IEBA IHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBjb21wdXRlU2VnbWVudHNGb3JMaW5lKExheW91 dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KSBPVkVSUklERQogICAgIHsKLSAg ICAgICAgQVNTRVJUKCFuZWVkc1JlbW92YWwoKSk7CiAgICAgICAgIG1fc2VnbWVudFJhbmdlcy5j bGVhcigpOwogICAgICAgICByZXR1cm4gRXhjbHVzaW9uU2hhcGVJbmZvPFJlbmRlckJsb2NrLCAm UmVuZGVyU3R5bGU6OnJlc29sdmVkU2hhcGVJbnNpZGUsICZFeGNsdXNpb25TaGFwZTo6Z2V0SW5j bHVkZWRJbnRlcnZhbHM+Ojpjb21wdXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AsIGxpbmVIZWln aHQpOwogICAgIH0KQEAgLTk4LDkgKzk3LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TmVlZHNM YXlvdXQoYm9vbCB2YWx1ZSkgeyBtX25lZWRzTGF5b3V0ID0gdmFsdWU7IH0KICAgICBib29sIG5l ZWRzTGF5b3V0KCkgeyByZXR1cm4gbV9uZWVkc0xheW91dDsgfQogCi0gICAgdm9pZCBzZXROZWVk c1JlbW92YWwoYm9vbCB2YWx1ZSkgeyBtX25lZWRzUmVtb3ZhbCA9IHZhbHVlOyB9Ci0gICAgYm9v bCBuZWVkc1JlbW92YWwoKSB7IHJldHVybiBtX25lZWRzUmVtb3ZhbDsgfQotCiBwcm90ZWN0ZWQ6 CiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IGNvbXB1dGVkU2hhcGVMb2dpY2FsQm91bmRpbmdCb3go KSBjb25zdCBPVkVSUklERSB7IHJldHVybiBjb21wdXRlZFNoYXBlKCktPnNoYXBlUGFkZGluZ0xv Z2ljYWxCb3VuZGluZ0JveCgpOyB9CiAKQEAgLTEwOCwxMiArMTA0LDEwIEBAIHByaXZhdGU6CiAg ICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKGNvbnN0IFJlbmRlckJsb2NrKiByZW5kZXJlcikK ICAgICA6IEV4Y2x1c2lvblNoYXBlSW5mbzxSZW5kZXJCbG9jaywgJlJlbmRlclN0eWxlOjpyZXNv bHZlZFNoYXBlSW5zaWRlLCAmRXhjbHVzaW9uU2hhcGU6OmdldEluY2x1ZGVkSW50ZXJ2YWxzPiAo cmVuZGVyZXIpCiAgICAgLCBtX25lZWRzTGF5b3V0KGZhbHNlKQotICAgICwgbV9uZWVkc1JlbW92 YWwoZmFsc2UpCiAgICAgeyB9CiAKICAgICBTZWdtZW50UmFuZ2VMaXN0IG1fc2VnbWVudFJhbmdl czsKICAgICBib29sIG1fbmVlZHNMYXlvdXQ6MTsKLSAgICBib29sIG1fbmVlZHNSZW1vdmFsOjE7 CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3Rh dGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcAppbmRleCA3 MjVlZGE4ZmNmZDNiMWE5MTMzZDViN2YzNWQ0YzA2NjYyZjM3ZGM2Li45YzQxNzYwN2U2MDlhMDY5 NWU4NTQwZTBkY2U4NGI4YmRhMGIzYTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvTGF5b3V0U3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlv dXRTdGF0ZS5jcHAKQEAgLTExMywxNSArMTEzLDkgQEAgTGF5b3V0U3RhdGU6OkxheW91dFN0YXRl KExheW91dFN0YXRlKiBwcmV2LCBSZW5kZXJCb3gqIHJlbmRlcmVyLCBjb25zdCBMYXlvdXRTaXoK ICNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCiAgICAgaWYgKHJlbmRlcmVyLT5pc1JlbmRlckJs b2NrKCkpIHsKICAgICAgICAgY29uc3QgUmVuZGVyQmxvY2sqIHJlbmRlckJsb2NrID0gdG9SZW5k ZXJCbG9jayhyZW5kZXJlcik7Ci0gICAgICAgIG1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvID0g cmVuZGVyQmxvY2stPmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyhSZW5kZXJCbG9jazo6U2hhcGVQ cmVzZW50T3JSZW1vdmVkKTsKLSAgICAgICAgaWYgKG1fbmV4dC0+bV9leGNsdXNpb25TaGFwZUlu c2lkZUluZm8gJiYgcmVuZGVyQmxvY2stPmFsbG93c0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb1No YXJpbmcoKSkgewotICAgICAgICAgICAgaWYgKCFtX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbykK LSAgICAgICAgICAgICAgICBtX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyA9IG1fbmV4dC0+bV9l eGNsdXNpb25TaGFwZUluc2lkZUluZm87Ci0gICAgICAgICAgICBlbHNlIGlmIChtX2V4Y2x1c2lv blNoYXBlSW5zaWRlSW5mby0+bmVlZHNSZW1vdmFsKCkpIHsKLSAgICAgICAgICAgICAgICBtX2V4 Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyA9IG1fbmV4dC0+bV9leGNsdXNpb25TaGFwZUluc2lkZUlu Zm87Ci0gICAgICAgICAgICAgICAgbV9leGNsdXNpb25TaGFwZUluc2lkZUluZm8tPnNldE5lZWRz TGF5b3V0KHRydWUpOwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIG1fZXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvID0gcmVuZGVyQmxvY2stPmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m bygpOworICAgICAgICBpZiAoIW1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvICYmIG1fbmV4dC0+ bV9leGNsdXNpb25TaGFwZUluc2lkZUluZm8gJiYgcmVuZGVyQmxvY2stPmFsbG93c0V4Y2x1c2lv blNoYXBlSW5zaWRlSW5mb1NoYXJpbmcoKSkKKyAgICAgICAgICAgIG1fZXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvID0gbV9uZXh0LT5tX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzsKICAgICB9CiAj ZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMDM1 NDJmY2RhZDYzMmJhYzQ3M2I1YjVhMDFiNmQwZjY5OTQyMzY3Yi4uYzU2Mzk5Njc3NWUzYzMxZDM0 ZTE4NWJkZGNkMzdlNmMyZTIzZTY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCkBAIC0xNDQ2LDEzICsxNDQ2LDI5IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0 ZUV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0FmdGVyU3R5bGVDaGFuZ2UoY29uc3QgRXhjbHVzaW9u CiAgICAgaWYgKHNoYXBlSW5zaWRlID09IG9sZFNoYXBlSW5zaWRlKQogICAgICAgICByZXR1cm47 CiAKLSAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m bzsKICAgICBpZiAoc2hhcGVJbnNpZGUpIHsKLSAgICAgICAgZXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvID0gZW5zdXJlRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCk7CisgICAgICAgIEV4Y2x1c2lv blNoYXBlSW5zaWRlSW5mbyogZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvID0gZW5zdXJlRXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvKCk7CiAgICAgICAgIGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby0+ ZGlydHlTaGFwZVNpemUoKTsKLSAgICAgICAgZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLT5zZXRO ZWVkc1JlbW92YWwoZmFsc2UpOwotICAgIH0gZWxzZSBpZiAoKGV4Y2x1c2lvblNoYXBlSW5zaWRl SW5mbyA9IHRoaXMtPmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyhTaGFwZVByZXNlbnRPclJlbW92 ZWQpKSkKLSAgICAgICAgZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLT5zZXROZWVkc1JlbW92YWwo dHJ1ZSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc2V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv KG51bGxwdHIpOworICAgICAgICBtYXJrU2hhcGVJbnNpZGVEZXNjZW5kYW50c0ZvckxheW91dCgp OworICAgIH0KK30KKwordm9pZCBSZW5kZXJCbG9jazo6bWFya1NoYXBlSW5zaWRlRGVzY2VuZGFu dHNGb3JMYXlvdXQoKQoreworICAgIGlmICghZXZlckhhZExheW91dCgpKQorICAgICAgICByZXR1 cm47CisgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpIHsKKyAgICAgICAgc2V0TmVlZHNMYXlvdXQo dHJ1ZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgZm9yIChSZW5kZXJPYmplY3QqIGNo aWxkID0gZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkg eworICAgICAgICBpZiAoIWNoaWxkLT5pc1JlbmRlckJsb2NrKCkpCisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgUmVuZGVyQmxvY2sqIGNoaWxkQmxvY2sgPSB0b1JlbmRlckJsb2NrKGNo aWxkKTsKKyAgICAgICAgY2hpbGRCbG9jay0+bWFya1NoYXBlSW5zaWRlRGVzY2VuZGFudHNGb3JM YXlvdXQoKTsKKyAgICB9CiB9CiAjZW5kaWYKIApAQCAtMTQ2MSwxMSArMTQ3NywxMSBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgZXhjbHVzaW9uSW5mb1JlcXVpcmVzUmVsYXlvdXQoY29uc3QgUmVuZGVy QmxvY2sqIGJsb2NrKQogI2lmICFFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCiAgICAgcmV0dXJuIGZh bHNlOwogI2Vsc2UKLSAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGluZm8gPSBibG9jay0+ ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKFJlbmRlckJsb2NrOjpTaGFwZVByZXNlbnRPclJlbW92 ZWQpOworICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogaW5mbyA9IGJsb2NrLT5leGNsdXNp b25TaGFwZUluc2lkZUluZm8oKTsKICAgICBpZiAoaW5mbykKLSAgICAgICAgaW5mby0+c2V0TmVl ZHNMYXlvdXQoaW5mby0+c2hhcGVTaXplRGlydHkoKSB8fCBpbmZvLT5uZWVkc1JlbW92YWwoKSk7 CisgICAgICAgIGluZm8tPnNldE5lZWRzTGF5b3V0KGluZm8tPnNoYXBlU2l6ZURpcnR5KCkpOwog ICAgIGVsc2UKLSAgICAgICAgaW5mbyA9IGJsb2NrLT5sYXlvdXRFeGNsdXNpb25TaGFwZUluc2lk ZUluZm8oUmVuZGVyQmxvY2s6OlNoYXBlUHJlc2VudE9yUmVtb3ZlZCk7CisgICAgICAgIGluZm8g PSBibG9jay0+bGF5b3V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCk7CiAgICAgcmV0dXJuIGlu Zm8gJiYgaW5mby0+bmVlZHNMYXlvdXQoKTsKICNlbmRpZgogfQpAQCAtMTUxNSwxMCArMTUzMSw2 IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVFeGNsdXNpb25TaGFwZVNpemUoKQogdm9pZCBS ZW5kZXJCbG9jazo6dXBkYXRlUmVnaW9uc0FuZEV4Y2x1c2lvbnNBZnRlckNoaWxkTGF5b3V0KFJl bmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQsIGJvb2wgaGVpZ2h0Q2hhbmdlZCkKIHsKICNpZiBF TkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCi0gICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBleGNs dXNpb25TaGFwZUluc2lkZUluZm8gPSB0aGlzLT5leGNsdXNpb25TaGFwZUluc2lkZUluZm8oU2hh cGVQcmVzZW50T3JSZW1vdmVkKTsKLSAgICBpZiAoZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvICYm IGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby0+bmVlZHNSZW1vdmFsKCkpCi0gICAgICAgIHNldEV4 Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyhudWxscHRyKTsKLQogICAgIC8vIEEgcHJldmlvdXMgc2li bGluZyBoYXMgY2hhbmdlZCBkaW1lbnNpb24sIHNvIHdlIG5lZWQgdG8gcmVsYXlvdXQgdGhlIHNo YXBlIHdpdGggdGhlIGNvbnRlbnQKICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIHNoYXBl SW5zaWRlSW5mbyA9IGxheW91dEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpOwogICAgIGlmICho ZWlnaHRDaGFuZ2VkICYmIHNoYXBlSW5zaWRlSW5mbykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmgKaW5kZXggMzdkOGE5Y2QwN2I5ODBlNDQzMmI0YWUwODM3YWMxYzU4MTRiMWFi ZC4uZTg1ZDg1NjgwZmRiOTE3Nzg1YmVlMzllMTliMGE5ZmRhNDVkOWM5MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTQ1NSwxMiArNDU1LDExIEBAIHB1YmxpYzoK ICAgICAgICAgcmV0dXJuIG1fcmFyZURhdGEtPm1fc2hhcGVJbnNpZGVJbmZvLmdldCgpOwogICAg IH0KIAotICAgIGVudW0gRXhjbHVzaW9uU2hhcGVTdGF0dXMgeyBTaGFwZVByZXNlbnQsIFNoYXBl UHJlc2VudE9yUmVtb3ZlZCB9OwotICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogZXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvKEV4Y2x1c2lvblNoYXBlU3RhdHVzIGV4Y2x1c2lvblNoYXBlU3Rh dHVzID0gU2hhcGVQcmVzZW50KSBjb25zdAorICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyog ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCkgY29uc3QKICAgICB7CiAgICAgICAgIGlmICghbV9y YXJlRGF0YSB8fCAhbV9yYXJlRGF0YS0+bV9zaGFwZUluc2lkZUluZm8pCiAgICAgICAgICAgICBy ZXR1cm4gMDsKLSAgICAgICAgcmV0dXJuIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6aXNFbmFi bGVkRm9yKHRoaXMpIHx8IChleGNsdXNpb25TaGFwZVN0YXR1cyA9PSBTaGFwZVByZXNlbnRPclJl bW92ZWQpID8gbV9yYXJlRGF0YS0+bV9zaGFwZUluc2lkZUluZm8uZ2V0KCkgOiAwOworICAgICAg ICByZXR1cm4gRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvOjppc0VuYWJsZWRGb3IodGhpcykgPyBt X3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mby5nZXQoKSA6IDA7CiAgICAgfQogICAgIHZvaWQg c2V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKFBhc3NPd25QdHI8RXhjbHVzaW9uU2hhcGVJbnNp ZGVJbmZvPiB2YWx1ZSkKICAgICB7CkBAIC00NjgsNyArNDY3LDggQEAgcHVibGljOgogICAgICAg ICAgICAgbV9yYXJlRGF0YSA9IGFkb3B0UHRyKG5ldyBSZW5kZXJCbG9ja1JhcmVEYXRhKHRoaXMp KTsKICAgICAgICAgbV9yYXJlRGF0YS0+bV9zaGFwZUluc2lkZUluZm8gPSB2YWx1ZTsKICAgICB9 Ci0gICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBsYXlvdXRFeGNsdXNpb25TaGFwZUluc2lk ZUluZm8oRXhjbHVzaW9uU2hhcGVTdGF0dXMgPSBTaGFwZVByZXNlbnQpIGNvbnN0OworICAgIHZv aWQgbWFya1NoYXBlSW5zaWRlRGVzY2VuZGFudHNGb3JMYXlvdXQoKTsKKyAgICBFeGNsdXNpb25T aGFwZUluc2lkZUluZm8qIGxheW91dEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpIGNvbnN0Owog ICAgIGJvb2wgYWxsb3dzRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvU2hhcmluZygpIGNvbnN0IHsg cmV0dXJuICFpc0lubGluZSgpICYmICFpc0Zsb2F0aW5nKCk7IH0KICNlbmRpZgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4 IDllMDI2ZTk1NWM3NTE1ODBlNGZmMzE2MGRlYWRjZDI2MjNjYjkxMzcuLjI1OGY5NGRhNWUzNGUx NzRmOWE0MmY2YzkxNWRkOTlmMTUwMTUxNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC03NywxMSArNzcsOSBAQCBzdGF0 aWMgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Rm9yTGluZShjb25zdCBSZW5kZXJCbG9jayogYmxv Y2ssIGJvb2wgaXNGaXJzdExpbgogfQogCiAjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQotRXhj bHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBSZW5kZXJCbG9jazo6bGF5b3V0RXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvKEV4Y2x1c2lvblNoYXBlU3RhdHVzIGV4Y2x1c2lvblNoYXBlU3RhdHVzKSBjb25z dAorRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBSZW5kZXJCbG9jazo6bGF5b3V0RXhjbHVzaW9u U2hhcGVJbnNpZGVJbmZvKCkgY29uc3QKIHsKICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8q IHNoYXBlSW5zaWRlSW5mbyA9IHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+ZXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvKCk7Ci0gICAgaWYgKHNoYXBlSW5zaWRlSW5mbyAmJiBzaGFwZUluc2lkZUluZm8t Pm5lZWRzUmVtb3ZhbCgpICYmIGV4Y2x1c2lvblNoYXBlU3RhdHVzID09IFNoYXBlUHJlc2VudCkK LSAgICAgICAgc2hhcGVJbnNpZGVJbmZvID0gMDsKIAogICAgIGlmICghc2hhcGVJbnNpZGVJbmZv ICYmIGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSAmJiBhbGxvd3NFeGNsdXNpb25TaGFwZUlu c2lkZUluZm9TaGFyaW5nKCkpIHsKICAgICAgICAgLy8gcmVnaW9uQXRCbG9ja09mZnNldCByZXR1 cm5zIHJlZ2lvbnMgbGlrZSBhbiBhcnJheSBmaXJzdD17MCxOLTF9LCBzZWNvbmQ9e04sTS0xfSwg Li4uCkBAIC04OSw3ICs4Nyw2IEBAIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogUmVuZGVyQmxv Y2s6OmxheW91dEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyhFeGNsdXNpb25TCiAgICAgICAgIFJl bmRlclJlZ2lvbiogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldChvZmZzZXQpOwogICAgICAg ICBpZiAocmVnaW9uKQogICAgICAgICAgICAgc2hhcGVJbnNpZGVJbmZvID0gcmVnaW9uLT5leGNs dXNpb25TaGFwZUluc2lkZUluZm8oKTsKLSAgICAgICAgcmV0dXJuIHNoYXBlSW5zaWRlSW5mbyAm JiBzaGFwZUluc2lkZUluZm8tPm5lZWRzUmVtb3ZhbCgpICYmIGV4Y2x1c2lvblNoYXBlU3RhdHVz ID09IFNoYXBlUHJlc2VudCA/IDAgOiBzaGFwZUluc2lkZUluZm87CiAgICAgfQogCiAgICAgcmV0 dXJuIHNoYXBlSW5zaWRlSW5mbzsK 203252 2013-05-29 11:49:39 -0700 2013-06-05 14:25:28 -0700 Updated patch bug-116236-20130529114817.patch text/plain 10970 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ5MzI3ZGIzMWMwY2Vl M2JjMzI2MjI2OWRlZDA2NmVmZTQ0NWRiYS4uYzAxYTJkOGNlOTc3Zjg2MDJiMmQ0ZWIzZTY0N2U0 YmMxYjc5MzdlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTI5ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbY3NzIGV4Y2x1c2lvbnNd IENsZWFuIHVwIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyBkeW5hbWljIHJlbW92YWwgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MjM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBv ZiBrZWVwaW5nIHRoZSBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8gYXJvdW5kIGFmdGVyIGl0IGhh cworICAgICAgICBiZWNvbWUgc3RhbGUsIHdlIGNhbiBpbW1lZGlhdGVseSByZW1vdmUgaXQgYW5k IGp1c3QgbWFyayBkZXNjZW5kYW50cworICAgICAgICBmb3IgcmVsYXlvdXQuIFRoaXMgcGF0Y2gg cmVtb3ZlcyBtb3N0IG9mIHRoZSBjb2RlIGFkZGVkIGJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEwMjkKKyAgICAgICAgaW4gZmF2b3Igb2YgdGhp cyBzaW1wbGVyIGFwcHJvYWNoLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lcyBub3QgaW50cm9k dWNlIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL0V4Y2x1c2lvblNo YXBlSW5zaWRlSW5mby5oOgorICAgICAgICAoV2ViQ29yZTo6RXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvOjpFeGNsdXNpb25TaGFwZUluc2lkZUluZm8pOgorICAgICAgICAoRXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvKTogUmVtb3ZlIG5lZWRzUmVtb3ZhbCBjb2RlLgorICAgICAgICAqIHJlbmRlcmlu Zy9MYXlvdXRTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZTo6TGF5b3V0 U3RhdGUpOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZUV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m b0FmdGVyU3R5bGVDaGFuZ2UpOiBSZW1vdmUKKyAgICAgICAgbmVlZHNSZW1vdmFsIGNvZGUgYW5k IG1hcmsgZGVzY2VuZGFudHMgZm9yIGxheW91dC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Om1hcmtTaGFwZUluc2lkZURlc2NlbmRhbnRzRm9yTGF5 b3V0KTogTWV0aG9kIHRvIG1hcmsKKyAgICAgICAgZGVzY2VuZGFudHMgb2YgYSBzaGFwZSBpbnNp ZGUgd2l0aCBpbmxpbmUgY29udGVudCBmb3IgbGF5b3V0LgorICAgICAgICAoV2ViQ29yZTo6ZXhj bHVzaW9uSW5mb1JlcXVpcmVzUmVsYXlvdXQpOiBSZW1vdmUgbmVlZHNSZW1vdmFsIGNvZGUuCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6dXBkYXRlUmVnaW9uc0FuZEV4Y2x1c2lvbnNB ZnRlckNoaWxkTGF5b3V0KTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2Nr Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvKTogRGl0dG8uCisgICAgICAgIChSZW5kZXJCbG9jayk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bGF5b3V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKTogRGl0dG8uCisKIDIwMTMtMDUtMjgg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmVhdGUg YSBodG1sL2Zvcm1zIHN1YmRpcmVjdG9yeSBhbmQgbW92ZSBGaWxlSWNvbkxvYWRlciB0aGVyZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRl SW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5m by5oCmluZGV4IGFjMzk3NjFhYjQ5ZjVlZWYxMzJkYzRiOWVjNjViN2FhNzBjODc0NzIuLmFhYzY3 YmY1NjhlMzM0ZDZlOWJlZDA0Y2VkYzVlNmEwODRlZmQxNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZUluc2lkZUluZm8uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmgKQEAgLTcwLDcgKzcw LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGNvbXB1dGVTZWdtZW50c0ZvckxpbmUo TGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVIZWlnaHQpIE9WRVJSSURFCiAgICAg ewotICAgICAgICBBU1NFUlQoIW5lZWRzUmVtb3ZhbCgpKTsKICAgICAgICAgbV9zZWdtZW50UmFu Z2VzLmNsZWFyKCk7CiAgICAgICAgIHJldHVybiBFeGNsdXNpb25TaGFwZUluZm88UmVuZGVyQmxv Y2ssICZSZW5kZXJTdHlsZTo6cmVzb2x2ZWRTaGFwZUluc2lkZSwgJkV4Y2x1c2lvblNoYXBlOjpn ZXRJbmNsdWRlZEludGVydmFscz46OmNvbXB1dGVTZWdtZW50c0ZvckxpbmUobGluZVRvcCwgbGlu ZUhlaWdodCk7CiAgICAgfQpAQCAtOTgsOSArOTcsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRO ZWVkc0xheW91dChib29sIHZhbHVlKSB7IG1fbmVlZHNMYXlvdXQgPSB2YWx1ZTsgfQogICAgIGJv b2wgbmVlZHNMYXlvdXQoKSB7IHJldHVybiBtX25lZWRzTGF5b3V0OyB9CiAKLSAgICB2b2lkIHNl dE5lZWRzUmVtb3ZhbChib29sIHZhbHVlKSB7IG1fbmVlZHNSZW1vdmFsID0gdmFsdWU7IH0KLSAg ICBib29sIG5lZWRzUmVtb3ZhbCgpIHsgcmV0dXJuIG1fbmVlZHNSZW1vdmFsOyB9Ci0KIHByb3Rl Y3RlZDoKICAgICB2aXJ0dWFsIExheW91dFJlY3QgY29tcHV0ZWRTaGFwZUxvZ2ljYWxCb3VuZGlu Z0JveCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIGNvbXB1dGVkU2hhcGUoKS0+c2hhcGVQYWRk aW5nTG9naWNhbEJvdW5kaW5nQm94KCk7IH0KIApAQCAtMTA4LDEyICsxMDQsMTAgQEAgcHJpdmF0 ZToKICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8oY29uc3QgUmVuZGVyQmxvY2sqIHJlbmRl cmVyKQogICAgIDogRXhjbHVzaW9uU2hhcGVJbmZvPFJlbmRlckJsb2NrLCAmUmVuZGVyU3R5bGU6 OnJlc29sdmVkU2hhcGVJbnNpZGUsICZFeGNsdXNpb25TaGFwZTo6Z2V0SW5jbHVkZWRJbnRlcnZh bHM+IChyZW5kZXJlcikKICAgICAsIG1fbmVlZHNMYXlvdXQoZmFsc2UpCi0gICAgLCBtX25lZWRz UmVtb3ZhbChmYWxzZSkKICAgICB7IH0KIAogICAgIFNlZ21lbnRSYW5nZUxpc3QgbV9zZWdtZW50 UmFuZ2VzOwogICAgIGJvb2wgbV9uZWVkc0xheW91dDoxOwotICAgIGJvb2wgbV9uZWVkc1JlbW92 YWw6MTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlv dXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCmlu ZGV4IDcyNWVkYThmY2ZkM2IxYTkxMzNkNWI3ZjM1ZDRjMDY2NjJmMzdkYzYuLjljNDE3NjA3ZTYw OWEwNjk1ZTg1NDBlMGRjZTg0YjhiZGEwYjNhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xheW91dFN0YXRlLmNwcApAQCAtMTEzLDE1ICsxMTMsOSBAQCBMYXlvdXRTdGF0ZTo6TGF5b3V0 U3RhdGUoTGF5b3V0U3RhdGUqIHByZXYsIFJlbmRlckJveCogcmVuZGVyZXIsIGNvbnN0IExheW91 dFNpegogI2lmIEVOQUJMRShDU1NfRVhDTFVTSU9OUykKICAgICBpZiAocmVuZGVyZXItPmlzUmVu ZGVyQmxvY2soKSkgewogICAgICAgICBjb25zdCBSZW5kZXJCbG9jayogcmVuZGVyQmxvY2sgPSB0 b1JlbmRlckJsb2NrKHJlbmRlcmVyKTsKLSAgICAgICAgbV9leGNsdXNpb25TaGFwZUluc2lkZUlu Zm8gPSByZW5kZXJCbG9jay0+ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKFJlbmRlckJsb2NrOjpT aGFwZVByZXNlbnRPclJlbW92ZWQpOwotICAgICAgICBpZiAobV9uZXh0LT5tX2V4Y2x1c2lvblNo YXBlSW5zaWRlSW5mbyAmJiByZW5kZXJCbG9jay0+YWxsb3dzRXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvU2hhcmluZygpKSB7Ci0gICAgICAgICAgICBpZiAoIW1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvKQotICAgICAgICAgICAgICAgIG1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvID0gbV9uZXh0 LT5tX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzsKLSAgICAgICAgICAgIGVsc2UgaWYgKG1fZXhj bHVzaW9uU2hhcGVJbnNpZGVJbmZvLT5uZWVkc1JlbW92YWwoKSkgewotICAgICAgICAgICAgICAg IG1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvID0gbV9uZXh0LT5tX2V4Y2x1c2lvblNoYXBlSW5z aWRlSW5mbzsKLSAgICAgICAgICAgICAgICBtX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby0+c2V0 TmVlZHNMYXlvdXQodHJ1ZSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgbV9l eGNsdXNpb25TaGFwZUluc2lkZUluZm8gPSByZW5kZXJCbG9jay0+ZXhjbHVzaW9uU2hhcGVJbnNp ZGVJbmZvKCk7CisgICAgICAgIGlmICghbV9leGNsdXNpb25TaGFwZUluc2lkZUluZm8gJiYgbV9u ZXh0LT5tX2V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyAmJiByZW5kZXJCbG9jay0+YWxsb3dzRXhj bHVzaW9uU2hhcGVJbnNpZGVJbmZvU2hhcmluZygpKQorICAgICAgICAgICAgbV9leGNsdXNpb25T aGFwZUluc2lkZUluZm8gPSBtX25leHQtPm1fZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvOwogICAg IH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCBkZTE0MjZhOTFkZGJlZDkxZDQ5N2U4NWRkOGZkZDdkNTA2ZTFlY2JmLi5jYWIxZmM3YWI2Yzc4 NzlhNmMwZWEyMzk1OTRjMjRhNDlhZTM0ODMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKQEAgLTE0NDYsMTMgKzE0NDYsMjkgQEAgdm9pZCBSZW5kZXJCbG9jazo6 dXBkYXRlRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvQWZ0ZXJTdHlsZUNoYW5nZShjb25zdCBFeGNs dXNpb24KICAgICBpZiAoc2hhcGVJbnNpZGUgPT0gb2xkU2hhcGVJbnNpZGUpCiAgICAgICAgIHJl dHVybjsKIAotICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogZXhjbHVzaW9uU2hhcGVJbnNp ZGVJbmZvOwogICAgIGlmIChzaGFwZUluc2lkZSkgewotICAgICAgICBleGNsdXNpb25TaGFwZUlu c2lkZUluZm8gPSBlbnN1cmVFeGNsdXNpb25TaGFwZUluc2lkZUluZm8oKTsKKyAgICAgICAgRXhj bHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBleGNsdXNpb25TaGFwZUluc2lkZUluZm8gPSBlbnN1cmVF eGNsdXNpb25TaGFwZUluc2lkZUluZm8oKTsKICAgICAgICAgZXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvLT5kaXJ0eVNoYXBlU2l6ZSgpOwotICAgICAgICBleGNsdXNpb25TaGFwZUluc2lkZUluZm8t PnNldE5lZWRzUmVtb3ZhbChmYWxzZSk7Ci0gICAgfSBlbHNlIGlmICgoZXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvID0gdGhpcy0+ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKFNoYXBlUHJlc2VudE9y UmVtb3ZlZCkpKQotICAgICAgICBleGNsdXNpb25TaGFwZUluc2lkZUluZm8tPnNldE5lZWRzUmVt b3ZhbCh0cnVlKTsKKyAgICB9IGVsc2UgeworICAgICAgICBzZXRFeGNsdXNpb25TaGFwZUluc2lk ZUluZm8obnVsbHB0cik7CisgICAgICAgIG1hcmtTaGFwZUluc2lkZURlc2NlbmRhbnRzRm9yTGF5 b3V0KCk7CisgICAgfQorfQorCit2b2lkIFJlbmRlckJsb2NrOjptYXJrU2hhcGVJbnNpZGVEZXNj ZW5kYW50c0ZvckxheW91dCgpCit7CisgICAgaWYgKCFldmVySGFkTGF5b3V0KCkpCisgICAgICAg IHJldHVybjsKKyAgICBpZiAoY2hpbGRyZW5JbmxpbmUoKSkgeworICAgICAgICBzZXROZWVkc0xh eW91dCh0cnVlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBmb3IgKFJlbmRlck9iamVj dCogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGlu ZygpKSB7CisgICAgICAgIGlmICghY2hpbGQtPmlzUmVuZGVyQmxvY2soKSkKKyAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICBSZW5kZXJCbG9jayogY2hpbGRCbG9jayA9IHRvUmVuZGVyQmxv Y2soY2hpbGQpOworICAgICAgICBjaGlsZEJsb2NrLT5tYXJrU2hhcGVJbnNpZGVEZXNjZW5kYW50 c0ZvckxheW91dCgpOworICAgIH0KIH0KICNlbmRpZgogCkBAIC0xNDYxLDExICsxNDc3LDExIEBA IHN0YXRpYyBpbmxpbmUgYm9vbCBleGNsdXNpb25JbmZvUmVxdWlyZXNSZWxheW91dChjb25zdCBS ZW5kZXJCbG9jayogYmxvY2spCiAjaWYgIUVOQUJMRShDU1NfRVhDTFVTSU9OUykKICAgICByZXR1 cm4gZmFsc2U7CiAjZWxzZQotICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyogaW5mbyA9IGJs b2NrLT5leGNsdXNpb25TaGFwZUluc2lkZUluZm8oUmVuZGVyQmxvY2s6OlNoYXBlUHJlc2VudE9y UmVtb3ZlZCk7CisgICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBpbmZvID0gYmxvY2stPmV4 Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpOwogICAgIGlmIChpbmZvKQotICAgICAgICBpbmZvLT5z ZXROZWVkc0xheW91dChpbmZvLT5zaGFwZVNpemVEaXJ0eSgpIHx8IGluZm8tPm5lZWRzUmVtb3Zh bCgpKTsKKyAgICAgICAgaW5mby0+c2V0TmVlZHNMYXlvdXQoaW5mby0+c2hhcGVTaXplRGlydHko KSk7CiAgICAgZWxzZQotICAgICAgICBpbmZvID0gYmxvY2stPmxheW91dEV4Y2x1c2lvblNoYXBl SW5zaWRlSW5mbyhSZW5kZXJCbG9jazo6U2hhcGVQcmVzZW50T3JSZW1vdmVkKTsKKyAgICAgICAg aW5mbyA9IGJsb2NrLT5sYXlvdXRFeGNsdXNpb25TaGFwZUluc2lkZUluZm8oKTsKICAgICByZXR1 cm4gaW5mbyAmJiBpbmZvLT5uZWVkc0xheW91dCgpOwogI2VuZGlmCiB9CkBAIC0xNTE1LDEwICsx NTMxLDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZUV4Y2x1c2lvblNoYXBlU2l6ZSgpCiB2 b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVSZWdpb25zQW5kRXhjbHVzaW9uc0FmdGVyQ2hpbGRMYXlv dXQoUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCwgYm9vbCBoZWlnaHRDaGFuZ2VkKQogewog I2lmIEVOQUJMRShDU1NfRVhDTFVTSU9OUykKLSAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8q IGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyA9IHRoaXMtPmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m byhTaGFwZVByZXNlbnRPclJlbW92ZWQpOwotICAgIGlmIChleGNsdXNpb25TaGFwZUluc2lkZUlu Zm8gJiYgZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLT5uZWVkc1JlbW92YWwoKSkKLSAgICAgICAg c2V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKG51bGxwdHIpOwotCiAgICAgLy8gQSBwcmV2aW91 cyBzaWJsaW5nIGhhcyBjaGFuZ2VkIGRpbWVuc2lvbiwgc28gd2UgbmVlZCB0byByZWxheW91dCB0 aGUgc2hhcGUgd2l0aCB0aGUgY29udGVudAogICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbyog c2hhcGVJbnNpZGVJbmZvID0gbGF5b3V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCk7CiAgICAg aWYgKGhlaWdodENoYW5nZWQgJiYgc2hhcGVJbnNpZGVJbmZvKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suaAppbmRleCA5ZmNlZGIxOWIxNTk4NDkxZjI2NzMwMjE0MDJhYjVjZDA5 NDJiYzM0Li5hMmRhNjFmNmQwMDNlMzQ5MTRhZjJhZTE2OTI1NTg2OGIxOTIzNDY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtNDUzLDEyICs0NTMsMTEgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gbV9yYXJlRGF0YS0+bV9zaGFwZUluc2lkZUluZm8uZ2V0KCk7 CiAgICAgfQogCi0gICAgZW51bSBFeGNsdXNpb25TaGFwZVN0YXR1cyB7IFNoYXBlUHJlc2VudCwg U2hhcGVQcmVzZW50T3JSZW1vdmVkIH07Ci0gICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBl eGNsdXNpb25TaGFwZUluc2lkZUluZm8oRXhjbHVzaW9uU2hhcGVTdGF0dXMgZXhjbHVzaW9uU2hh cGVTdGF0dXMgPSBTaGFwZVByZXNlbnQpIGNvbnN0CisgICAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvKiBleGNsdXNpb25TaGFwZUluc2lkZUluZm8oKSBjb25zdAogICAgIHsKICAgICAgICAgaWYg KCFtX3JhcmVEYXRhIHx8ICFtX3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mbykKICAgICAgICAg ICAgIHJldHVybiAwOwotICAgICAgICByZXR1cm4gRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvOjpp c0VuYWJsZWRGb3IodGhpcykgfHwgKGV4Y2x1c2lvblNoYXBlU3RhdHVzID09IFNoYXBlUHJlc2Vu dE9yUmVtb3ZlZCkgPyBtX3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mby5nZXQoKSA6IDA7Cisg ICAgICAgIHJldHVybiBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmlzRW5hYmxlZEZvcih0aGlz KSA/IG1fcmFyZURhdGEtPm1fc2hhcGVJbnNpZGVJbmZvLmdldCgpIDogMDsKICAgICB9CiAgICAg dm9pZCBzZXRFeGNsdXNpb25TaGFwZUluc2lkZUluZm8oUGFzc093blB0cjxFeGNsdXNpb25TaGFw ZUluc2lkZUluZm8+IHZhbHVlKQogICAgIHsKQEAgLTQ2Niw3ICs0NjUsOCBAQCBwdWJsaWM6CiAg ICAgICAgICAgICBtX3JhcmVEYXRhID0gYWRvcHRQdHIobmV3IFJlbmRlckJsb2NrUmFyZURhdGEo dGhpcykpOwogICAgICAgICBtX3JhcmVEYXRhLT5tX3NoYXBlSW5zaWRlSW5mbyA9IHZhbHVlOwog ICAgIH0KLSAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGxheW91dEV4Y2x1c2lvblNoYXBl SW5zaWRlSW5mbyhFeGNsdXNpb25TaGFwZVN0YXR1cyA9IFNoYXBlUHJlc2VudCkgY29uc3Q7Cisg ICAgdm9pZCBtYXJrU2hhcGVJbnNpZGVEZXNjZW5kYW50c0ZvckxheW91dCgpOworICAgIEV4Y2x1 c2lvblNoYXBlSW5zaWRlSW5mbyogbGF5b3V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCkgY29u c3Q7CiAgICAgYm9vbCBhbGxvd3NFeGNsdXNpb25TaGFwZUluc2lkZUluZm9TaGFyaW5nKCkgY29u c3QgeyByZXR1cm4gIWlzSW5saW5lKCkgJiYgIWlzRmxvYXRpbmcoKTsgfQogI2VuZGlmCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAK aW5kZXggZTE4NzE4YTgyODc0ZjUyODI1YTk0YWFmZmE3MGZkNDljMDgwY2E0Ny4uMjMzMDNjNjIz M2Y0OGE2NjAxMmYzMzljZDUwMmJmZWQ3OTU3NThjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAgLTc3LDExICs3Nyw5IEBA IHN0YXRpYyBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRGb3JMaW5lKGNvbnN0IFJlbmRlckJsb2Nr KiBibG9jaywgYm9vbCBpc0ZpcnN0TGluCiB9CiAKICNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMp Ci1FeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIFJlbmRlckJsb2NrOjpsYXlvdXRFeGNsdXNpb25T aGFwZUluc2lkZUluZm8oRXhjbHVzaW9uU2hhcGVTdGF0dXMgZXhjbHVzaW9uU2hhcGVTdGF0dXMp IGNvbnN0CitFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIFJlbmRlckJsb2NrOjpsYXlvdXRFeGNs dXNpb25TaGFwZUluc2lkZUluZm8oKSBjb25zdAogewogICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRl SW5mbyogc2hhcGVJbnNpZGVJbmZvID0gdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5leGNsdXNpb25T aGFwZUluc2lkZUluZm8oKTsKLSAgICBpZiAoc2hhcGVJbnNpZGVJbmZvICYmIHNoYXBlSW5zaWRl SW5mby0+bmVlZHNSZW1vdmFsKCkgJiYgZXhjbHVzaW9uU2hhcGVTdGF0dXMgPT0gU2hhcGVQcmVz ZW50KQotICAgICAgICBzaGFwZUluc2lkZUluZm8gPSAwOwogCiAgICAgaWYgKCFzaGFwZUluc2lk ZUluZm8gJiYgZmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpICYmIGFsbG93c0V4Y2x1c2lvblNo YXBlSW5zaWRlSW5mb1NoYXJpbmcoKSkgewogICAgICAgICAvLyByZWdpb25BdEJsb2NrT2Zmc2V0 IHJldHVybnMgcmVnaW9ucyBsaWtlIGFuIGFycmF5IGZpcnN0PXswLE4tMX0sIHNlY29uZD17TixN LTF9LCAuLi4KQEAgLTg5LDcgKzg3LDYgQEAgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKiBSZW5k ZXJCbG9jazo6bGF5b3V0RXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKEV4Y2x1c2lvblMKICAgICAg ICAgUmVuZGVyUmVnaW9uKiByZWdpb24gPSByZWdpb25BdEJsb2NrT2Zmc2V0KG9mZnNldCk7CiAg ICAgICAgIGlmIChyZWdpb24pCiAgICAgICAgICAgICBzaGFwZUluc2lkZUluZm8gPSByZWdpb24t PmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpOwotICAgICAgICByZXR1cm4gc2hhcGVJbnNpZGVJ bmZvICYmIHNoYXBlSW5zaWRlSW5mby0+bmVlZHNSZW1vdmFsKCkgJiYgZXhjbHVzaW9uU2hhcGVT dGF0dXMgPT0gU2hhcGVQcmVzZW50ID8gMCA6IHNoYXBlSW5zaWRlSW5mbzsKICAgICB9CiAKICAg ICByZXR1cm4gc2hhcGVJbnNpZGVJbmZvOwo=