57377 2011-03-29 12:13:16 -0700 REGRESSION(r82295): This patch does not compile on Chromium (Requested by abarth|gardener on #webkit). 2011-03-29 12:39:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 47636 1 webkit.review.bot webkit.review.bot cfleizach commit-queue mario oldest_to_newest 375651 0 webkit.review.bot 2011-03-29 12:13:16 -0700 http://trac.webkit.org/changeset/82295 broke the build: This patch does not compile on Chromium (Requested by abarth|gardener on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 375652 1 87388 webkit.review.bot 2011-03-29 12:13:44 -0700 Created attachment 87388 ROLLOUT of r82295 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 375658 2 87388 mario 2011-03-29 12:21:14 -0700 Comment on attachment 87388 ROLLOUT of r82295 Stopping the rollout by now. I'll try to find a fix for it quickly 375664 3 cfleizach 2011-03-29 12:27:40 -0700 (In reply to comment #2) > (From update of attachment 87388 [details]) > Stopping the rollout by now. I'll try to find a fix for it quickly This is because chromium duplicates internal webcore roles, a bad idea from the start 375672 4 mario 2011-03-29 12:39:02 -0700 Committed r82300: <http://trac.webkit.org/changeset/82300> 87388 2011-03-29 12:13:44 -0700 2011-03-29 12:21:13 -0700 ROLLOUT of r82295 bug-57377-20110329191127.patch text/plain 10280 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODIyOTkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlZGJhMGQ2ZTdjNDJkYTRmNjQwYThk YjU3MzZmOWIzMWYwNjAzNTBlLi44YjQ1NDkyOGRkYjE1Yjk0M2I5MWRjYzRkZDEzYmJkMWNkYzlj MzFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMjkgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI4MjI5NS4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODIy OTUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Mzc3 CisKKyAgICAgICAgVGhpcyBwYXRjaCBkb2VzIG5vdCBjb21waWxlIG9uIENocm9taXVtIChSZXF1 ZXN0ZWQgYnkKKyAgICAgICAgYWJhcnRofGdhcmRlbmVyIG9uICN3ZWJraXQpLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy11bmlnbm9yZWQtZXhwZWN0 ZWQudHh0OiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2Fy aWEtcm9sZXMtdW5pZ25vcmVkLmh0bWw6IFJlbW92ZWQuCisKIDIwMTEtMDMtMjkgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBMb29rcyBsaWtlIGEgcm91bmRpbmcg aXNzdWUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0 eS9hcmlhLXJvbGVzLXVuaWdub3JlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVzLXVuaWdub3JlZC1leHBlY3RlZC50eHQKZGVs ZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDMyNTUxNjRlYWFmYWVkYWU1YmIyZWNjYmJkYzEx NDBhNmY1YzBmMmEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy11bmln bm9yZWQtZXhwZWN0ZWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEsMjYgKzAsMCBAQAotU2ltcGxl IHBhcmFncmFwaAotCi1BIHBhcmFncmFwaCBwcmV0ZW5kaW5nIHRvIGJlIGEgdGFibGUKLQotQSBs YWJlbCBXaG8gc2FpZCBsYWJlbD8gSXQncyBhIGhlYWRpbmchCi1BIGZvcm0gd2l0aCBhIGJ1dHRv biBDbGljayBtZSEKLUp1c3QgYSBidXR0b24gQ2xpY2sgbWUhCi1KdXN0IHNvbWUgdGV4dCBpbnNp ZGUgYSBkaXYKLVRoaXMgZGl2IGlzIGNvbnRhaW5zIGEgdGV4dGJveCAoYW4gZW50cnkpCi1UaGlz IHRlc3RzIHRoYXQgQVJJQSByb2xlcyBhcmUgbm90IGlnbm9yZWQgZm9yICdwJywnbGFiZWwnLCAn Zm9ybScgYW5kICdkaXYnIGVsZW1lbnRzCi0KLU9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KLQot Ci1QQVNTIGVsZW1lbnQucm9sZSBpcyAnQVhSb2xlOiBwYXJhZ3JhcGgnCi1QQVNTIGVsZW1lbnQu cm9sZSBpcyAnQVhSb2xlOiB0YWJsZScKLVBBU1MgZWxlbWVudC5yb2xlIGlzICdBWFJvbGU6IGxh YmVsJwotUEFTUyBlbGVtZW50LnJvbGUgaXMgJ0FYUm9sZTogaGVhZGluZycKLVBBU1MgZWxlbWVu dC5yb2xlIGlzICdBWFJvbGU6IGZvcm0nCi1QQVNTIGVsZW1lbnQucm9sZSBpcyAnQVhSb2xlOiBw dXNoIGJ1dHRvbicKLVBBU1MgZWxlbWVudC5yb2xlIGlzICdBWFJvbGU6IHBhbmVsJwotUEFTUyBl bGVtZW50LnJvbGUgaXMgJ0FYUm9sZTogZW50cnknCi1QQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCi0KLVRFU1QgQ09NUExFVEUKLQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy11bmlnbm9yZWQuaHRtbCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZXMtdW5pZ25vcmVkLmh0bWwK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDA0MzczNGZhODU0MzJlODE1NGE3N2VmZWE1 N2UyMTU0NTkxNTI4ZjYuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy11 bmlnbm9yZWQuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDY3ICswLDAgQEAKLTwhRE9DVFlQRSBI VE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KLTxodG1sPgotPGhlYWQ+Ci08bGlu ayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5 bGUuY3NzIj4KLTxzY3JpcHQ+Ci12YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7Ci08L3Nj cmlwdD4KLTxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+Ci08L2hlYWQ+Ci08Ym9keSBpZD0iYm9keSI+Ci0KLTxwPlNpbXBsZSBw YXJhZ3JhcGg8L3A+Ci08cCByb2xlPSJncmlkIj5BIHBhcmFncmFwaCBwcmV0ZW5kaW5nIHRvIGJl IGEgdGFibGU8L3A+Ci0KLTxsYWJlbD5BIGxhYmVsPC9sYWJlbD4KLTxsYWJlbCByb2xlPSJoZWFk aW5nIj5XaG8gc2FpZCBsYWJlbD8gSXQncyBhIGhlYWRpbmchPC9sYWJlbD4KLQotPGZvcm0+QSBm b3JtIHdpdGggYSBidXR0b24gPGJ1dHRvbiBuYW1lPSJidXR0b24iIHZhbHVlPSJCdXR0b24iPkNs aWNrIG1lITwvYnV0dG9uPjwvZm9ybT4KLTxmb3JtIHJvbGU9ImJ1dHRvbiI+SnVzdCBhIGJ1dHRv biA8YnV0dG9uIG5hbWU9ImJ1dHRvbiIgdmFsdWU9IkJ1dHRvbiI+Q2xpY2sgbWUhPC9idXR0b24+ PC9mb3JtPgotCi08ZGl2Pkp1c3Qgc29tZSB0ZXh0IGluc2lkZSBhIGRpdjwvZm9ybT4KLTxkaXYg cm9sZT0idGV4dGJveCI+VGhpcyBkaXYgaXMgY29udGFpbnMgYSB0ZXh0Ym94IChhbiBlbnRyeSk8 L2Rpdj4KLQotPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Ci08ZGl2IGlkPSJjb25zb2xlIj48L2Rp dj4KLTxzY3JpcHQ+Ci1kZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IEFSSUEgcm9sZXMgYXJl IG5vdCBpZ25vcmVkIGZvciAncCcsJ2xhYmVsJywgJ2Zvcm0nIGFuZCAnZGl2JyBlbGVtZW50cyIp OwotCi1pZiAod2luZG93LmxheW91dENvbnRyb2xsZXIpIHsKLSAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5kdW1wQXNUZXh0KCk7Ci19Ci0KLWlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIpIHsKLSAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIpLmZvY3VzKCk7Ci0gICAg dmFyIHdlYkFyZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKLQot ICAgIC8vIFBhcmFncmFwaHMKLSAgICB2YXIgZWxlbWVudCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4 KDApOwotICAgIHNob3VsZEJlKCJlbGVtZW50LnJvbGUiLCAiJ0FYUm9sZTogcGFyYWdyYXBoJyIp OwotICAgIGVsZW1lbnQgPSB3ZWJBcmVhLmNoaWxkQXRJbmRleCgxKTsKLSAgICBzaG91bGRCZSgi ZWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IHRhYmxlJyIpOwotCi0gICAgLy8gTGFiZWxzIGFyZSBl eHBvc2VkIGFzIGluc2lkZSBhIHBhbmVsCi0gICAgdmFyIGxhYmVsc1BhbmVsID0gd2ViQXJlYS5j aGlsZEF0SW5kZXgoMik7Ci0gICAgZWxlbWVudCA9IGxhYmVsc1BhbmVsLmNoaWxkQXRJbmRleCgw KTsKLSAgICBzaG91bGRCZSgiZWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IGxhYmVsJyIpOwotICAg IGVsZW1lbnQgPSBsYWJlbHNQYW5lbC5jaGlsZEF0SW5kZXgoMSk7Ci0gICAgc2hvdWxkQmUoImVs ZW1lbnQucm9sZSIsICInQVhSb2xlOiBoZWFkaW5nJyIpOwotCi0gICAgLy8gRm9ybXMKLSAgICBl bGVtZW50ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMyk7Ci0gICAgc2hvdWxkQmUoImVsZW1lbnQu cm9sZSIsICInQVhSb2xlOiBmb3JtJyIpOwotICAgIGVsZW1lbnQgPSB3ZWJBcmVhLmNoaWxkQXRJ bmRleCg0KTsKLSAgICBzaG91bGRCZSgiZWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IHB1c2ggYnV0 dG9uJyIpOwotCi0gICAgLy8gRGl2cwotICAgIGVsZW1lbnQgPSB3ZWJBcmVhLmNoaWxkQXRJbmRl eCg1KTsKLSAgICBzaG91bGRCZSgiZWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IHBhbmVsJyIpOwot ICAgIGVsZW1lbnQgPSB3ZWJBcmVhLmNoaWxkQXRJbmRleCg2KTsKLSAgICBzaG91bGRCZSgiZWxl bWVudC5yb2xlIiwgIidBWFJvbGU6IGVudHJ5JyIpOwotfQotCi1zdWNjZXNzZnVsbHlQYXJzZWQg PSB0cnVlOwotPC9zY3JpcHQ+Ci08c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KLTwvYm9keT4KLTwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBjNjUzNGEwMTc2NzViMWVhMTFjZDg0ZmQzZDIzZTI3MmFiNjk2YTI3Li4yODlmYzA2NmE1 NWZjMGNiNDIxODg0Y2NiNDc1Y2E4ZDM2ODZkNzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDMtMjkgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MjI5NS4KKyAgICAgICAgaHR0 cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODIyOTUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Mzc3CisKKyAgICAgICAgVGhpcyBwYXRjaCBk b2VzIG5vdCBjb21waWxlIG9uIENocm9taXVtIChSZXF1ZXN0ZWQgYnkKKyAgICAgICAgYWJhcnRo fGdhcmRlbmVyIG9uICN3ZWJraXQpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6CisgICAgICAgIChhdGtSb2xl KToKKyAgICAgICAgKHdlYmtpdF9hY2Nlc3NpYmxlX2dldF9yb2xlKToKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKwogMjAxMS0wMy0y OSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Unlvc3VrZSBOaXdhLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAppbmRleCAyZDI3ZTM5ZDg2Y2M2YTVkYjA1MTRjOGVjN2E1ZmVmYWJk ZWJmNzM4Li40Njg3Y2FlNzJjMTA4NTQwOWZjZWZlZWFmN2Y0YjFhODk1OTNjMDZiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApA QCAtMTcxLDEwICsxNzEsNiBAQCBlbnVtIEFjY2Vzc2liaWxpdHlSb2xlIHsKICAgICBMaXN0SXRl bVJvbGUsCiAgICAgTWVudUxpc3RQb3B1cFJvbGUsCiAgICAgTWVudUxpc3RPcHRpb25Sb2xlLAot ICAgIFBhcmFncmFwaFJvbGUsCi0gICAgTGFiZWxSb2xlLAotICAgIERpdlJvbGUsCi0gICAgRm9y bVJvbGUsCiAKICAgICAvLyBBUklBIEdyb3VwaW5nIHJvbGVzCiAgICAgTGFuZG1hcmtBcHBsaWNh dGlvblJvbGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCAxZDBmZTVjZDhjMTQzNTI4ZTExY2Qy ZTU1N2NhY2ZmMjQ5YTUzYWY3Li42ZDIwM2E5ZTU4YmU0OGZkNzI2NThiNDYzODcwMTEwMjNkNjJj YjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTMwODksMTkgKzMwODksNyBAQCBBY2Nlc3Np YmlsaXR5Um9sZSBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpkZXRlcm1pbmVBY2Nlc3NpYmls aXR5Um9sZSgpCiAgICAgICAgIHJldHVybiBTcGxpdHRlclJvbGU7CiAjZW5kaWYKIAotICAgIGlm IChub2RlICYmIG5vZGUtPmhhc1RhZ05hbWUocFRhZykpCi0gICAgICAgIHJldHVybiBQYXJhZ3Jh cGhSb2xlOwotCi0gICAgaWYgKG5vZGUgJiYgbm9kZS0+aGFzVGFnTmFtZShsYWJlbFRhZykpCi0g ICAgICAgIHJldHVybiBMYWJlbFJvbGU7Ci0KLSAgICBpZiAobm9kZSAmJiBub2RlLT5oYXNUYWdO YW1lKGRpdlRhZykpCi0gICAgICAgIHJldHVybiBEaXZSb2xlOwotCi0gICAgaWYgKG5vZGUgJiYg bm9kZS0+aGFzVGFnTmFtZShmb3JtVGFnKSkKLSAgICAgICAgcmV0dXJuIEZvcm1Sb2xlOwotCi0g ICAgaWYgKG1fcmVuZGVyZXItPmlzQmxvY2tGbG93KCkpCisgICAgaWYgKG1fcmVuZGVyZXItPmlz QmxvY2tGbG93KCkgfHwgKG5vZGUgJiYgbm9kZS0+aGFzVGFnTmFtZShsYWJlbFRhZykpKQogICAg ICAgICByZXR1cm4gR3JvdXBSb2xlOwogICAgIAogICAgIC8vIElmIHRoZSBlbGVtZW50IGRvZXMg bm90IGhhdmUgcm9sZSwgYnV0IGl0IGhhcyBBUklBIGF0dHJpYnV0ZXMsIGFjY2Vzc2liaWxpdHkg c2hvdWxkIGZhbGxiYWNrIHRvIGV4cG9zaW5nIGl0IGFzIGEgZ3JvdXAuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggN2RmZjJlMzUyNmI3ZTdhOTcyNjExNTU1ZGUzMzZl OTI2NzY0Y2NjNC4uZTZjMjdlN2VkYTkwOGJmNjQ2ZmRkNzA5Y2M3OGI1ODUyZGViZThlYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXJBdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3Rr L0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtNDc2LDE0ICs0NzYsNiBAQCBz dGF0aWMgQXRrUm9sZSBhdGtSb2xlKEFjY2Vzc2liaWxpdHlSb2xlIHJvbGUpCiAgICAgY2FzZSBM aXN0SXRlbVJvbGU6CiAgICAgY2FzZSBMaXN0Qm94T3B0aW9uUm9sZToKICAgICAgICAgcmV0dXJu IEFUS19ST0xFX0xJU1RfSVRFTTsKLSAgICBjYXNlIFBhcmFncmFwaFJvbGU6Ci0gICAgICAgIHJl dHVybiBBVEtfUk9MRV9QQVJBR1JBUEg7Ci0gICAgY2FzZSBMYWJlbFJvbGU6Ci0gICAgICAgIHJl dHVybiBBVEtfUk9MRV9MQUJFTDsKLSAgICBjYXNlIERpdlJvbGU6Ci0gICAgICAgIHJldHVybiBB VEtfUk9MRV9TRUNUSU9OOwotICAgIGNhc2UgRm9ybVJvbGU6Ci0gICAgICAgIHJldHVybiBBVEtf Uk9MRV9GT1JNOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBBVEtfUk9MRV9VTktOT1dO OwogICAgIH0KQEAgLTQ5MSwxNiArNDgzLDMxIEBAIHN0YXRpYyBBdGtSb2xlIGF0a1JvbGUoQWNj ZXNzaWJpbGl0eVJvbGUgcm9sZSkKIAogc3RhdGljIEF0a1JvbGUgd2Via2l0X2FjY2Vzc2libGVf Z2V0X3JvbGUoQXRrT2JqZWN0KiBvYmplY3QpCiB7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCog Y29yZU9iamVjdCA9IGNvcmUob2JqZWN0KTsKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBheE9i amVjdCA9IGNvcmUob2JqZWN0KTsKIAotICAgIGlmICghY29yZU9iamVjdCkKKyAgICBpZiAoIWF4 T2JqZWN0KQogICAgICAgICByZXR1cm4gQVRLX1JPTEVfVU5LTk9XTjsKIAorICAgIC8vIFdlYkNv cmUgZG9lcyBub3Qga25vdyBhYm91dCBwYXJhZ3JhcGggcm9sZSwgbGFiZWwgcm9sZSwgb3Igc2Vj dGlvbiByb2xlCisgICAgaWYgKGF4T2JqZWN0LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qo KSkgeworICAgICAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdCo+KGF4T2JqZWN0KS0+cmVuZGVyZXIoKS0+bm9kZSgpOworICAgICAgICBpZiAobm9k ZSkgeworICAgICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpwVGFnKSkK KyAgICAgICAgICAgICAgICByZXR1cm4gQVRLX1JPTEVfUEFSQUdSQVBIOworICAgICAgICAgICAg aWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpsYWJlbFRhZykpCisgICAgICAgICAgICAg ICAgcmV0dXJuIEFUS19ST0xFX0xBQkVMOworICAgICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05h bWUoSFRNTE5hbWVzOjpkaXZUYWcpKQorICAgICAgICAgICAgICAgIHJldHVybiBBVEtfUk9MRV9T RUNUSU9OOworICAgICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpmb3Jt VGFnKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gQVRLX1JPTEVfRk9STTsKKyAgICAgICAgfQor ICAgIH0KKwogICAgIC8vIE5vdGU6IFdoeSBkb2Vzbid0IFdlYkNvcmUgaGF2ZSBhIHBhc3N3b3Jk IGZpZWxkIGZvciB0aGlzCi0gICAgaWYgKGNvcmVPYmplY3QtPmlzUGFzc3dvcmRGaWVsZCgpKQor ICAgIGlmIChheE9iamVjdC0+aXNQYXNzd29yZEZpZWxkKCkpCiAgICAgICAgIHJldHVybiBBVEtf Uk9MRV9QQVNTV09SRF9URVhUOwogCi0gICAgcmV0dXJuIGF0a1JvbGUoY29yZU9iamVjdC0+cm9s ZVZhbHVlKCkpOworICAgIHJldHVybiBhdGtSb2xlKGF4T2JqZWN0LT5yb2xlVmFsdWUoKSk7CiB9 CiAKIHN0YXRpYyBib29sIHNlbGVjdGlvbkJlbG9uZ3NUb09iamVjdChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBjb3JlT2JqZWN0LCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlci5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyLm1tCmluZGV4IGMwZGQ3OTU1OTY1YjQ1MjljMzdjNDFiYjU4M2EyNTdkZDYz MDU1OGUuLmE0YzhkOGExMWY4YzBjMzAwYjAyNWJhNmM5N2FmYTQwOTRhMzNiYjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyLm1tCkBAIC0xMjg3LDExICsxMjg3LDcgQEAgc3RhdGljIGNvbnN0 IEFjY2Vzc2liaWxpdHlSb2xlTWFwJiBjcmVhdGVBY2Nlc3NpYmlsaXR5Um9sZU1hcCgpCiAgICAg ICAgIHsgVGFiUGFuZWxSb2xlLCBOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGUgfSwKICAgICAgICAg eyBUcmVlUm9sZSwgTlNBY2Nlc3NpYmlsaXR5T3V0bGluZVJvbGUgfSwKICAgICAgICAgeyBUcmVl SXRlbVJvbGUsIE5TQWNjZXNzaWJpbGl0eVJvd1JvbGUgfSwKLSAgICAgICAgeyBMaXN0SXRlbVJv bGUsIE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSB9LAotICAgICAgICB7IFBhcmFncmFwaFJvbGUs IE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSB9LAotICAgICAgICB7IExhYmVsUm9sZSwgTlNBY2Nl c3NpYmlsaXR5R3JvdXBSb2xlIH0sCi0gICAgICAgIHsgRGl2Um9sZSwgTlNBY2Nlc3NpYmlsaXR5 R3JvdXBSb2xlIH0sCi0gICAgICAgIHsgRm9ybVJvbGUsIE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9s ZSB9CisgICAgICAgIHsgTGlzdEl0ZW1Sb2xlLCBOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGUgfQog ICAgIH07CiAgICAgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIHJvbGVNYXAgPSAqbmV3IEFjY2Vzc2li aWxpdHlSb2xlTWFwOwogICAgIAo=