29755 2009-09-25 17:28:00 -0700 ASSERTION FAILED: !repaintContainer || repaintContainer == this 2009-09-30 11:02:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 150204 0 simon.fraser 2009-09-25 17:28:00 -0700 Certain configurations of hardware accelerated content hit this assertion in RenderView. It indicates that RenderObject::container() returned an object above repaintContainer in the hierarchy. It's triggered by compositing layers made for opacity fades in between position: absolute layers. 150205 1 simon.fraser 2009-09-25 17:28:25 -0700 <rdar://problem/7032254> 150212 2 40155 simon.fraser 2009-09-25 17:46:11 -0700 Created attachment 40155 Patch 150521 3 simon.fraser 2009-09-28 09:14:46 -0700 http://trac.webkit.org/changeset/48816 151054 4 simon.fraser 2009-09-29 14:26:42 -0700 This fix doesn't get all cases. 151105 5 simon.fraser 2009-09-29 16:59:51 -0700 *** Bug 28898 has been marked as a duplicate of this bug. *** 151107 6 40335 simon.fraser 2009-09-29 17:04:27 -0700 Created attachment 40335 Better fix 151132 7 40155 eric 2009-09-29 18:26:08 -0700 Comment on attachment 40155 Patch Obsoleting this patch that looks like it was already landed. 151296 8 simon.fraser 2009-09-30 11:02:01 -0700 http://trac.webkit.org/changeset/48932 40155 2009-09-25 17:46:11 -0700 2009-09-29 18:26:08 -0700 Patch 29755_patch.txt text/plain 12979 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNTQ5NWY4Li4xNjRlNzc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMDktMDkt MjUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogIXJl cGFpbnRDb250YWluZXIgfHwgcmVwYWludENvbnRhaW5lciA9PSB0aGlzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTc1NQorICAgICAgICAKKyAgICAg ICAgVGVzdGNhc2Ugd2l0aCBhbiBvcGFjaXR5LWZhZGluZyBlbGVtZW50IGJldHdlZW4gdHdvIGFi c29sdXRlbHkgcG9zaXRpb25lZCBlbGVtZW50cy4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3Jl cGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBs YXRmb3JtL21hYy9jb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZS1l eHBlY3RlZC5jaGVja3N1bTogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2NvbXBvc2l0 aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlLWV4cGVjdGVkLnBuZzogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3 ZWVuLWFic29sdXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisKKzIwMDktMDktMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCiAKICAgICAgICAgQ3Jhc2ggd2l0aCBoYXJkd2FyZSBhY2NlbGVyYXRlZCByb3Rh dGlvbiBvZiBhIFBERiBpbWFnZSBpbiBhIGRhdGEgVVJMCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZS5odG1sIGIvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMDAzM2NiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4t YWJzb2x1dGUuaHRtbApAQCAtMCwwICsxLDc0IEBACis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0v L1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIgorICAgImh0dHA6Ly93d3cudzMu b3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+CisKKzxodG1sIGxhbmc9ImVuIj4KKzxoZWFkPgorICA8 bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNl dD11dGYtOCI+CisgIDx0aXRsZT5PcGFjaXR5IGJldHdlZW4gYWJzb2x1dGVzPC90aXRsZT4KKyAg PHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KKyAgICAuY29udGFpbmVyIHsK KyAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICB3 aWR0aDogMjAwcHg7CisgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgIC13ZWJr aXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgLXdlYmtpdC10cmFuc2Zvcm0tc3R5 bGU6IHByZXNlcnZlLTNkOworICAgIH0KKworICAgIC5mYWRlciB7CisgICAgICBoZWlnaHQ6IDUw cHg7CisgICAgICB3aWR0aDogNTBweDsKKyAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgIGJvcmRl cjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgLXdlYmtpdC10cmFuc2l0aW9uOiBvcGFjaXR5IDEw MHM7CisgICAgfQorICAgIAorICAgIC5jb250YWluZXI6aG92ZXIgLmZhZGVyIHsKKyAgICAgIG9w YWNpdHk6IDAuNTsKKyAgICB9CisKKyAgICAuaW5uZXIgeworICAgICAgcG9zaXRpb246IGFic29s dXRlOworICAgICAgbGVmdDogMTAwcHg7CisgICAgICB0b3A6IDEwMHB4OworICAgICAgaGVpZ2h0 OiA4MHB4OworICAgICAgd2lkdGg6IDgwcHg7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5 OworICAgIH0KKyAgICAKKyAgICAuaW5uZXI6aG92ZXIgeworICAgICAgYmFja2dyb3VuZC1jb2xv cjogb3JhbmdlOworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKQorICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworCisgICAg ZnVuY3Rpb24gcnVuVGVzdCgpCisgICAgeworICAgICAgLy8gS2ljayBvZmYgYW4gb3BhY2l0eSBm YWRlIHRvIG1ha2UgLmZhZGVyIGludG8gYSBjb21wb3NpdGluZyBsYXllcgorICAgICAgdmFyIGNv bnRhaW5lciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5mYWRlcicpWzBdOworICAgICAg Y29udGFpbmVyLnN0eWxlLm9wYWNpdHkgPSAwLjk5OworICAgICAgd2luZG93LnNldFRpbWVvdXQo ZnVuY3Rpb24oKSB7CisgICAgICAgIC8vIE5vdyB0ZXN0IHJlZHJhdyBvbiAuaW5uZXIKKyAgICAg ICAgdmFyIGlubmVyID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmlubmVyJylbMF07Cisg ICAgICAgIGlubmVyLnN0eWxlLmJhY2tncm91bmRDb2xvciA9ICdncmVlbic7CisgICAgICAgIGlm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgfSwgMCk7CisgICAgfQorCisgICAgd2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBydW5UZXN0LCBmYWxzZSkKKyAgPC9zY3JpcHQ+Cis8L2hl YWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCBzaG91bGQgbm90IGFzc2VydCwgYW5kIHlvdSBzaG91 bGQgc2VlIGEgZnVsbHkgZ3JlZW4gc3F1YXJlLjwvcD4KKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+ CisgIDxkaXYgY2xhc3M9ImZhZGVyIj4KKyAgICA8ZGl2IGNsYXNzPSJpbm5lciI+CisgICAgPC9k aXY+CisgIDwvZGl2PgorPC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9jb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vl bi1hYnNvbHV0ZS1leHBlY3RlZC5jaGVja3N1bSBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9j b21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZS1leHBlY3RlZC5jaGVj a3N1bQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yY2M1MTY1Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3JlcGFpbnQv b3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlLWV4cGVjdGVkLmNoZWNrc3VtCkBAIC0wLDAgKzEgQEAK K2RmM2UyMWViZWE2NzE3M2NjOTIwNWJmODQ4MmNlYmFiClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg ZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3Jl cGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlLWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9jb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0 ZS1leHBlY3RlZC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGE4MWRl OApCaW5hcnkgZmlsZXMgL2Rldi9udWxsIGFuZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9j b21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZS1leHBlY3RlZC5wbmcg ZGlmZmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcv cmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29s dXRlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMzRl NDFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0 aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDE0IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAo MCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDI2MAorICBSZW5kZXJC bG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4MjYwCisgICAgUmVuZGVyQm9keSB7Qk9EWX0g YXQgKDgsMTYpIHNpemUgNzg0eDIzNgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNp emUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDQyM3gx OAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDQyMzogIlRoaXMgdGVzdCBzaG91 bGQgbm90IGFzc2VydCwgYW5kIHlvdSBzaG91bGQgc2VlIGEgZnVsbHkgZ3JlZW4gc3F1YXJlLiIK K2xheWVyIGF0ICg4LDUwKSBzaXplIDIwMngyMDIKKyAgUmVuZGVyQmxvY2sgKHJlbGF0aXZlIHBv c2l0aW9uZWQpIHtESVZ9IGF0ICgwLDM0KSBzaXplIDIwMngyMDIgW2JvcmRlcjogKDFweCBzb2xp ZCAjMDAwMDAwKV0KK2xheWVyIGF0ICgyOSw3MSkgc2l6ZSA1Mng1MgorICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMjEsMjEpIHNpemUgNTJ4NTIgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0K K2xheWVyIGF0ICgxMDksMTUxKSBzaXplIDgweDgwCisgIFJlbmRlckJsb2NrIChwb3NpdGlvbmVk KSB7RElWfSBhdCAoMTAxLDEwMSkgc2l6ZSA4MHg4MCBbYmdjb2xvcj0jMDA4MDAwXQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MDdjYzZi Li5lMTY1YmZkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDA5LTA5LTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6ICFyZXBhaW50Q29udGFpbmVyIHx8IHJlcGFp bnRDb250YWluZXIgPT0gdGhpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjk3NTUKKyAgICAgICAgCisgICAgICAgIEl0J3MgcG9zc2libGUgZm9yIFJl bmRlck9iamVjdDo6Y29udGFpbmVyKCkgdG8gcmV0dXJuIGFuIG9iamVjdCB0aGF0IGlzIGhpZ2hl cgorICAgICAgICBpbiB0aGUgaGllcmFyY2h5IHRoYW4gdGhlIHJlcGFpbnRDb250YWluZXIgdGhh dCBpcyBiZWluZyB1c2VkIHRvIHJlcGFpbnQgYW4KKyAgICAgICAgb2JqZWN0LiBGb3IgZXhhbXBs ZSwgdGhpcyBjYW4gaGFwcGVuIHdoZW4gcnVubmluZyBhbiBhY2NlbGVyYXRlZCBvcGFjaXR5Cisg ICAgICAgIHRyYW5zaXRpb24gb24gYW4gZWxlbWVudCB3aXRoIGEgcG9zaXRpb246YWJzb2x1dGUg cGFyZW50LCBhbmQgYSBwb3NpdGlvbjphYnNvbHV0ZSBjaGlsZC4KKyAgICAgICAgCisgICAgICAg IEluIHRoaXMgY2FzZSB3ZSBuZWVkIHRvIGRldGVjdCB3aGVuIFJlbmRlck9iamVjdDo6Y29udGFp bmVyKCkgd2lsbCBza2lwIG92ZXIKKyAgICAgICAgcmVwYWludENvbnRhaW5lciwgYW5kIGluIHRo YXQgY2FzZSBhZGp1c3QgdGhlIGNvb3JkcyB0byBzaGlmdCBpbnRvIHJlcGFpbnRDb250YWluZXIn cyBzcGFjZS4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0 d2Vlbi1hYnNvbHV0ZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6bWFwTG9jYWxUb0NvbnRhaW5lcik6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwYWludCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJ bmxpbmU6OmNvbXB1dGVSZWN0Rm9yUmVwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbnRhaW5lcik6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorCisyMDA5LTA5LTI1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgogCiAgICAgICAgIENyYXNoIHdpdGggaGFyZHdhcmUgYWNjZWxlcmF0ZWQg cm90YXRpb24gb2YgYSBQREYgaW1hZ2UgaW4gYSBkYXRhIFVSTApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggZGQ1OGVkMS4uYzhkMzAzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC05 NDEsNyArOTQxLDggQEAgdm9pZCBSZW5kZXJCb3g6Om1hcExvY2FsVG9Db250YWluZXIoUmVuZGVy Qm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsIGJvb2wKICAgICBpZiAoc3R5bGUoKS0+ cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uKQogICAgICAgICBmaXhlZCA9IHRydWU7CiAKLSAg ICBSZW5kZXJPYmplY3QqIG8gPSBjb250YWluZXIoKTsKKyAgICBib29sIGNvbnRhaW5lclNraXBw ZWQ7CisgICAgUmVuZGVyT2JqZWN0KiBvID0gY29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsICZj b250YWluZXJTa2lwcGVkKTsKICAgICBpZiAoIW8pCiAgICAgICAgIHJldHVybjsKIApAQCAtOTU5 LDYgKzk2MCwxNCBAQCB2b2lkIFJlbmRlckJveDo6bWFwTG9jYWxUb0NvbnRhaW5lcihSZW5kZXJC b3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgYm9vbAogICAgIH0gZWxzZQogICAgICAg ICB0cmFuc2Zvcm1TdGF0ZS5tb3ZlKGNvbnRhaW5lck9mZnNldC53aWR0aCgpLCBjb250YWluZXJP ZmZzZXQuaGVpZ2h0KCksIHByZXNlcnZlM0QgPyBUcmFuc2Zvcm1TdGF0ZTo6QWNjdW11bGF0ZVRy YW5zZm9ybSA6IFRyYW5zZm9ybVN0YXRlOjpGbGF0dGVuVHJhbnNmb3JtKTsKIAorICAgIGlmIChj b250YWluZXJTa2lwcGVkKSB7CisgICAgICAgIC8vIFRoZXJlIGNhbid0IGJlIGEgdHJhbnNmcm9t IGJldHdlZW4gcmVwYWludENvbnRhaW5lciBhbmQgbywgYmVjYXVzZSB0cmFuc2Zvcm1zIGNyZWF0 ZSBjb250YWluZXJzLCBzbyBpdCBzaG91bGQgYmUgc2FmZQorICAgICAgICAvLyB0byBqdXN0IHN1 YnRyYWN0IHRoZSBkZWx0YSBiZXR3ZWVuIHRoZSByZXBhaW50Q29udGFpbmVyIGFuZCBvLgorICAg ICAgICBJbnRTaXplIHJlcGFpbnRDb250YWluZXJPZmZzZXQgPSByZXBhaW50Q29udGFpbmVyLT5v ZmZzZXRGcm9tQ29udGFpbmVyKG8pOworICAgICAgICB0cmFuc2Zvcm1TdGF0ZS5tb3ZlKC1yZXBh aW50Q29udGFpbmVyT2Zmc2V0LndpZHRoKCksIC1yZXBhaW50Q29udGFpbmVyT2Zmc2V0LmhlaWdo dCgpLCBwcmVzZXJ2ZTNEID8gVHJhbnNmb3JtU3RhdGU6OkFjY3VtdWxhdGVUcmFuc2Zvcm0gOiBU cmFuc2Zvcm1TdGF0ZTo6RmxhdHRlblRyYW5zZm9ybSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisgICAgCiAgICAgby0+bWFwTG9jYWxUb0NvbnRhaW5lcihyZXBhaW50Q29udGFpbmVyLCBmaXhl ZCwgdXNlVHJhbnNmb3JtcywgdHJhbnNmb3JtU3RhdGUpOwogfQogCkBAIC0xMTMxLDcgKzExNDAs OCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVs T2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBJbgogICAgIGlmIChyZXBhaW50Q29udGFpbmVyID09 IHRoaXMpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlbmRlck9iamVjdCogbyA9IGNvbnRhaW5l cigpOworICAgIGJvb2wgY29udGFpbmVyU2tpcHBlZDsKKyAgICBSZW5kZXJPYmplY3QqIG8gPSBj b250YWluZXIocmVwYWludENvbnRhaW5lciwgJmNvbnRhaW5lclNraXBwZWQpOwogICAgIGlmICgh bykKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTg4LDYgKzExOTgsMTMgQEAgdm9pZCBSZW5kZXJC b3g6OmNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENv bnRhaW5lciwgSW4KICAgICAgICAgICAgIHJldHVybjsKICAgICB9IGVsc2UKICAgICAgICAgcmVj dC5zZXRMb2NhdGlvbih0b3BMZWZ0KTsKKworICAgIGlmIChjb250YWluZXJTa2lwcGVkKSB7Cisg ICAgICAgIC8vIElmIHRoZSByZXBhaW50Q29udGFpbmVyIGlzIGJlbG93IG8sIHRoZW4gd2UgbmVl ZCB0byBtYXAgdGhlIHJlY3QgaW50byByZXBhaW50Q29udGFpbmVyJ3MgY29vcmRpbmF0ZXMuCisg ICAgICAgIEludFNpemUgY29udGFpbmVyT2Zmc2V0ID0gcmVwYWludENvbnRhaW5lci0+b2Zmc2V0 RnJvbUNvbnRhaW5lcihvKTsKKyAgICAgICAgcmVjdC5tb3ZlKC1jb250YWluZXJPZmZzZXQpOwor ICAgICAgICByZXR1cm47CisgICAgfQogICAgIAogICAgIG8tPmNvbXB1dGVSZWN0Rm9yUmVwYWlu dChyZXBhaW50Q29udGFpbmVyLCByZWN0LCBmaXhlZCk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5s aW5lLmNwcAppbmRleCAwN2IyOGNjLi5hNWU5NzNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5jcHAKQEAgLTY1Miw3ICs2NTIsOCBAQCB2b2lkIFJlbmRlcklubGluZTo6Y29tcHV0ZVJlY3RG b3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLAogICAgIGlm IChyZXBhaW50Q29udGFpbmVyID09IHRoaXMpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlbmRl ck9iamVjdCogbyA9IGNvbnRhaW5lcigpOworICAgIGJvb2wgY29udGFpbmVyU2tpcHBlZDsKKyAg ICBSZW5kZXJPYmplY3QqIG8gPSBjb250YWluZXIocmVwYWludENvbnRhaW5lciwgJmNvbnRhaW5l clNraXBwZWQpOwogICAgIGlmICghbykKICAgICAgICAgcmV0dXJuOwogCkBAIC02OTMsNiArNjk0 LDEzIEBAIHZvaWQgUmVuZGVySW5saW5lOjpjb21wdXRlUmVjdEZvclJlcGFpbnQoUmVuZGVyQm94 TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsCiAgICAgICAgICAgICByZXR1cm47CiAgICAg fSBlbHNlCiAgICAgICAgIHJlY3Quc2V0TG9jYXRpb24odG9wTGVmdCk7CisKKyAgICBpZiAoY29u dGFpbmVyU2tpcHBlZCkgeworICAgICAgICAvLyBJZiB0aGUgcmVwYWludENvbnRhaW5lciBpcyBi ZWxvdyBvLCB0aGVuIHdlIG5lZWQgdG8gbWFwIHRoZSByZWN0IGludG8gcmVwYWludENvbnRhaW5l cidzIGNvb3JkaW5hdGVzLgorICAgICAgICBJbnRTaXplIGNvbnRhaW5lck9mZnNldCA9IHJlcGFp bnRDb250YWluZXItPm9mZnNldEZyb21Db250YWluZXIobyk7CisgICAgICAgIHJlY3QubW92ZSgt Y29udGFpbmVyT2Zmc2V0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICAKICAgICBvLT5j b21wdXRlUmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5lciwgcmVjdCwgZml4ZWQpOwogfQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggMWQ1ZWQwYy4uYjdmNTllMSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xNzg4LDggKzE3ODgsMTEgQEAgYm9vbCBSZW5k ZXJPYmplY3Q6Omhhc091dGxpbmVBbm5vdGF0aW9uKCkgY29uc3QKICAgICByZXR1cm4gbm9kZSgp ICYmIG5vZGUoKS0+aXNMaW5rKCkgJiYgZG9jdW1lbnQoKS0+cHJpbnRpbmcoKTsKIH0KIAotUmVu ZGVyT2JqZWN0KiBSZW5kZXJPYmplY3Q6OmNvbnRhaW5lcigpIGNvbnN0CitSZW5kZXJPYmplY3Qq IFJlbmRlck9iamVjdDo6Y29udGFpbmVyKFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29u dGFpbmVyLCBib29sKiByZXBhaW50Q29udGFpbmVyU2tpcHBlZCkgY29uc3QKIHsKKyAgICBpZiAo cmVwYWludENvbnRhaW5lclNraXBwZWQpCisgICAgICAgICpyZXBhaW50Q29udGFpbmVyU2tpcHBl ZCA9IGZhbHNlOworCiAgICAgLy8gVGhpcyBtZXRob2QgaXMgZXh0cmVtZWx5IHNpbWlsYXIgdG8g Y29udGFpbmluZ0Jsb2NrKCksIGJ1dCB3aXRoIGEgZmV3IG5vdGFibGUKICAgICAvLyBleGNlcHRp b25zLgogICAgIC8vICgxKSBJdCBjYW4gYmUgdXNlZCBvbiBvcnBoYW5lZCBzdWJ0cmVlcywgaS5l LiwgaXQgY2FuIGJlIGNhbGxlZCBzYWZlbHkgZXZlbiB3aGVuCkBAIC0xODE0LDE0ICsxODE3LDIw IEBAIFJlbmRlck9iamVjdCogUmVuZGVyT2JqZWN0Ojpjb250YWluZXIoKSBjb25zdAogICAgICAg ICAvLyB3ZSdsbCBqdXN0IHJldHVybiAwKS4KICAgICAgICAgLy8gRklYTUU6IFRoZSBkZWZpbml0 aW9uIG9mIHZpZXcoKSBoYXMgY2hhbmdlZCB0byBub3QgY3Jhd2wgdXAgdGhlIHJlbmRlciB0cmVl LiAgSXQgbWlnaHQKICAgICAgICAgLy8gYmUgc2FmZSBub3cgdG8gdXNlIGl0LgotICAgICAgICB3 aGlsZSAobyAmJiBvLT5wYXJlbnQoKSAmJiAhKG8tPmhhc1RyYW5zZm9ybSgpICYmIG8tPmlzUmVu ZGVyQmxvY2soKSkpCisgICAgICAgIHdoaWxlIChvICYmIG8tPnBhcmVudCgpICYmICEoby0+aGFz VHJhbnNmb3JtKCkgJiYgby0+aXNSZW5kZXJCbG9jaygpKSkgeworICAgICAgICAgICAgaWYgKHJl cGFpbnRDb250YWluZXJTa2lwcGVkICYmIG8gPT0gcmVwYWludENvbnRhaW5lcikKKyAgICAgICAg ICAgICAgICAqcmVwYWludENvbnRhaW5lclNraXBwZWQgPSB0cnVlOwogICAgICAgICAgICAgbyA9 IG8tPnBhcmVudCgpOworICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChwb3MgPT0gQWJzb2x1dGVQ b3NpdGlvbikgewogICAgICAgICAvLyBTYW1lIGdvZXMgaGVyZS4gIFdlIHRlY2huaWNhbGx5IGp1 c3Qgd2FudCBvdXIgY29udGFpbmluZyBibG9jaywgYnV0CiAgICAgICAgIC8vIHdlIG1heSBub3Qg aGF2ZSBvbmUgaWYgd2UncmUgcGFydCBvZiBhbiB1bmluc3RhbGxlZCBzdWJ0cmVlLiAgV2UnbGwK ICAgICAgICAgLy8gY2xpbWIgYXMgaGlnaCBhcyB3ZSBjYW4gdGhvdWdoLgotICAgICAgICB3aGls ZSAobyAmJiBvLT5zdHlsZSgpLT5wb3NpdGlvbigpID09IFN0YXRpY1Bvc2l0aW9uICYmICFvLT5p c1JlbmRlclZpZXcoKSAmJiAhKG8tPmhhc1RyYW5zZm9ybSgpICYmIG8tPmlzUmVuZGVyQmxvY2so KSkpCisgICAgICAgIHdoaWxlIChvICYmIG8tPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gU3RhdGlj UG9zaXRpb24gJiYgIW8tPmlzUmVuZGVyVmlldygpICYmICEoby0+aGFzVHJhbnNmb3JtKCkgJiYg by0+aXNSZW5kZXJCbG9jaygpKSkgeworICAgICAgICAgICAgaWYgKHJlcGFpbnRDb250YWluZXJT a2lwcGVkICYmIG8gPT0gcmVwYWludENvbnRhaW5lcikKKyAgICAgICAgICAgICAgICAqcmVwYWlu dENvbnRhaW5lclNraXBwZWQgPSB0cnVlOwogICAgICAgICAgICAgbyA9IG8tPnBhcmVudCgpOwor ICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIG87CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o CmluZGV4IGU1YTBjMTYuLjZiOGRkMDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC00 MDMsMTEgKzQwMywxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNPdXRsaW5lQW5ub3RhdGlvbigp IGNvbnN0OwogICAgIGJvb2wgaGFzT3V0bGluZSgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmhh c091dGxpbmUoKSB8fCBoYXNPdXRsaW5lQW5ub3RhdGlvbigpOyB9CiAKLSAgIC8qKgotICAgICAq IHJldHVybnMgdGhlIG9iamVjdCBjb250YWluaW5nIHRoaXMgb25lLiBjYW4gYmUgZGlmZmVyZW50 IGZyb20gcGFyZW50IGZvcgotICAgICAqIHBvc2l0aW9uZWQgZWxlbWVudHMKLSAgICAgKi8KLSAg ICBSZW5kZXJPYmplY3QqIGNvbnRhaW5lcigpIGNvbnN0OworICAgIC8vIFJldHVybnMgdGhlIG9i amVjdCBjb250YWluaW5nIHRoaXMgb25lLiBDYW4gYmUgZGlmZmVyZW50IGZyb20gcGFyZW50IGZv ciBwb3NpdGlvbmVkIGVsZW1lbnRzLgorICAgIC8vIElmIHJlcGFpbnRDb250YWluZXIgYW5kIHJl cGFpbnRDb250YWluZXJTa2lwcGVkIGFyZSBub3QgbnVsbCwgb24gcmV0dXJuICpyZXBhaW50Q29u dGFpbmVyU2tpcHBlZAorICAgIC8vIGlzIHRydWUgaWYgdGhlIHJlbmRlcmVyIHJldHVybmVkIGlz IGFuIGFuY2VzdG9yIG9mIHJlcGFpbnRDb250YWluZXIuCisgICAgUmVuZGVyT2JqZWN0KiBjb250 YWluZXIoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIgPSAwLCBib29sKiBy ZXBhaW50Q29udGFpbmVyU2tpcHBlZCA9IDApIGNvbnN0OworCiAgICAgdmlydHVhbCBSZW5kZXJP YmplY3QqIGhvdmVyQW5jZXN0b3IoKSBjb25zdCB7IHJldHVybiBwYXJlbnQoKTsgfQogCiAgICAg Ly8gSUUgRXh0ZW5zaW9uIHRoYXQgY2FuIGJlIGNhbGxlZCBvbiBhbnkgUmVuZGVyT2JqZWN0LiAg U2VlIHRoZSBpbXBsZW1lbnRhdGlvbiBmb3IgdGhlIGRldGFpbHMuCg== 40335 2009-09-29 17:04:27 -0700 2009-09-30 10:10:07 -0700 Better fix 29755_patch2.txt text/plain 10567 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZmNlMzQ3Li45ODdmMjUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MjkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogIXJl cGFpbnRDb250YWluZXIgfHwgcmVwYWludENvbnRhaW5lciA9PSB0aGlzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTc1NQorICAgICAgICAKKyAgICAg ICAgVGVzdGNhc2Ugd2l0aCBtdWx0aXBsZSBjb250YWluZXJzIGJldHdlZW4gdGhlIGFic29sdXRl bHkgcG9zaXRpb25lZCBkaXYgYW5kIGl0cyBwb3NpdGlvbmVkCisgICAgICAgIGFuY2VzdG9yLgor CisgICAgICAgICogY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUy Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9jb21wb3NpdGluZy9yZXBhaW50 L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZTItZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9jb21wb3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1h YnNvbHV0ZTItZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvY29t cG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUyLWV4cGVjdGVkLnR4dDog QWRkZWQuCisKIDIwMDktMDktMjggIENoYXJsZXMgV2VpICA8Y2hhcmxlcy53ZWlAdG9yY2htb2Jp bGUuY29tLmNuPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3ZWVu LWFic29sdXRlMi5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5 LWJldHdlZW4tYWJzb2x1dGUyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uZmFlZmU5MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3Jl cGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFic29sdXRlMi5odG1sCkBAIC0wLDAgKzEsNzUgQEAKKzwh RE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8v RU4iCisgICAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvbG9vc2UuZHRkIj4KKworPGh0bWwg bGFuZz0iZW4iPgorPGhlYWQ+CisgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29u dGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4KKyAgPHRpdGxlPk9wYWNpdHkgYmV0d2Vl biBhYnNvbHV0ZXM8L3RpdGxlPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3Jl ZW4iPgorICAgIC5jb250YWluZXIgeworICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAg aGVpZ2h0OiAyMDBweDsKKyAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgIGJvcmRlcjogMXB4IHNv bGlkIGJsYWNrOworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAg fQorCisgICAgLmZhZGVyIHsKKyAgICAgIGhlaWdodDogNTBweDsKKyAgICAgIHdpZHRoOiA1MHB4 OworICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7Cisg ICAgICAtd2Via2l0LXRyYW5zaXRpb246IG9wYWNpdHkgMTAwczsKKyAgICB9CisgICAgCisgICAg LmNvbnRhaW5lcjpob3ZlciAuZmFkZXIgeworICAgICAgb3BhY2l0eTogMC41OworICAgIH0KKwor ICAgIC5pbm5lciB7CisgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICBsZWZ0OiAxMDBw eDsKKyAgICAgIHRvcDogMTAwcHg7CisgICAgICBoZWlnaHQ6IDgwcHg7CisgICAgICB3aWR0aDog ODBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyYXk7CisgICAgfQorICAgIAorICAgIC5p bm5lcjpob3ZlciB7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBvcmFuZ2UgIWltcG9ydGFudDsK KyAgICB9CisgIDwvc3R5bGU+CisgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFy c2V0PSJ1dGYtOCI+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg IGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKworICAgIGZ1bmN0aW9uIHJ1 blRlc3QoKQorICAgIHsKKyAgICAgIC8vIEtpY2sgb2ZmIGFuIG9wYWNpdHkgZmFkZSB0byBtYWtl IC5mYWRlciBpbnRvIGEgY29tcG9zaXRpbmcgbGF5ZXIKKyAgICAgIHZhciBjb250YWluZXIgPSBk b2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcuZmFkZXInKVsxXTsKKyAgICAgIGNvbnRhaW5lci5z dHlsZS5vcGFjaXR5ID0gMC45OTsKKyAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGZ1bmN0aW9uKCkg eworICAgICAgICAvLyBOb3cgdGVzdCByZWRyYXcgb24gLmlubmVyCisgICAgICAgIHZhciBpbm5l ciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5pbm5lcicpWzBdOworICAgICAgICBpbm5l ci5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAnZ3JlZW4nOworICAgICAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlm eURvbmUoKTsKKyAgICAgIH0sIDApOworICAgIH0KKworICAgIHdpbmRvdy5hZGRFdmVudExpc3Rl bmVyKCdsb2FkJywgcnVuVGVzdCwgZmFsc2UpCisgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8cD5UaGlzIHRlc3Qgc2hvdWxkIG5vdCBhc3NlcnQsIGFuZCB5b3Ugc2hvdWxkIHNlZSBhIGZ1 bGx5IGdyZWVuIHNxdWFyZS48L3A+Cis8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICA8ZGl2IGNs YXNzPSJmYWRlciI+CisgICAgPGRpdiBjbGFzcz0iZmFkZXIiPgorICAgICAgPGRpdiBjbGFzcz0i aW5uZXIiPgorICAgICAgPC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9kaXY+CisKKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9jb21w b3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZTItZXhwZWN0ZWQuY2hlY2tz dW0gYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5 LWJldHdlZW4tYWJzb2x1dGUyLWV4cGVjdGVkLmNoZWNrc3VtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLjIwMzAwYTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUy LWV4cGVjdGVkLmNoZWNrc3VtCkBAIC0wLDAgKzEgQEAKKzBmODhjNjliNGE2OTBkNjVkZTg5Yzc4 MGMwOWMwZDBhClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3JlcGFpbnQvb3BhY2l0eS1iZXR3ZWVuLWFi c29sdXRlMi1leHBlY3RlZC5wbmcgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRp bmcvcmVwYWludC9vcGFjaXR5LWJldHdlZW4tYWJzb2x1dGUyLWV4cGVjdGVkLnBuZwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40OTAxZjdlCkJpbmFyeSBmaWxlcyAvZGV2L251 bGwgYW5kIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2NvbXBvc2l0aW5nL3JlcGFpbnQvb3Bh Y2l0eS1iZXR3ZWVuLWFic29sdXRlMi1leHBlY3RlZC5wbmcgZGlmZmVyCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdl ZW4tYWJzb2x1dGUyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9jb21w b3NpdGluZy9yZXBhaW50L29wYWNpdHktYmV0d2Vlbi1hYnNvbHV0ZTItZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNjOTE5ODYKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5 LWJldHdlZW4tYWJzb2x1dGUyLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE1IEBACitsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAK K2xheWVyIGF0ICgwLDApIHNpemUgODAweDI2MAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAs MCkgc2l6ZSA4MDB4MjYwCisgICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsMTYpIHNpemUgNzg0 eDIzNgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDE4CisgICAgICAg IFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDQyM3gxOAorICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDApIHdpZHRoIDQyMzogIlRoaXMgdGVzdCBzaG91bGQgbm90IGFzc2VydCwgYW5k IHlvdSBzaG91bGQgc2VlIGEgZnVsbHkgZ3JlZW4gc3F1YXJlLiIKK2xheWVyIGF0ICg4LDUwKSBz aXplIDIwMngyMDIKKyAgUmVuZGVyQmxvY2sgKHJlbGF0aXZlIHBvc2l0aW9uZWQpIHtESVZ9IGF0 ICgwLDM0KSBzaXplIDIwMngyMDIgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0KKyAgICBS ZW5kZXJCbG9jayB7RElWfSBhdCAoMjEsMjEpIHNpemUgNTJ4NTIgW2JvcmRlcjogKDFweCBzb2xp ZCAjMDAwMDAwKV0KK2xheWVyIGF0ICg1MCw5Mikgc2l6ZSA1Mng1MgorICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMjEsMjEpIHNpemUgNTJ4NTIgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0K K2xheWVyIGF0ICgxMDksMTUxKSBzaXplIDgweDgwCisgIFJlbmRlckJsb2NrIChwb3NpdGlvbmVk KSB7RElWfSBhdCAoMTAxLDEwMSkgc2l6ZSA4MHg4MCBbYmdjb2xvcj0jMDA4MDAwXQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNTkwYjMy Li4xMDZkOTcyIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDA5LTA5LTI5ICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6ICFyZXBhaW50Q29udGFpbmVyIHx8IHJlcGFp bnRDb250YWluZXIgPT0gdGhpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjk3NTUKKyAgICAgICAgCisgICAgICAgIEdlbmVyYWxpemUgdGhlIGZpeCBm b3IgdGhpcyBidWcgdG8gYWNjb3VudCBmb3IgY2FzZXMgd2hlcmUgdGhlcmUgbWF5IGJlIG11bHRp cGxlCisgICAgICAgIGNvbnRhaW5pbmcgYmxvY2tzIGJldHdlZW4gdGhlIHJlcGFpbnQgY29udGFp bmVyLCBhbmQgdGhlIGNvbnRhaW5lciBvZiB0aGUgZWxlbWVudAorICAgICAgICBiZWluZyByZXBh aW50ZWQuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvcmVwYWludC9vcGFjaXR5LWJldHdl ZW4tYWJzb2x1dGUyLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjptYXBMb2NhbFRvQ29udGFpbmVyKToKKyAgICAg ICAgQ2FsbCBvZmZzZXRGcm9tQW5jZXN0b3JDb250YWluZXIoKSB0byBnZXQgdGhlIGNvcnJlY3Qg b2Zmc2V0LgorICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJl Y3RGb3JSZXBhaW50KTogRGl0dG8KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50 KTogRGl0dG8uCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck9iamVjdDo6b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKToKKyAgICAgICAgTmV3 IG1ldGhvZCB0aGF0IGNvbXB1dGVzIGFuIG9mZnNldCBmcm9tIHNvbWUgb2JqZWN0IGluIHRoZSBh bmNlc3RvciBjb250YWluZXIoKSBjaGFpbi4KKwogMjAwOS0wOS0yOCAgSmFrdWIgV2llY3pvcmVr ICA8ZmF3MjE3QGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGM4ZDMwMzcuLjRlMDQ1YWYgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcApAQCAtOTYxLDEwICs5NjEsMTAgQEAgdm9pZCBSZW5kZXJCb3g6Om1h cExvY2FsVG9Db250YWluZXIoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIs IGJvb2wKICAgICAgICAgdHJhbnNmb3JtU3RhdGUubW92ZShjb250YWluZXJPZmZzZXQud2lkdGgo KSwgY29udGFpbmVyT2Zmc2V0LmhlaWdodCgpLCBwcmVzZXJ2ZTNEID8gVHJhbnNmb3JtU3RhdGU6 OkFjY3VtdWxhdGVUcmFuc2Zvcm0gOiBUcmFuc2Zvcm1TdGF0ZTo6RmxhdHRlblRyYW5zZm9ybSk7 CiAKICAgICBpZiAoY29udGFpbmVyU2tpcHBlZCkgewotICAgICAgICAvLyBUaGVyZSBjYW4ndCBi ZSBhIHRyYW5zZnJvbSBiZXR3ZWVuIHJlcGFpbnRDb250YWluZXIgYW5kIG8sIGJlY2F1c2UgdHJh bnNmb3JtcyBjcmVhdGUgY29udGFpbmVycywgc28gaXQgc2hvdWxkIGJlIHNhZmUKKyAgICAgICAg Ly8gVGhlcmUgY2FuJ3QgYmUgYSB0cmFuc2Zvcm0gYmV0d2VlbiByZXBhaW50Q29udGFpbmVyIGFu ZCBvLCBiZWNhdXNlIHRyYW5zZm9ybXMgY3JlYXRlIGNvbnRhaW5lcnMsIHNvIGl0IHNob3VsZCBi ZSBzYWZlCiAgICAgICAgIC8vIHRvIGp1c3Qgc3VidHJhY3QgdGhlIGRlbHRhIGJldHdlZW4gdGhl IHJlcGFpbnRDb250YWluZXIgYW5kIG8uCi0gICAgICAgIEludFNpemUgcmVwYWludENvbnRhaW5l ck9mZnNldCA9IHJlcGFpbnRDb250YWluZXItPm9mZnNldEZyb21Db250YWluZXIobyk7Ci0gICAg ICAgIHRyYW5zZm9ybVN0YXRlLm1vdmUoLXJlcGFpbnRDb250YWluZXJPZmZzZXQud2lkdGgoKSwg LXJlcGFpbnRDb250YWluZXJPZmZzZXQuaGVpZ2h0KCksIHByZXNlcnZlM0QgPyBUcmFuc2Zvcm1T dGF0ZTo6QWNjdW11bGF0ZVRyYW5zZm9ybSA6IFRyYW5zZm9ybVN0YXRlOjpGbGF0dGVuVHJhbnNm b3JtKTsKKyAgICAgICAgSW50U2l6ZSBjb250YWluZXJPZmZzZXQgPSByZXBhaW50Q29udGFpbmVy LT5vZmZzZXRGcm9tQW5jZXN0b3JDb250YWluZXIobyk7CisgICAgICAgIHRyYW5zZm9ybVN0YXRl Lm1vdmUoLWNvbnRhaW5lck9mZnNldC53aWR0aCgpLCAtY29udGFpbmVyT2Zmc2V0LmhlaWdodCgp LCBwcmVzZXJ2ZTNEID8gVHJhbnNmb3JtU3RhdGU6OkFjY3VtdWxhdGVUcmFuc2Zvcm0gOiBUcmFu c2Zvcm1TdGF0ZTo6RmxhdHRlblRyYW5zZm9ybSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgCkBAIC0xMjAxLDcgKzEyMDEsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JS ZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBJbgogCiAgICAg aWYgKGNvbnRhaW5lclNraXBwZWQpIHsKICAgICAgICAgLy8gSWYgdGhlIHJlcGFpbnRDb250YWlu ZXIgaXMgYmVsb3cgbywgdGhlbiB3ZSBuZWVkIHRvIG1hcCB0aGUgcmVjdCBpbnRvIHJlcGFpbnRD b250YWluZXIncyBjb29yZGluYXRlcy4KLSAgICAgICAgSW50U2l6ZSBjb250YWluZXJPZmZzZXQg PSByZXBhaW50Q29udGFpbmVyLT5vZmZzZXRGcm9tQ29udGFpbmVyKG8pOworICAgICAgICBJbnRT aXplIGNvbnRhaW5lck9mZnNldCA9IHJlcGFpbnRDb250YWluZXItPm9mZnNldEZyb21BbmNlc3Rv ckNvbnRhaW5lcihvKTsKICAgICAgICAgcmVjdC5tb3ZlKC1jb250YWluZXJPZmZzZXQpOwogICAg ICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5kZXggYTVl OTczZS4uMDVkMjlkMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC02OTcsNyAr Njk3LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OmNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJC b3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwKIAogICAgIGlmIChjb250YWluZXJTa2lw cGVkKSB7CiAgICAgICAgIC8vIElmIHRoZSByZXBhaW50Q29udGFpbmVyIGlzIGJlbG93IG8sIHRo ZW4gd2UgbmVlZCB0byBtYXAgdGhlIHJlY3QgaW50byByZXBhaW50Q29udGFpbmVyJ3MgY29vcmRp bmF0ZXMuCi0gICAgICAgIEludFNpemUgY29udGFpbmVyT2Zmc2V0ID0gcmVwYWludENvbnRhaW5l ci0+b2Zmc2V0RnJvbUNvbnRhaW5lcihvKTsKKyAgICAgICAgSW50U2l6ZSBjb250YWluZXJPZmZz ZXQgPSByZXBhaW50Q29udGFpbmVyLT5vZmZzZXRGcm9tQW5jZXN0b3JDb250YWluZXIobyk7CiAg ICAgICAgIHJlY3QubW92ZSgtY29udGFpbmVyT2Zmc2V0KTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGI3ZjU5ZTEuLjk5N2QxYTAgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMTc1NSw2ICsxNzU1LDIxIEBAIEludFNp emUgUmVuZGVyT2JqZWN0OjpvZmZzZXRGcm9tQ29udGFpbmVyKFJlbmRlck9iamVjdCogbykgY29u c3QKICAgICByZXR1cm4gb2Zmc2V0OwogfQogCitJbnRTaXplIFJlbmRlck9iamVjdDo6b2Zmc2V0 RnJvbUFuY2VzdG9yQ29udGFpbmVyKFJlbmRlck9iamVjdCogY29udGFpbmVyKSBjb25zdAorewor ICAgIEludFNpemUgb2Zmc2V0OworICAgIGNvbnN0IFJlbmRlck9iamVjdCogY3VyckNvbnRhaW5l ciA9IHRoaXM7CisgICAgZG8geworICAgICAgICBSZW5kZXJPYmplY3QqIG5leHRDb250YWluZXIg PSBjdXJyQ29udGFpbmVyLT5jb250YWluZXIoKTsKKyAgICAgICAgQVNTRVJUKCFjdXJyQ29udGFp bmVyLT5oYXNUcmFuc2Zvcm0oKSk7CisgICAgICAgIG9mZnNldCArPSBjdXJyQ29udGFpbmVyLT5v ZmZzZXRGcm9tQ29udGFpbmVyKG5leHRDb250YWluZXIpOworICAgICAgICBjdXJyQ29udGFpbmVy ID0gbmV4dENvbnRhaW5lcjsKKyAgICB9IHdoaWxlIChjdXJyQ29udGFpbmVyICYmIGN1cnJDb250 YWluZXIgIT0gY29udGFpbmVyKTsKKworICAgIEFTU0VSVChjdXJyQ29udGFpbmVyKTsgIC8vIFRo aXMgbWVhbnMgd2UgcmVhY2hlZCB0aGUgdG9wIHdpdGhvdXQgZmluZGluZyBjb250YWluZXIuCisg ICAgcmV0dXJuIG9mZnNldDsKK30KKwogSW50UmVjdCBSZW5kZXJPYmplY3Q6OmxvY2FsQ2FyZXRS ZWN0KElubGluZUJveCosIGludCwgaW50KiBleHRyYVdpZHRoVG9FbmRPZkxpbmUpCiB7CiAgICAg aWYgKGV4dHJhV2lkdGhUb0VuZE9mTGluZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXgg MzY3ZWFhNi4uZTM1OGM5OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTU0MSw2ICs1 NDEsOCBAQCBwdWJsaWM6CiAKICAgICAvLyBSZXR1cm4gdGhlIG9mZnNldCBmcm9tIHRoZSBjb250 YWluZXIoKSByZW5kZXJlciAoZXhjbHVkaW5nIHRyYW5zZm9ybXMpCiAgICAgdmlydHVhbCBJbnRT aXplIG9mZnNldEZyb21Db250YWluZXIoUmVuZGVyT2JqZWN0KikgY29uc3Q7CisgICAgLy8gUmV0 dXJuIHRoZSBvZmZzZXQgZnJvbSBhbiBvYmplY3QgdXAgdGhlIGNvbnRhaW5lcigpIGNoYWluLiBB c3NlcnRzIHRoYXQgbm9uZSBvZiB0aGUgaW50ZXJtZWRpYXRlIG9iamVjdHMgaGF2ZSB0cmFuc2Zv cm1zLgorICAgIEludFNpemUgb2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKFJlbmRlck9iamVj dCopIGNvbnN0OwogICAgIAogICAgIHZpcnR1YWwgdm9pZCBhYnNvbHV0ZVJlY3RzKFZlY3RvcjxJ bnRSZWN0PiYsIGludCwgaW50KSB7IH0KICAgICAvLyBGSVhNRTogdXNlVHJhbnNmb3JtcyBzaG91 bGQgZ28gYXdheSBldmVudHVhbGx5Cg==