77909 2012-02-06 16:00:18 -0800 Floated flexboxes render as regular RenderBlocks 2012-02-08 11:58:50 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://plexode.com/eval3/#ht=%3Cdiv%20style%3D%22border%3A1px%20solid%20blue%3Bdisplay%3A-webkit-flexbox%3Bfloat%3Aleft%22%3E%0A%20%20%20%20%3Cdiv%20style%3D%22background-color%3Apink%22%3Efoo%3C%2Fdiv%3E%0A%20%20%20%20%3Cdiv%20style%3D%22background-color%3Ared%22%3Ebarbaz%3C%2Fdiv%3E%0A%3C%2Fdiv%3E&ohh=1&ohj=1&jt=&ojh=1&ojj=1&ms=100&oth=0&otj=0&cex=1 P2 Normal --- 62048 1 ojan ojan dglazkov hyatt macpherson menard tony webkit.review.bot oldest_to_newest 550378 0 ojan 2012-02-06 16:00:18 -0800 I expect layoutBlock never gets called for floats. 551546 1 125953 ojan 2012-02-07 16:38:52 -0800 Created attachment 125953 Patch 551549 2 125953 ojan 2012-02-07 16:42:45 -0800 Comment on attachment 125953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125953&action=review > LayoutTests/css3/flexbox/floated-flexbox-expected.txt:2 > +FAIL: > +Expected 130 for width, but got 110. This fails because of not implementing computePreferredLogicalWidth as per https://bugs.webkit.org/show_bug.cgi?id=76867. This patch fixes the expected height to be 30 instead of 50 since the flex-items no longer wrap now that we properly treat the parent as a flexbox. 551597 3 125953 webkit.review.bot 2012-02-07 17:29:23 -0800 Comment on attachment 125953 Patch Attachment 125953 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11460165 New failing tests: fast/lists/001-vertical.html fast/block/float/016.html fast/lists/001.html fast/lists/positioned-count-crash.html 551622 4 125953 darin 2012-02-07 17:51:04 -0800 Comment on attachment 125953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125953&action=review > Source/WebCore/css/CSSStyleSelector.cpp:1730 > +static void adjustDisplay(RenderStyle* style, Element *e, bool strictParsing) Element* element, not Element *e 551692 5 125984 ojan 2012-02-07 18:59:01 -0800 Created attachment 125984 Patch 551693 6 ojan 2012-02-07 18:59:43 -0800 Restructured after discussion with Eric. 552344 7 125984 eric 2012-02-08 11:46:50 -0800 Comment on attachment 125984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125984&action=review > Source/WebCore/css/CSSStyleSelector.cpp:1771 > + case NONE: // FIXME: Should NONE really map to BLOCK here? I'm not sure thsi FIXME makes sense anymore, but the code seems fine. 552358 8 ojan 2012-02-08 11:58:50 -0800 Committed r107112: <http://trac.webkit.org/changeset/107112> 125953 2012-02-07 16:38:52 -0800 2012-02-07 18:58:56 -0800 Patch bug-77909-20120207163851.patch text/plain 6816 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNjYjg3ZGY4MGYwYTQ5 NzA1ODA4ZGY5YjFkZDA3ZjViY2I5ODRhMC4uOGFhNjRhMzliZDQ3OWY4MWRhYmIyMmUwOTEzYmI1 NGYzYzIzNDMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTA3ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRmxvYXRlZCBmbGV4Ym94ZXMg cmVuZGVyIGFzIHJlZ3VsYXIgUmVuZGVyQmxvY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzkwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBncmlkL2ZsZXhib3ggY2FzZXMgdG8gYWRqdXN0aW5n IHRoZSBkaXNwbGF5IG9mIGZsb2F0ZWQvcG9zaXRpb25lZAorICAgICAgICBlbGVtZW50cy4gQWxz bywgbW92ZSB0aGlzIGxvZ2ljIGludG8gYSBzd2l0Y2ggc3RhdGVtZW50LiBUaGlzIG1ha2VzCisg ICAgICAgIHRoZSBjb2RlIG1vcmUgcmVhZGFibGUgYW5kIGdpdmVzIGNvbXBpbGUgd2FybmluZ3Mg d2hlbiBuZXcgZGlzcGxheSB0eXBlcworICAgICAgICBhcmUgYWRkZWQgdGhhdCBhcmVuJ3QgaGFu ZGxlZCBoZXJlLgorCisgICAgICAgIFRlc3Q6IGNzczMvZmxleGJveC9mbG9hdGVkLWZsZXhib3gu aHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6YWRqdXN0RGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKToKKwogMjAxMi0wMi0wNiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEwNjc5NyBhbmQgcjEwNjgwNi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA4NmIwYWMzZTQ2NWVlOGQ3MGFiYWM3NjBmNmU4 OTgxMGRhZGI2MDM2Li5kOWRiNjU5ZjBmMGQzNDYyN2FkOTFjZjIxMjU0Yzg5MWRiOTAwN2Q4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC0xNzI3LDYgKzE3Mjcs NjIgQEAgc3RhdGljIHZvaWQgYWRkSW50cmluc2ljTWFyZ2lucyhSZW5kZXJTdHlsZSogc3R5bGUp CiAgICAgfQogfQogCitzdGF0aWMgdm9pZCBhZGp1c3REaXNwbGF5KFJlbmRlclN0eWxlKiBzdHls ZSwgRWxlbWVudCAqZSwgYm9vbCBzdHJpY3RQYXJzaW5nKQoreworICAgIEVEaXNwbGF5IG5ld0Rp c3BsYXlUeXBlOworICAgIHN3aXRjaCAoc3R5bGUtPmRpc3BsYXkoKSkgeworICAgIGNhc2UgQkxP Q0s6CisgICAgY2FzZSBUQUJMRToKKyAgICBjYXNlIEJPWDoKKyAgICBjYXNlIEZMRVhCT1g6Cisj aWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKKyAgICBjYXNlIEdSSUQ6CisjZW5kaWYKKyAgICAg ICAgcmV0dXJuOworCisgICAgY2FzZSBMSVNUX0lURU06CisgICAgICAgIC8vIEl0IGlzIGEgV2lu SUUgYnVnIHRoYXQgZmxvYXRlZCBsaXN0IGl0ZW1zIGxvc2UgdGhlaXIgYnVsbGV0cywgc28gd2Un bGwgZW11bGF0ZSB0aGUgcXVpcmssCisgICAgICAgIC8vIGJ1dCBvbmx5IGluIHF1aXJrcyBtb2Rl LgorICAgICAgICBpZiAoIXN0cmljdFBhcnNpbmcgJiYgc3R5bGUtPmlzRmxvYXRpbmcoKSkKKyAg ICAgICAgICAgIG5ld0Rpc3BsYXlUeXBlID0gQkxPQ0s7CisgICAgY2FzZSBJTkxJTkVfVEFCTEU6 CisgICAgICAgIG5ld0Rpc3BsYXlUeXBlID0gVEFCTEU7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgSU5MSU5FX0JPWDoKKyAgICAgICAgbmV3RGlzcGxheVR5cGUgPSBCT1g7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgSU5MSU5FX0ZMRVhCT1g6CisgICAgICAgIG5ld0Rpc3BsYXlUeXBlID0g RkxFWEJPWDsKKyAgICAgICAgYnJlYWs7CisjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKKyAg ICBjYXNlIElOTElORV9HUklEOgorICAgICAgICBuZXdEaXNwbGF5VHlwZSA9IEdSSUQ7CisgICAg ICAgIGJyZWFrOworI2VuZGlmCisgICAgY2FzZSBJTkxJTkU6CisgICAgY2FzZSBSVU5fSU46Cisg ICAgY2FzZSBDT01QQUNUOgorICAgIGNhc2UgSU5MSU5FX0JMT0NLOgorICAgIGNhc2UgVEFCTEVf Uk9XX0dST1VQOgorICAgIGNhc2UgVEFCTEVfSEVBREVSX0dST1VQOgorICAgIGNhc2UgVEFCTEVf Rk9PVEVSX0dST1VQOgorICAgIGNhc2UgVEFCTEVfUk9XOgorICAgIGNhc2UgVEFCTEVfQ09MVU1O X0dST1VQOgorICAgIGNhc2UgVEFCTEVfQ09MVU1OOgorICAgIGNhc2UgVEFCTEVfQ0VMTDoKKyAg ICBjYXNlIFRBQkxFX0NBUFRJT046CisgICAgY2FzZSBOT05FOgorICAgICAgICBuZXdEaXNwbGF5 VHlwZSA9IEJMT0NLOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBpZiAoc3R5bGUtPnBv c2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbiB8fCBzdHlsZS0+cG9zaXRpb24oKSA9PSBGaXhl ZFBvc2l0aW9uIHx8IHN0eWxlLT5pc0Zsb2F0aW5nKCkKKyAgICAgICAgfHwgKGUgJiYgZS0+ZG9j dW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCkgPT0gZSkpIHsKKyAgICAgICAgc3R5bGUtPnNldERp c3BsYXkobmV3RGlzcGxheVR5cGUpOworICAgIH0KKworfQorCiB2b2lkIENTU1N0eWxlU2VsZWN0 b3I6OmFkanVzdFJlbmRlclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHBh cmVudFN0eWxlLCBFbGVtZW50ICplKQogewogICAgIC8vIENhY2hlIG91ciBvcmlnaW5hbCBkaXNw bGF5LgpAQCAtMTc4MCwyMiArMTgzNiw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0 UmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcGFyZW50CiAgICAg ICAgIC8vIHBvc2l0aW9uIG9yIGZsb2F0IGFuIGlubGluZSwgY29tcGFjdCwgb3IgcnVuLWluLiAg Q2FjaGUgdGhlIG9yaWdpbmFsIGRpc3BsYXksIHNpbmNlIGl0CiAgICAgICAgIC8vIG1heSBiZSBu ZWVkZWQgZm9yIHBvc2l0aW9uZWQgZWxlbWVudHMgdGhhdCBoYXZlIHRvIGNvbXB1dGUgdGhlaXIg c3RhdGljIG5vcm1hbCBmbG93CiAgICAgICAgIC8vIHBvc2l0aW9ucy4gIFdlIGFsc28gZm9yY2Ug aW5saW5lLWxldmVsIHJvb3RzIHRvIGJlIGJsb2NrLWxldmVsLgotICAgICAgICBpZiAoc3R5bGUt PmRpc3BsYXkoKSAhPSBCTE9DSyAmJiBzdHlsZS0+ZGlzcGxheSgpICE9IFRBQkxFICYmIHN0eWxl LT5kaXNwbGF5KCkgIT0gQk9YICYmCi0gICAgICAgICAgICAoc3R5bGUtPnBvc2l0aW9uKCkgPT0g QWJzb2x1dGVQb3NpdGlvbiB8fCBzdHlsZS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uIHx8 IHN0eWxlLT5pc0Zsb2F0aW5nKCkgfHwKLSAgICAgICAgICAgICAoZSAmJiBlLT5kb2N1bWVudCgp LT5kb2N1bWVudEVsZW1lbnQoKSA9PSBlKSkpIHsKLSAgICAgICAgICAgIGlmIChzdHlsZS0+ZGlz cGxheSgpID09IElOTElORV9UQUJMRSkKLSAgICAgICAgICAgICAgICBzdHlsZS0+c2V0RGlzcGxh eShUQUJMRSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChzdHlsZS0+ZGlzcGxheSgpID09IElOTElO RV9CT1gpCi0gICAgICAgICAgICAgICAgc3R5bGUtPnNldERpc3BsYXkoQk9YKTsKLSAgICAgICAg ICAgIGVsc2UgaWYgKHN0eWxlLT5kaXNwbGF5KCkgPT0gTElTVF9JVEVNKSB7Ci0gICAgICAgICAg ICAgICAgLy8gSXQgaXMgYSBXaW5JRSBidWcgdGhhdCBmbG9hdGVkIGxpc3QgaXRlbXMgbG9zZSB0 aGVpciBidWxsZXRzLCBzbyB3ZSdsbCBlbXVsYXRlIHRoZSBxdWlyaywKLSAgICAgICAgICAgICAg ICAvLyBidXQgb25seSBpbiBxdWlya3MgbW9kZS4KLSAgICAgICAgICAgICAgICBpZiAoIW1fY2hl Y2tlci5zdHJpY3RQYXJzaW5nKCkgJiYgc3R5bGUtPmlzRmxvYXRpbmcoKSkKLSAgICAgICAgICAg ICAgICAgICAgc3R5bGUtPnNldERpc3BsYXkoQkxPQ0spOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHN0eWxlLT5zZXREaXNwbGF5KEJMT0NLKTsKLSAg ICAgICAgfQorICAgICAgICBhZGp1c3REaXNwbGF5KHN0eWxlLCBlLCBtX2NoZWNrZXIuc3RyaWN0 UGFyc2luZygpKTsKIAogICAgICAgICAvLyBGSVhNRTogRG9uJ3Qgc3VwcG9ydCB0aGlzIG11dGF0 aW9uIGZvciBwc2V1ZG8gc3R5bGVzIGxpa2UgZmlyc3QtbGV0dGVyIG9yIGZpcnN0LWxpbmUsIHNp bmNlIGl0J3Mgbm90IGNvbXBsZXRlbHkKICAgICAgICAgLy8gY2xlYXIgaG93IHRoYXQgc2hvdWxk IHdvcmsuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggNmM1NDMzOTU2ZTc1ZWJlYzZhOTFkM2FlZjAxMTQzZDViYjBjNzNiZS4u MGViYzUzZjcwYTcwNTdiOWY2ZjMzODdhMWRiY2ZlZjUzMmE2MjJiOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDEyLTAyLTA3ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgRmxvYXRlZCBmbGV4Ym94ZXMgcmVuZGVyIGFzIHJlZ3VsYXIgUmVuZGVyQmxvY2tzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzkwOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY3NzMy9mbGV4 Ym94L2Zsb2F0ZWQtZmxleGJveC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMv ZmxleGJveC9mbG9hdGVkLWZsZXhib3guaHRtbDogQWRkZWQuCisKIDIwMTItMDItMDYgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgogCiAgICAg ICAgIFtRdF1bV0syXSBodHRwL3Rlc3RzL2xvYWRpbmcvc3RhdGUtb2JqZWN0LXNlY3VyaXR5LWV4 Y2VwdGlvbi5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gv ZmxvYXRlZC1mbGV4Ym94LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9m bG9hdGVkLWZsZXhib3gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRkMDVhZmE5MTgzNmU2M2Nj MTY3OTJjMzc0OWUyMmFjNjcwOWQ4MWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9j c3MzL2ZsZXhib3gvZmxvYXRlZC1mbGV4Ym94LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAK K0ZBSUw6CitFeHBlY3RlZCAxMzAgZm9yIHdpZHRoLCBidXQgZ290IDExMC4gCisKKzxkaXYgZGF0 YS1leHBlY3RlZC13aWR0aD0iMTMwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAiIGNsYXNzPSJm bGV4Ym94Ij4KKyAgICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOnBpbms7IHdpZHRoOiAy MHB4OyBoZWlnaHQ6IDIwcHg7Ij48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNv bG9yOnJlZDsgd2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDIwcHg7Ij48L2Rpdj4KKzwvZGl2PgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Zsb2F0ZWQtZmxleGJveC5odG1sIGIv TGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Zsb2F0ZWQtZmxleGJveC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmNjMTc0MDQ0ZDRmNDllYWE0YTMzZTExZjQwNWFlMTU2MDEzNGFlNDIKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxvYXRlZC1mbGV4Ym94Lmh0bWwKQEAgLTAs MCArMSwzMCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxzdHlsZT4KKy5mbGV4Ym94IHsK KyAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXhib3g7CisgICAgYmFja2dyb3VuZC1jb2xvcjogI2Fh YTsKKyAgICBib3JkZXI6IDVweCBzb2xpZCBibHVlOworICAgIGZsb2F0OmxlZnQ7Cit9CisuZmxl eGJveCA6bnRoLWNoaWxkKDEpIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworfQorLmZs ZXhib3ggOm50aC1jaGlsZCgyKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8 L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0icmVzb3VyY2VzL2ZsZXhib3guanMiPjwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJjaGVja0Zs ZXhCb3hlbigpIj4KKworPGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPTEzMCBkYXRhLWV4cGVjdGVk LWhlaWdodD0zMCBjbGFzcz1mbGV4Ym94PgorICAgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQtY29s b3I6cGluazsgd2lkdGg6IDIwcHg7IGhlaWdodDogMjBweDsiPjwvZGl2PgorICAgIDxkaXYgc3R5 bGU9ImJhY2tncm91bmQtY29sb3I6cmVkOyB3aWR0aDogMTAwcHg7IGhlaWdodDogMjBweDsiPjwv ZGl2PgorPC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K 125984 2012-02-07 18:59:01 -0800 2012-02-08 11:46:50 -0800 Patch bug-77909-20120207185859.patch text/plain 7121 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNjYjg3ZGY4MGYwYTQ5 NzA1ODA4ZGY5YjFkZDA3ZjViY2I5ODRhMC4uOGFhNjRhMzliZDQ3OWY4MWRhYmIyMmUwOTEzYmI1 NGYzYzIzNDMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTA3ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRmxvYXRlZCBmbGV4Ym94ZXMg cmVuZGVyIGFzIHJlZ3VsYXIgUmVuZGVyQmxvY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzkwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBncmlkL2ZsZXhib3ggY2FzZXMgdG8gYWRqdXN0aW5n IHRoZSBkaXNwbGF5IG9mIGZsb2F0ZWQvcG9zaXRpb25lZAorICAgICAgICBlbGVtZW50cy4gQWxz bywgbW92ZSB0aGlzIGxvZ2ljIGludG8gYSBzd2l0Y2ggc3RhdGVtZW50LiBUaGlzIG1ha2VzCisg ICAgICAgIHRoZSBjb2RlIG1vcmUgcmVhZGFibGUgYW5kIGdpdmVzIGNvbXBpbGUgd2FybmluZ3Mg d2hlbiBuZXcgZGlzcGxheSB0eXBlcworICAgICAgICBhcmUgYWRkZWQgdGhhdCBhcmVuJ3QgaGFu ZGxlZCBoZXJlLgorCisgICAgICAgIFRlc3Q6IGNzczMvZmxleGJveC9mbG9hdGVkLWZsZXhib3gu aHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6YWRqdXN0RGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKToKKwogMjAxMi0wMi0wNiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEwNjc5NyBhbmQgcjEwNjgwNi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA4NmIwYWMzZTQ2NWVlOGQ3MGFiYWM3NjBmNmU4 OTgxMGRhZGI2MDM2Li5kZGQ4Y2ZmODI4ZTAwNGRhMzk1ZjNmYjgwOGE1NDkxZTgwMTRkNTQwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC0xNzI3LDYgKzE3Mjcs NTUgQEAgc3RhdGljIHZvaWQgYWRkSW50cmluc2ljTWFyZ2lucyhSZW5kZXJTdHlsZSogc3R5bGUp CiAgICAgfQogfQogCitzdGF0aWMgRURpc3BsYXkgZXF1aXZhbGVudEJsb2NrRGlzcGxheShFRGlz cGxheSBkaXNwbGF5LCBib29sIGlzRmxvYXRpbmcsIGJvb2wgc3RyaWN0UGFyc2luZykKK3sKKyAg ICBzd2l0Y2ggKGRpc3BsYXkpIHsKKyAgICBjYXNlIEJMT0NLOgorICAgIGNhc2UgVEFCTEU6Cisg ICAgY2FzZSBCT1g6CisgICAgY2FzZSBGTEVYQk9YOgorI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlP VVQpCisgICAgY2FzZSBHUklEOgorI2VuZGlmCisgICAgICAgIHJldHVybiBkaXNwbGF5OworIAor ICAgIGNhc2UgTElTVF9JVEVNOgorICAgICAgICAvLyBJdCBpcyBhIFdpbklFIGJ1ZyB0aGF0IGZs b2F0ZWQgbGlzdCBpdGVtcyBsb3NlIHRoZWlyIGJ1bGxldHMsIHNvIHdlJ2xsIGVtdWxhdGUgdGhl IHF1aXJrLCBidXQgb25seSBpbiBxdWlya3MgbW9kZS4KKyAgICAgICAgaWYgKCFzdHJpY3RQYXJz aW5nICYmIGlzRmxvYXRpbmcpCisgICAgICAgICAgICByZXR1cm4gQkxPQ0s7CisgICAgICAgIHJl dHVybiBkaXNwbGF5OworICAgIGNhc2UgSU5MSU5FX1RBQkxFOgorICAgICAgICByZXR1cm4gVEFC TEU7CisgICAgY2FzZSBJTkxJTkVfQk9YOgorICAgICAgICByZXR1cm4gQk9YOworICAgIGNhc2Ug SU5MSU5FX0ZMRVhCT1g6CisgICAgICAgIHJldHVybiBGTEVYQk9YOworI2lmIEVOQUJMRShDU1Nf R1JJRF9MQVlPVVQpCisgICAgY2FzZSBJTkxJTkVfR1JJRDoKKyAgICAgICAgcmV0dXJuIEdSSUQ7 CisjZW5kaWYKKyAKKyAgICBjYXNlIElOTElORToKKyAgICBjYXNlIFJVTl9JTjoKKyAgICBjYXNl IENPTVBBQ1Q6CisgICAgY2FzZSBJTkxJTkVfQkxPQ0s6CisgICAgY2FzZSBUQUJMRV9ST1dfR1JP VVA6CisgICAgY2FzZSBUQUJMRV9IRUFERVJfR1JPVVA6CisgICAgY2FzZSBUQUJMRV9GT09URVJf R1JPVVA6CisgICAgY2FzZSBUQUJMRV9ST1c6CisgICAgY2FzZSBUQUJMRV9DT0xVTU5fR1JPVVA6 CisgICAgY2FzZSBUQUJMRV9DT0xVTU46CisgICAgY2FzZSBUQUJMRV9DRUxMOgorICAgIGNhc2Ug VEFCTEVfQ0FQVElPTjoKKyAgICAgICAgcmV0dXJuIEJMT0NLOworICAgIGNhc2UgTk9ORTogLy8g RklYTUU6IFNob3VsZCBOT05FIHJlYWxseSBtYXAgdG8gQkxPQ0sgaGVyZT8KKyAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBOT05FOworICAgIH0KKyAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gQkxPQ0s7Cit9CisKIHZvaWQgQ1NTU3R5bGVT ZWxlY3Rvcjo6YWRqdXN0UmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHls ZSogcGFyZW50U3R5bGUsIEVsZW1lbnQgKmUpCiB7CiAgICAgLy8gQ2FjaGUgb3VyIG9yaWdpbmFs IGRpc3BsYXkuCkBAIC0xNzc2LDI2ICsxODI1LDkgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjph ZGp1c3RSZW5kZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0eWxlKiBwYXJlbnQK ICAgICAgICAgaWYgKGUgJiYgZS0+aGFzVGFnTmFtZShsZWdlbmRUYWcpKQogICAgICAgICAgICAg c3R5bGUtPnNldERpc3BsYXkoQkxPQ0spOwogCi0gICAgICAgIC8vIE11dGF0ZSB0aGUgZGlzcGxh eSB0byBCTE9DSyBvciBUQUJMRSBmb3IgY2VydGFpbiBjYXNlcywgZS5nLiwgaWYgc29tZW9uZSBh dHRlbXB0cyB0bwotICAgICAgICAvLyBwb3NpdGlvbiBvciBmbG9hdCBhbiBpbmxpbmUsIGNvbXBh Y3QsIG9yIHJ1bi1pbi4gIENhY2hlIHRoZSBvcmlnaW5hbCBkaXNwbGF5LCBzaW5jZSBpdAotICAg ICAgICAvLyBtYXkgYmUgbmVlZGVkIGZvciBwb3NpdGlvbmVkIGVsZW1lbnRzIHRoYXQgaGF2ZSB0 byBjb21wdXRlIHRoZWlyIHN0YXRpYyBub3JtYWwgZmxvdwotICAgICAgICAvLyBwb3NpdGlvbnMu ICBXZSBhbHNvIGZvcmNlIGlubGluZS1sZXZlbCByb290cyB0byBiZSBibG9jay1sZXZlbC4KLSAg ICAgICAgaWYgKHN0eWxlLT5kaXNwbGF5KCkgIT0gQkxPQ0sgJiYgc3R5bGUtPmRpc3BsYXkoKSAh PSBUQUJMRSAmJiBzdHlsZS0+ZGlzcGxheSgpICE9IEJPWCAmJgotICAgICAgICAgICAgKHN0eWxl LT5wb3NpdGlvbigpID09IEFic29sdXRlUG9zaXRpb24gfHwgc3R5bGUtPnBvc2l0aW9uKCkgPT0g Rml4ZWRQb3NpdGlvbiB8fCBzdHlsZS0+aXNGbG9hdGluZygpIHx8Ci0gICAgICAgICAgICAgKGUg JiYgZS0+ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCkgPT0gZSkpKSB7Ci0gICAgICAgICAg ICBpZiAoc3R5bGUtPmRpc3BsYXkoKSA9PSBJTkxJTkVfVEFCTEUpCi0gICAgICAgICAgICAgICAg c3R5bGUtPnNldERpc3BsYXkoVEFCTEUpOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUtPmRp c3BsYXkoKSA9PSBJTkxJTkVfQk9YKQotICAgICAgICAgICAgICAgIHN0eWxlLT5zZXREaXNwbGF5 KEJPWCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChzdHlsZS0+ZGlzcGxheSgpID09IExJU1RfSVRF TSkgewotICAgICAgICAgICAgICAgIC8vIEl0IGlzIGEgV2luSUUgYnVnIHRoYXQgZmxvYXRlZCBs aXN0IGl0ZW1zIGxvc2UgdGhlaXIgYnVsbGV0cywgc28gd2UnbGwgZW11bGF0ZSB0aGUgcXVpcmss Ci0gICAgICAgICAgICAgICAgLy8gYnV0IG9ubHkgaW4gcXVpcmtzIG1vZGUuCi0gICAgICAgICAg ICAgICAgaWYgKCFtX2NoZWNrZXIuc3RyaWN0UGFyc2luZygpICYmIHN0eWxlLT5pc0Zsb2F0aW5n KCkpCi0gICAgICAgICAgICAgICAgICAgIHN0eWxlLT5zZXREaXNwbGF5KEJMT0NLKTsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBzdHlsZS0+c2V0RGlz cGxheShCTE9DSyk7Ci0gICAgICAgIH0KKyAgICAgICAgLy8gQWJzb2x1dGUvZml4ZWQgcG9zaXRp b25lZCBlbGVtZW50cywgZmxvYXRpbmcgZWxlbWVudHMgYW5kIHRoZSBkb2N1bWVudCBlbGVtZW50 IG5lZWQgYmxvY2stbGlrZSBvdXRzaWRlIGRpc3BsYXkuCisgICAgICAgIGlmIChzdHlsZS0+cG9z aXRpb24oKSA9PSBBYnNvbHV0ZVBvc2l0aW9uIHx8IHN0eWxlLT5wb3NpdGlvbigpID09IEZpeGVk UG9zaXRpb24gfHwgc3R5bGUtPmlzRmxvYXRpbmcoKSB8fCAoZSAmJiBlLT5kb2N1bWVudCgpLT5k b2N1bWVudEVsZW1lbnQoKSA9PSBlKSkKKyAgICAgICAgICAgIHN0eWxlLT5zZXREaXNwbGF5KGVx dWl2YWxlbnRCbG9ja0Rpc3BsYXkoc3R5bGUtPmRpc3BsYXkoKSwgc3R5bGUtPmlzRmxvYXRpbmco KSwgbV9jaGVja2VyLnN0cmljdFBhcnNpbmcoKSkpOwogCiAgICAgICAgIC8vIEZJWE1FOiBEb24n dCBzdXBwb3J0IHRoaXMgbXV0YXRpb24gZm9yIHBzZXVkbyBzdHlsZXMgbGlrZSBmaXJzdC1sZXR0 ZXIgb3IgZmlyc3QtbGluZSwgc2luY2UgaXQncyBub3QgY29tcGxldGVseQogICAgICAgICAvLyBj bGVhciBob3cgdGhhdCBzaG91bGQgd29yay4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YzU0MzM5NTZlNzVlYmVjNmE5MWQz YWVmMDExNDNkNWJiMGM3M2JlLi4wZWJjNTNmNzBhNzA1N2I5ZjZmMzM4N2ExZGJjZmVmNTMyYTYy MmI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDItMDcgIE9qYW4gVmFmYWkgIDxvamFu QGNocm9taXVtLm9yZz4KKworICAgICAgICBGbG9hdGVkIGZsZXhib3hlcyByZW5kZXIgYXMgcmVn dWxhciBSZW5kZXJCbG9ja3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc3OTA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBjc3MzL2ZsZXhib3gvZmxvYXRlZC1mbGV4Ym94LWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogY3NzMy9mbGV4Ym94L2Zsb2F0ZWQtZmxleGJveC5odG1sOiBBZGRlZC4K KwogMjAxMi0wMi0wNiAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9w ZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIGh0dHAvdGVzdHMvbG9hZGluZy9zdGF0 ZS1vYmplY3Qtc2VjdXJpdHktZXhjZXB0aW9uLmh0bWwgZmFpbHMKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2NzczMvZmxleGJveC9mbG9hdGVkLWZsZXhib3gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvY3NzMy9mbGV4Ym94L2Zsb2F0ZWQtZmxleGJveC1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uZGQwNWFmYTkxODM2ZTYzY2MxNjc5MmMzNzQ5ZTIyYWM2NzA5ZDgxZAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbG9hdGVkLWZsZXhib3gtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNyBAQAorRkFJTDoKK0V4cGVjdGVkIDEzMCBmb3Igd2lkdGgsIGJ1dCBn b3QgMTEwLiAKKworPGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMzAiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSIzMCIgY2xhc3M9ImZsZXhib3giPgorICAgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQt Y29sb3I6cGluazsgd2lkdGg6IDIwcHg7IGhlaWdodDogMjBweDsiPjwvZGl2PgorICAgIDxkaXYg c3R5bGU9ImJhY2tncm91bmQtY29sb3I6cmVkOyB3aWR0aDogMTAwcHg7IGhlaWdodDogMjBweDsi PjwvZGl2PgorPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxv YXRlZC1mbGV4Ym94Lmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvZmxvYXRlZC1mbGV4 Ym94Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uY2MxNzQwNDRkNGY0OWVhYTRhMzNlMTFmNDA1YWUxNTYwMTM0 YWU0MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbG9hdGVk LWZsZXhib3guaHRtbApAQCAtMCwwICsxLDMwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PHN0eWxlPgorLmZsZXhib3ggeworICAgIGRpc3BsYXk6IC13ZWJraXQtZmxleGJveDsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiAjYWFhOworICAgIGJvcmRlcjogNXB4IHNvbGlkIGJsdWU7CisgICAg ZmxvYXQ6bGVmdDsKK30KKy5mbGV4Ym94IDpudGgtY2hpbGQoMSkgeworICAgIGJhY2tncm91bmQt Y29sb3I6IGJsdWU7Cit9CisuZmxleGJveCA6bnRoLWNoaWxkKDIpIHsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cis8 L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvZmxleGJveC5qcyI+PC9zY3JpcHQ+Cis8 Ym9keSBvbmxvYWQ9ImNoZWNrRmxleEJveGVuKCkiPgorCis8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lk dGg9MTMwIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTMwIGNsYXNzPWZsZXhib3g+CisgICAgPGRpdiBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjpwaW5rOyB3aWR0aDogMjBweDsgaGVpZ2h0OiAyMHB4OyI+ PC9kaXY+CisgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpyZWQ7IHdpZHRoOiAxMDBw eDsgaGVpZ2h0OiAyMHB4OyI+PC9kaXY+Cis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgo=