92709 2012-07-30 22:19:44 -0700 -webkit-flex-flow does not work with inherit/initial values 2012-07-31 21:48:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dstockwell dstockwell cmarcelo macpherson menard ojan tony webkit.review.bot oldest_to_newest 682721 0 dstockwell 2012-07-30 22:19:44 -0700 -webkit-flex-flow does not work with inherit/initial values 682722 1 155439 dstockwell 2012-07-30 22:23:36 -0700 Created attachment 155439 Patch 683225 2 155439 tony 2012-07-31 10:05:00 -0700 Comment on attachment 155439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155439&action=review Thanks for the patch! Just some small nits. > Source/WebCore/ChangeLog:10 > + Test: fast/css/webkit-flex-flow-initial.html Can you put the test in css3/flexbox? > LayoutTests/fast/css/webkit-flex-flow-initial.html:1 > +<style> <!DOCTYPE html> and <html> tag go here. > LayoutTests/fast/css/webkit-flex-flow-initial.html:15 > +</style> > +<span id="test1"></span> Please include some text describing what this test is testing. > LayoutTests/fast/css/webkit-flex-flow-initial.html:21 > +result.innerText = value1 === value2 ? 'PASS' : 'FAIL ' + value1 + ' !== ' + value2; Can you add a check to see that either value1 or value2 are column? You may want to use the js-test-pre.js file to get some convenience functions for testing. 683293 3 155439 ojan 2012-07-31 11:29:04 -0700 Comment on attachment 155439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155439&action=review > Source/WebCore/css/StyleResolver.cpp:4012 > + case CSSPropertyWebkitFlexFlow: > + if (isInherit) { > + m_style->setFlexDirection(m_parentStyle->flexDirection()); > + m_style->setFlexWrap(m_parentStyle->flexWrap()); > + } else if (isInitial) { > + m_style->setFlexDirection(RenderStyle::initialFlexDirection()); > + m_style->setFlexWrap(RenderStyle::initialFlexWrap()); > + } > + return; How do other shorthands (e.g. border) deal with this? I don't think we should need to handle flexflow differently than other shorthands, right? 683332 4 tony 2012-07-31 11:51:13 -0700 (In reply to comment #3) > (From update of attachment 155439 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155439&action=review > > > Source/WebCore/css/StyleResolver.cpp:4012 > > + case CSSPropertyWebkitFlexFlow: > > + if (isInherit) { > > + m_style->setFlexDirection(m_parentStyle->flexDirection()); > > + m_style->setFlexWrap(m_parentStyle->flexWrap()); > > + } else if (isInitial) { > > + m_style->setFlexDirection(RenderStyle::initialFlexDirection()); > > + m_style->setFlexWrap(RenderStyle::initialFlexWrap()); > > + } > > + return; > > How do other shorthands (e.g. border) deal with this? I don't think we should need to handle flexflow differently than other shorthands, right? They do it manually too: http://trac.webkit.org/browser/trunk/Source/WebCore/css/StyleResolver.cpp#L3628 We could use the HANDLE_INHERIT_AND_INITIAL macros. I didn't for CSSPropertyWebkitFlex because it's a little less efficient when there are multiple properties, but it would probably be OK in this case. 683365 5 ojan 2012-07-31 12:12:07 -0700 Looks like most properties do this by using ApplyPropertyExpanding in StyleBuilder.cpp (e.g. http://trac.webkit.org/browser/trunk/Source/WebCore/css/StyleBuilder.cpp#L1836). I think we just need to add -webkit-flex-flow and -webkit-flex here appropriately. 683706 6 155692 dstockwell 2012-07-31 17:56:29 -0700 Created attachment 155692 Patch 683708 7 dstockwell 2012-07-31 17:58:46 -0700 Thanks for the comments, please take another look. I moved the handling for both flex and flex-flow to StyleBuilder. 683721 8 155692 ojan 2012-07-31 18:20:37 -0700 Comment on attachment 155692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155692&action=review Looks great. Thanks! Just need to fix the typo in the test and then feel free to commit. > LayoutTests/css3/flexbox/flex-flow-initial.html:1 > +<DOCTYPE! html> The ! comes before the DOCTYPE. 683723 9 155697 dstockwell 2012-07-31 18:23:00 -0700 Created attachment 155697 Patch 683860 10 155697 webkit.review.bot 2012-07-31 21:48:39 -0700 Comment on attachment 155697 Patch Clearing flags on attachment: 155697 Committed r124297: <http://trac.webkit.org/changeset/124297> 683861 11 webkit.review.bot 2012-07-31 21:48:43 -0700 All reviewed patches have been landed. Closing bug. 155439 2012-07-30 22:23:36 -0700 2012-07-31 17:56:23 -0700 Patch bug-92709-20120731152319.patch text/plain 4041 dstockwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1ZWE0M2I2YmQxNTE1 ZTYyNjgyNDgwZTI1ZTdiNGFmODNkZjhjMi4uNTI4MzMxMDE0YzQzZDg2NzQyMGZmMmEyY2UwMzcy YzQ0OTkzNDIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTMwICBEb3Vn bGFzIFN0b2Nrd2VsbCAgPGRzdG9ja3dlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIC13ZWJr aXQtZmxleC1mbG93IGRvZXMgbm90IHdvcmsgd2l0aCBpbmhlcml0L2luaXRpYWwgdmFsdWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcwOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSAtd2Vi a2l0LWZsZXgtZmxvdyB3aGVuIGFwcGx5aW5nIENTUyBwcm9wZXJ0aWVzLgorCisgICAgICAgIFRl c3Q6IGZhc3QvY3NzL3dlYmtpdC1mbGV4LWZsb3ctaW5pdGlhbC5odG1sCisKKyAgICAgICAgKiBj c3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpj b2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QpOgorCiAyMDEyLTA3LTMwICBEb21pbmlrIFLDtnR0 c2NoZXMgIDxkb21pbmlrLnJvdHRzY2hlc0BpbnRlbC5jb20+CiAKICAgICAgICAgQXZvaWQgQXNz ZXJ0aW9uIEZhaWx1cmUgaW4gSGFyZkJ1enpSdW46OmNoYXJhY3RlckluZGV4Rm9yWFBvc2l0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggNzY4ZDRhYzAxNzY5NWY3ZmQ0 OTE2ZDcwMDA3NmEzMzg1ODE1YjgzMy4uMmVhMmNiMGQ4MjNhYzJkODQ4ODE3NWY5YTg2ODE4MDkx NGE5YzJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtNDAwMSw2ICs0 MDAxLDE1IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlE IGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgICAgICAgICBtX3N0eWxlLT5zZXRGbGV4QmFzaXMo UmVuZGVyU3R5bGU6OmluaXRpYWxGbGV4QmFzaXMoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0 dXJuOworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RmxvdzoKKyAgICAgICAgaWYgKGlz SW5oZXJpdCkgeworICAgICAgICAgICAgbV9zdHlsZS0+c2V0RmxleERpcmVjdGlvbihtX3BhcmVu dFN0eWxlLT5mbGV4RGlyZWN0aW9uKCkpOworICAgICAgICAgICAgbV9zdHlsZS0+c2V0RmxleFdy YXAobV9wYXJlbnRTdHlsZS0+ZmxleFdyYXAoKSk7CisgICAgICAgIH0gZWxzZSBpZiAoaXNJbml0 aWFsKSB7CisgICAgICAgICAgICBtX3N0eWxlLT5zZXRGbGV4RGlyZWN0aW9uKFJlbmRlclN0eWxl Ojppbml0aWFsRmxleERpcmVjdGlvbigpKTsKKyAgICAgICAgICAgIG1fc3R5bGUtPnNldEZsZXhX cmFwKFJlbmRlclN0eWxlOjppbml0aWFsRmxleFdyYXAoKSk7CisgICAgICAgIH0KKyAgICAgICAg cmV0dXJuOwogI2VuZGlmCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUludmFsaWQ6CiAgICAgICAgIHJl dHVybjsKQEAgLTQzMzQsNyArNDM0Myw2IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9w ZXJ0eShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdEFsaWduU2VsZjoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEJhc2lz OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RGlyZWN0aW9uOgotICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRGbGV4RmxvdzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEdy b3c6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhTaHJpbms6CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhXcmFwOgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUwNWM4ZTJiMjQ5OTEzZGYzMDVlMGZlNmY0 OTQ2OTkyMjRmNmVhNjguLmRlZTAyNTEzYWI1NTI2YTBlN2IxMDc3MDBjNDk5NDk4ODJiNjI5MTAg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNy0zMCAgRG91Z2xhcyBTdG9ja3dlbGwgIDxk c3RvY2t3ZWxsQGNocm9taXVtLm9yZz4KKworICAgICAgICAtd2Via2l0LWZsZXgtZmxvdyBkb2Vz IG5vdCB3b3JrIHdpdGggaW5oZXJpdC9pbml0aWFsIHZhbHVlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI3MDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL3dlYmtpdC1mbGV4LWZsb3ct aW5pdGlhbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzL3dlYmtpdC1m bGV4LWZsb3ctaW5pdGlhbC5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0zMCAgU2FkcnVsIEhhYmli IENob3dkaHVyeSAgPHNhZHJ1bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUHJvcGFnYXRlIGdl c3R1cmUgZXZlbnRzIHRvIHBsdWdpbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy93ZWJraXQtZmxleC1mbG93LWluaXRpYWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC9jc3Mvd2Via2l0LWZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43 ZWYyMmU5YTQzMWFkMDI3MjcxM2I3MWZkYzg3OTQwMTZjOGVmMTJmCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mvd2Via2l0LWZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxIEBACitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy93ZWJraXQtZmxleC1mbG93LWluaXRpYWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3dl YmtpdC1mbGV4LWZsb3ctaW5pdGlhbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFlZTFhNGNjYWVkMTQzYzk4 Yjc1ODYzNGIzNjJkODgzZTQ0NzgyMTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy93ZWJraXQtZmxleC1mbG93LWluaXRpYWwuaHRtbApAQCAtMCwwICsxLDI0IEBACis8 c3R5bGU+CisjdGVzdDEgeworICAtd2Via2l0LWZsZXgtZmxvdzogY29sdW1uOworfQorI3Rlc3Qx IHsKKyAgLXdlYmtpdC1mbGV4LWZsb3c6IGluaXRpYWw7Cit9CisjdGVzdDIgeworICAtd2Via2l0 LWZsZXgtZGlyZWN0aW9uOiBjb2x1bW47Cit9CisjdGVzdDIgeworICAtd2Via2l0LWZsZXgtZGly ZWN0aW9uOiBpbml0aWFsOworfQorPC9zdHlsZT4KKzxzcGFuIGlkPSJ0ZXN0MSI+PC9zcGFuPgor PHNwYW4gaWQ9InRlc3QyIj48L3NwYW4+Cis8c3BhbiBpZD0icmVzdWx0Ij48L3NwYW4+Cis8c2Ny aXB0PgordmFsdWUxID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdDEpLndlYmtpdEZsZXhE aXJlY3Rpb247Cit2YWx1ZTIgPSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0Mikud2Via2l0 RmxleERpcmVjdGlvbjsKK3Jlc3VsdC5pbm5lclRleHQgPSB2YWx1ZTEgPT09IHZhbHVlMiA/ICdQ QVNTJyA6ICdGQUlMICcgKyB2YWx1ZTEgKyAnICE9PSAnICsgdmFsdWUyOworaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQorICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4K 155692 2012-07-31 17:56:29 -0700 2012-07-31 18:22:53 -0700 Patch bug-92709-20120801105611.patch text/plain 7526 dstockwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1ZWE0M2I2YmQxNTE1 ZTYyNjgyNDgwZTI1ZTdiNGFmODNkZjhjMi4uODNlZGUwMjk1MDcxNjFmNGMyOTg1N2U1NzYzZTY2 NzJiNWM5YTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTMxICBEb3Vn bGFzIFN0b2Nrd2VsbCAgPGRzdG9ja3dlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIC13ZWJr aXQtZmxleC1mbG93IGRvZXMgbm90IHdvcmsgd2l0aCBpbmhlcml0L2luaXRpYWwgdmFsdWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcwOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyBo YW5kbGVyIGZvciBmbGV4LWZsb3cgYW5kIG1vdmUgZmxleCB0byBTdHlsZUJ1aWxkZXIgdG8gbWly cm9yIHRoZSBzdGFuZGFyZCBwYXR0ZXJuIGZvciBoYW5kbGluZyBpbml0aWFsL2luaGVyaXQgaW4g c2hvcnRoYW5kcy4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhib3gvZmxleC1mbG93LWluaXRp YWwuaHRtbAorCisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZUJ1aWxkZXI6OlN0eWxlQnVpbGRlcik6IEFkZGVkIGhhbmRsZXJzIGZvciBmbGV4 IGFuZCBmbGV4LWZsb3cuCisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KTog UmVtb3ZlZCBoYW5kIHdyaXR0ZW4gbG9naWMgZm9yIGhhbmRsaW5nIGZsZXguCisKIDIwMTItMDct MzAgIERvbWluaWsgUsO2dHRzY2hlcyAgPGRvbWluaWsucm90dHNjaGVzQGludGVsLmNvbT4KIAog ICAgICAgICBBdm9pZCBBc3NlcnRpb24gRmFpbHVyZSBpbiBIYXJmQnV6elJ1bjo6Y2hhcmFjdGVy SW5kZXhGb3JYUG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAKaW5kZXggYjZi ZjMzMmE1NzVhYjJlN2ZiNGYxNWYwNWE3NGQwNzZkNzE1OGU5NC4uZGJmYzQzNWFkMzdhODhhZjc1 ZWJmOGU3M2Y1Y2Q0MTFkMjg0ZDA0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAK QEAgLTE5OTAsOCArMTk5MCwxMCBAQCBTdHlsZUJ1aWxkZXI6OlN0eWxlQnVpbGRlcigpCiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25Db250ZW50LCBBcHBseVBy b3BlcnR5RGVmYXVsdDxFQWxpZ25Db250ZW50LCAmUmVuZGVyU3R5bGU6OmFsaWduQ29udGVudCwg RUFsaWduQ29udGVudCwgJlJlbmRlclN0eWxlOjpzZXRBbGlnbkNvbnRlbnQsIEVBbGlnbkNvbnRl bnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEFsaWduQ29udGVudD46OmNyZWF0ZUhhbmRsZXIoKSk7 CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtcywgQXBw bHlQcm9wZXJ0eURlZmF1bHQ8RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25JdGVtcywg RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6c2V0QWxpZ25JdGVtcywgRUFsaWduSXRlbXMsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbEFsaWduSXRlbXM+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZiwgQXBwbHlQcm9wZXJ0 eURlZmF1bHQ8RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25TZWxmLCBFQWxpZ25JdGVt cywgJlJlbmRlclN0eWxlOjpzZXRBbGlnblNlbGYsIEVBbGlnbkl0ZW1zLCAmUmVuZGVyU3R5bGU6 OmluaXRpYWxBbGlnblNlbGY+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFu ZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZsZXgsIEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8U3VwcHJl c3NWYWx1ZSwgQ1NTUHJvcGVydHlXZWJraXRGbGV4R3JvdywgQ1NTUHJvcGVydHlXZWJraXRGbGV4 U2hyaW5rLCBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhCYXNpcz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0RmxleEJhc2lzLCBBcHBseVBy b3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6ZmxleEJhc2lzLCAmUmVuZGVyU3R5bGU6OnNldEZs ZXhCYXNpcywgJlJlbmRlclN0eWxlOjppbml0aWFsRmxleEJhc2lzLCBBdXRvRW5hYmxlZD46OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 RmxleERpcmVjdGlvbiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RUZsZXhEaXJlY3Rpb24sICZSZW5k ZXJTdHlsZTo6ZmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24sICZSZW5kZXJTdHlsZTo6c2V0 RmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24sICZSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhE aXJlY3Rpb24+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhGbG93LCBBcHBseVByb3BlcnR5RXhwYW5kaW5nPFN1cHByZXNzVmFs dWUsIENTU1Byb3BlcnR5V2Via2l0RmxleERpcmVjdGlvbiwgQ1NTUHJvcGVydHlXZWJraXRGbGV4 V3JhcD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0RmxleEdyb3csIEFwcGx5UHJvcGVydHlEZWZhdWx0PGZsb2F0LCAmUmVuZGVyU3R5 bGU6OmZsZXhHcm93LCBmbG9hdCwgJlJlbmRlclN0eWxlOjpzZXRGbGV4R3JvdywgZmxvYXQsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhHcm93Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbGV4U2hyaW5rLCBBcHBseVByb3BlcnR5 RGVmYXVsdDxmbG9hdCwgJlJlbmRlclN0eWxlOjpmbGV4U2hyaW5rLCBmbG9hdCwgJlJlbmRlclN0 eWxlOjpzZXRGbGV4U2hyaW5rLCBmbG9hdCwgJlJlbmRlclN0eWxlOjppbml0aWFsRmxleFNocmlu az46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5 V2Via2l0RmxleFdyYXAsIEFwcGx5UHJvcGVydHlEZWZhdWx0PEVGbGV4V3JhcCwgJlJlbmRlclN0 eWxlOjpmbGV4V3JhcCwgRUZsZXhXcmFwLCAmUmVuZGVyU3R5bGU6OnNldEZsZXhXcmFwLCBFRmxl eFdyYXAsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhXcmFwPjo6Y3JlYXRlSGFuZGxlcigpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA3NjhkNGFjMDE3Njk1ZjdmZDQ5 MTZkNzAwMDc2YTMzODU4MTViODMzLi40NDQzOTQyODQ5ZmVkYjYwMzFhMDlhODNhMDc0ZmM5YjYx YWU3NGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0zOTg5LDE5ICsz OTg5LDYgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1Byb3BlcnR5SUQg aWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZgotI2lm IEVOQUJMRShDU1MzX0ZMRVhCT1gpCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXg6Ci0g ICAgICAgIGlmIChpc0luaGVyaXQpIHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEZsZXhHcm93 KG1fcGFyZW50U3R5bGUtPmZsZXhHcm93KCkpOwotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Rmxl eFNocmluayhtX3BhcmVudFN0eWxlLT5mbGV4U2hyaW5rKCkpOwotICAgICAgICAgICAgbV9zdHls ZS0+c2V0RmxleEJhc2lzKG1fcGFyZW50U3R5bGUtPmZsZXhCYXNpcygpKTsKLSAgICAgICAgfSBl bHNlIGlmIChpc0luaXRpYWwpIHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEZsZXhHcm93KFJl bmRlclN0eWxlOjppbml0aWFsRmxleEdyb3coKSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRG bGV4U2hyaW5rKFJlbmRlclN0eWxlOjppbml0aWFsRmxleFNocmluaygpKTsKLSAgICAgICAgICAg IG1fc3R5bGUtPnNldEZsZXhCYXNpcyhSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhCYXNpcygpKTsK LSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0jZW5kaWYKICAgICBjYXNlIENTU1Byb3BlcnR5 SW52YWxpZDoKICAgICAgICAgcmV0dXJuOwogICAgIC8vIERpcmVjdGlvbmFsIHByb3BlcnRpZXMg YXJlIHJlc29sdmVkIGJ5IHJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KCkgYmVmb3JlIHRo ZSBzd2l0Y2guCkBAIC00MzMyLDYgKzQzMTksNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5 UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVlKQogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRBbGlnbkNvbnRlbnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFs aWduSXRlbXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZjoKKyAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0RmxleDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEJh c2lzOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RGlyZWN0aW9uOgogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRGbGV4RmxvdzoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlMDVjOGUyYjI0OTkxM2RmMzA1ZTBm ZTZmNDk0Njk5MjI0ZjZlYTY4Li5jMmEwNDEyMmRmNjdmZjRlMjQxOGVjZjZmYzJkZmUxNzJmNGU3 NmY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDctMzEgIERvdWdsYXMgU3RvY2t3ZWxs ICA8ZHN0b2Nrd2VsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgLXdlYmtpdC1mbGV4LWZsb3cg ZG9lcyBub3Qgd29yayB3aXRoIGluaGVyaXQvaW5pdGlhbCB2YWx1ZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNzA5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IGZsZXgtZmxvdyBoYW5k bGVzICdpbml0aWFsJyBhcyBleHBlY3RlZC4KKworICAgICAgICAqIGNzczMvZmxleGJveC9mbGV4 LWZsb3ctaW5pdGlhbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJv eC9mbGV4LWZsb3ctaW5pdGlhbC5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0zMCAgU2FkcnVsIEhh YmliIENob3dkaHVyeSAgPHNhZHJ1bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUHJvcGFnYXRl IGdlc3R1cmUgZXZlbnRzIHRvIHBsdWdpbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3Nz My9mbGV4Ym94L2ZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iMmYw MTRlYjUzNjcyN2YyMTU5ODcwM2E5MTVhYTIyM2ZiZmRiYzg3Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDExIEBACitUZXN0cyB0aGF0ICdpbml0aWFsJyBpcyBoYW5kbGVkIGNvcnJlY3Rs eSBmb3IgdGhlIC13ZWJraXQtZmxleC1mbG93IHNob3J0aGFuZC4KKworT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgorCisKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdDEpLndlYmtp dEZsZXhEaXJlY3Rpb24gaXMgInJvdyIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dDIpLndlYmtpdEZsZXhEaXJlY3Rpb24gaXMgInJvdyIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJv eC9mbGV4LWZsb3ctaW5pdGlhbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMzNzU5NDgxOTdiM2Q4YzdhNTBi NWQ0NzMxNDgyNTc2ZmMwMWQzMDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwuaHRtbApAQCAtMCwwICsxLDI4IEBACis8RE9DVFlQ RSEgaHRtbD4KKzxzdHlsZT4KKyN0ZXN0MSB7CisgIC13ZWJraXQtZmxleC1mbG93OiBjb2x1bW47 Cit9CisjdGVzdDEgeworICAtd2Via2l0LWZsZXgtZmxvdzogaW5pdGlhbDsKK30KKyN0ZXN0MiB7 CisgIC13ZWJraXQtZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKK30KKyN0ZXN0MiB7CisgIC13ZWJr aXQtZmxleC1kaXJlY3Rpb246IGluaXRpYWw7Cit9Cis8L3N0eWxlPgorPHNwYW4gaWQ9InRlc3Qx Ij48L3NwYW4+Cis8c3BhbiBpZD0idGVzdDIiPjwvc3Bhbj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9m YXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVz Y3JpcHRpb24oIlRlc3RzIHRoYXQgJ2luaXRpYWwnIGlzIGhhbmRsZWQgY29ycmVjdGx5IGZvciB0 aGUgLXdlYmtpdC1mbGV4LWZsb3cgc2hvcnRoYW5kLiIpOwordmFsdWUxID0gd2luZG93LmdldENv bXB1dGVkU3R5bGUodGVzdDEpLndlYmtpdEZsZXhEaXJlY3Rpb247Cit2YWx1ZTIgPSB3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZSh0ZXN0Mikud2Via2l0RmxleERpcmVjdGlvbjsKK3Nob3VsZEJlRXF1 YWxUb1N0cmluZygnd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdDEpLndlYmtpdEZsZXhEaXJl Y3Rpb24nLCAncm93Jyk7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3dpbmRvdy5nZXRDb21wdXRl ZFN0eWxlKHRlc3QyKS53ZWJraXRGbGV4RGlyZWN0aW9uJywgJ3JvdycpOworaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQorICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 Pgo= 155697 2012-07-31 18:23:00 -0700 2012-07-31 21:48:39 -0700 Patch bug-92709-20120801112242.patch text/plain 7526 dstockwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1ZWE0M2I2YmQxNTE1 ZTYyNjgyNDgwZTI1ZTdiNGFmODNkZjhjMi4uODNlZGUwMjk1MDcxNjFmNGMyOTg1N2U1NzYzZTY2 NzJiNWM5YTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTMxICBEb3Vn bGFzIFN0b2Nrd2VsbCAgPGRzdG9ja3dlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIC13ZWJr aXQtZmxleC1mbG93IGRvZXMgbm90IHdvcmsgd2l0aCBpbmhlcml0L2luaXRpYWwgdmFsdWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjcwOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyBo YW5kbGVyIGZvciBmbGV4LWZsb3cgYW5kIG1vdmUgZmxleCB0byBTdHlsZUJ1aWxkZXIgdG8gbWly cm9yIHRoZSBzdGFuZGFyZCBwYXR0ZXJuIGZvciBoYW5kbGluZyBpbml0aWFsL2luaGVyaXQgaW4g c2hvcnRoYW5kcy4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhib3gvZmxleC1mbG93LWluaXRp YWwuaHRtbAorCisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZUJ1aWxkZXI6OlN0eWxlQnVpbGRlcik6IEFkZGVkIGhhbmRsZXJzIGZvciBmbGV4 IGFuZCBmbGV4LWZsb3cuCisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KTog UmVtb3ZlZCBoYW5kIHdyaXR0ZW4gbG9naWMgZm9yIGhhbmRsaW5nIGZsZXguCisKIDIwMTItMDct MzAgIERvbWluaWsgUsO2dHRzY2hlcyAgPGRvbWluaWsucm90dHNjaGVzQGludGVsLmNvbT4KIAog ICAgICAgICBBdm9pZCBBc3NlcnRpb24gRmFpbHVyZSBpbiBIYXJmQnV6elJ1bjo6Y2hhcmFjdGVy SW5kZXhGb3JYUG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAKaW5kZXggYjZi ZjMzMmE1NzVhYjJlN2ZiNGYxNWYwNWE3NGQwNzZkNzE1OGU5NC4uZGJmYzQzNWFkMzdhODhhZjc1 ZWJmOGU3M2Y1Y2Q0MTFkMjg0ZDA0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAK QEAgLTE5OTAsOCArMTk5MCwxMCBAQCBTdHlsZUJ1aWxkZXI6OlN0eWxlQnVpbGRlcigpCiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25Db250ZW50LCBBcHBseVBy b3BlcnR5RGVmYXVsdDxFQWxpZ25Db250ZW50LCAmUmVuZGVyU3R5bGU6OmFsaWduQ29udGVudCwg RUFsaWduQ29udGVudCwgJlJlbmRlclN0eWxlOjpzZXRBbGlnbkNvbnRlbnQsIEVBbGlnbkNvbnRl bnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEFsaWduQ29udGVudD46OmNyZWF0ZUhhbmRsZXIoKSk7 CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QWxpZ25JdGVtcywgQXBw bHlQcm9wZXJ0eURlZmF1bHQ8RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25JdGVtcywg RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6c2V0QWxpZ25JdGVtcywgRUFsaWduSXRlbXMsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbEFsaWduSXRlbXM+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZiwgQXBwbHlQcm9wZXJ0 eURlZmF1bHQ8RUFsaWduSXRlbXMsICZSZW5kZXJTdHlsZTo6YWxpZ25TZWxmLCBFQWxpZ25JdGVt cywgJlJlbmRlclN0eWxlOjpzZXRBbGlnblNlbGYsIEVBbGlnbkl0ZW1zLCAmUmVuZGVyU3R5bGU6 OmluaXRpYWxBbGlnblNlbGY+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFu ZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZsZXgsIEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8U3VwcHJl c3NWYWx1ZSwgQ1NTUHJvcGVydHlXZWJraXRGbGV4R3JvdywgQ1NTUHJvcGVydHlXZWJraXRGbGV4 U2hyaW5rLCBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhCYXNpcz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0RmxleEJhc2lzLCBBcHBseVBy b3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6ZmxleEJhc2lzLCAmUmVuZGVyU3R5bGU6OnNldEZs ZXhCYXNpcywgJlJlbmRlclN0eWxlOjppbml0aWFsRmxleEJhc2lzLCBBdXRvRW5hYmxlZD46OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 RmxleERpcmVjdGlvbiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RUZsZXhEaXJlY3Rpb24sICZSZW5k ZXJTdHlsZTo6ZmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24sICZSZW5kZXJTdHlsZTo6c2V0 RmxleERpcmVjdGlvbiwgRUZsZXhEaXJlY3Rpb24sICZSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhE aXJlY3Rpb24+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhGbG93LCBBcHBseVByb3BlcnR5RXhwYW5kaW5nPFN1cHByZXNzVmFs dWUsIENTU1Byb3BlcnR5V2Via2l0RmxleERpcmVjdGlvbiwgQ1NTUHJvcGVydHlXZWJraXRGbGV4 V3JhcD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0RmxleEdyb3csIEFwcGx5UHJvcGVydHlEZWZhdWx0PGZsb2F0LCAmUmVuZGVyU3R5 bGU6OmZsZXhHcm93LCBmbG9hdCwgJlJlbmRlclN0eWxlOjpzZXRGbGV4R3JvdywgZmxvYXQsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhHcm93Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbGV4U2hyaW5rLCBBcHBseVByb3BlcnR5 RGVmYXVsdDxmbG9hdCwgJlJlbmRlclN0eWxlOjpmbGV4U2hyaW5rLCBmbG9hdCwgJlJlbmRlclN0 eWxlOjpzZXRGbGV4U2hyaW5rLCBmbG9hdCwgJlJlbmRlclN0eWxlOjppbml0aWFsRmxleFNocmlu az46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5 V2Via2l0RmxleFdyYXAsIEFwcGx5UHJvcGVydHlEZWZhdWx0PEVGbGV4V3JhcCwgJlJlbmRlclN0 eWxlOjpmbGV4V3JhcCwgRUZsZXhXcmFwLCAmUmVuZGVyU3R5bGU6OnNldEZsZXhXcmFwLCBFRmxl eFdyYXAsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhXcmFwPjo6Y3JlYXRlSGFuZGxlcigpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA3NjhkNGFjMDE3Njk1ZjdmZDQ5 MTZkNzAwMDc2YTMzODU4MTViODMzLi40NDQzOTQyODQ5ZmVkYjYwMzFhMDlhODNhMDc0ZmM5YjYx YWU3NGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0zOTg5LDE5ICsz OTg5LDYgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1Byb3BlcnR5SUQg aWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZgotI2lm IEVOQUJMRShDU1MzX0ZMRVhCT1gpCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXg6Ci0g ICAgICAgIGlmIChpc0luaGVyaXQpIHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEZsZXhHcm93 KG1fcGFyZW50U3R5bGUtPmZsZXhHcm93KCkpOwotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Rmxl eFNocmluayhtX3BhcmVudFN0eWxlLT5mbGV4U2hyaW5rKCkpOwotICAgICAgICAgICAgbV9zdHls ZS0+c2V0RmxleEJhc2lzKG1fcGFyZW50U3R5bGUtPmZsZXhCYXNpcygpKTsKLSAgICAgICAgfSBl bHNlIGlmIChpc0luaXRpYWwpIHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEZsZXhHcm93KFJl bmRlclN0eWxlOjppbml0aWFsRmxleEdyb3coKSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRG bGV4U2hyaW5rKFJlbmRlclN0eWxlOjppbml0aWFsRmxleFNocmluaygpKTsKLSAgICAgICAgICAg IG1fc3R5bGUtPnNldEZsZXhCYXNpcyhSZW5kZXJTdHlsZTo6aW5pdGlhbEZsZXhCYXNpcygpKTsK LSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0jZW5kaWYKICAgICBjYXNlIENTU1Byb3BlcnR5 SW52YWxpZDoKICAgICAgICAgcmV0dXJuOwogICAgIC8vIERpcmVjdGlvbmFsIHByb3BlcnRpZXMg YXJlIHJlc29sdmVkIGJ5IHJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KCkgYmVmb3JlIHRo ZSBzd2l0Y2guCkBAIC00MzMyLDYgKzQzMTksNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5 UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVlKQogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRBbGlnbkNvbnRlbnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFs aWduSXRlbXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEFsaWduU2VsZjoKKyAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0RmxleDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0RmxleEJh c2lzOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RGlyZWN0aW9uOgogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRGbGV4RmxvdzoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlMDVjOGUyYjI0OTkxM2RmMzA1ZTBm ZTZmNDk0Njk5MjI0ZjZlYTY4Li5jMmEwNDEyMmRmNjdmZjRlMjQxOGVjZjZmYzJkZmUxNzJmNGU3 NmY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDctMzEgIERvdWdsYXMgU3RvY2t3ZWxs ICA8ZHN0b2Nrd2VsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgLXdlYmtpdC1mbGV4LWZsb3cg ZG9lcyBub3Qgd29yayB3aXRoIGluaGVyaXQvaW5pdGlhbCB2YWx1ZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNzA5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IGZsZXgtZmxvdyBoYW5k bGVzICdpbml0aWFsJyBhcyBleHBlY3RlZC4KKworICAgICAgICAqIGNzczMvZmxleGJveC9mbGV4 LWZsb3ctaW5pdGlhbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJv eC9mbGV4LWZsb3ctaW5pdGlhbC5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0zMCAgU2FkcnVsIEhh YmliIENob3dkaHVyeSAgPHNhZHJ1bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUHJvcGFnYXRl IGdlc3R1cmUgZXZlbnRzIHRvIHBsdWdpbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3Nz My9mbGV4Ym94L2ZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iMmYw MTRlYjUzNjcyN2YyMTU5ODcwM2E5MTVhYTIyM2ZiZmRiYzg3Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXgtZmxvdy1pbml0aWFsLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDExIEBACitUZXN0cyB0aGF0ICdpbml0aWFsJyBpcyBoYW5kbGVkIGNvcnJlY3Rs eSBmb3IgdGhlIC13ZWJraXQtZmxleC1mbG93IHNob3J0aGFuZC4KKworT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgorCisKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdDEpLndlYmtp dEZsZXhEaXJlY3Rpb24gaXMgInJvdyIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dDIpLndlYmtpdEZsZXhEaXJlY3Rpb24gaXMgInJvdyIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJv eC9mbGV4LWZsb3ctaW5pdGlhbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM1ZjFkMjY3MmYwOWExNzM2NWE3 ZGU4NTk5Mjc0ZGRlMmExOTFiMTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1mbG93LWluaXRpYWwuaHRtbApAQCAtMCwwICsxLDI4IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxzdHlsZT4KKyN0ZXN0MSB7CisgIC13ZWJraXQtZmxleC1mbG93OiBjb2x1bW47 Cit9CisjdGVzdDEgeworICAtd2Via2l0LWZsZXgtZmxvdzogaW5pdGlhbDsKK30KKyN0ZXN0MiB7 CisgIC13ZWJraXQtZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKK30KKyN0ZXN0MiB7CisgIC13ZWJr aXQtZmxleC1kaXJlY3Rpb246IGluaXRpYWw7Cit9Cis8L3N0eWxlPgorPHNwYW4gaWQ9InRlc3Qx Ij48L3NwYW4+Cis8c3BhbiBpZD0idGVzdDIiPjwvc3Bhbj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9m YXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVz Y3JpcHRpb24oIlRlc3RzIHRoYXQgJ2luaXRpYWwnIGlzIGhhbmRsZWQgY29ycmVjdGx5IGZvciB0 aGUgLXdlYmtpdC1mbGV4LWZsb3cgc2hvcnRoYW5kLiIpOwordmFsdWUxID0gd2luZG93LmdldENv bXB1dGVkU3R5bGUodGVzdDEpLndlYmtpdEZsZXhEaXJlY3Rpb247Cit2YWx1ZTIgPSB3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZSh0ZXN0Mikud2Via2l0RmxleERpcmVjdGlvbjsKK3Nob3VsZEJlRXF1 YWxUb1N0cmluZygnd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdDEpLndlYmtpdEZsZXhEaXJl Y3Rpb24nLCAncm93Jyk7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3dpbmRvdy5nZXRDb21wdXRl ZFN0eWxlKHRlc3QyKS53ZWJraXRGbGV4RGlyZWN0aW9uJywgJ3JvdycpOworaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQorICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 Pgo=