55411 2011-02-28 14:18:11 -0800 [chromium] premultipliedAlpha WebGL context attribute is ignored. 2011-03-07 14:05:11 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 jbauman jbauman commit-queue jamesr kbr mihaip vangelis zmo oldest_to_newest 359348 0 jbauman 2011-02-28 14:18:11 -0800 The premultipliedAlpha context attribute is ignored, and all webgl contexts are essentially treated as having premultiplied alpha. This affects Chromium's layer compositor, drawImage, and toDataURL. I have a patch that should fix this. 359355 1 84121 jbauman 2011-02-28 14:28:10 -0800 Created attachment 84121 Patch 359372 2 84126 jbauman 2011-02-28 14:43:03 -0800 Created attachment 84126 Patch 359438 3 kbr 2011-02-28 15:47:56 -0800 I've added this information to the associated Chromium bug, but please take a look at Gregg's new premultiply-alpha test in the WebGL conformance suite. We should enhance it if necessary to cover the cases you're working on fixing, and pull a copy into the WebKit layout tests. We can comment out sections that aren't working yet and incrementally fix them with multiple bugs if needed. 359459 4 84143 jbauman 2011-02-28 16:03:04 -0800 Created attachment 84143 Patch 359461 5 jbauman 2011-02-28 16:04:42 -0800 That change removes the drawImage part of the LayoutTest, as it could easily be tested in a Khronos test. All of the layer-compositing changes remain. 359485 6 84143 kbr 2011-02-28 16:42:10 -0800 Comment on attachment 84143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84143&action=review The code changes look good. Some more work is needed on the test case. > LayoutTests/ChangeLog:10 > + * compositing/webgl/webgl-nonpremultiplied-blend.html: Added. You'll need to incorporate expected results for this new test. Chromium's results for the existing compositing/webgl/ tests seem to be under LayoutTests in platform/chromium-gpu-{win,mac,linux}/compositing/webgl/ . Despite the fact that the existing tests in compositing/webgl/ have text on the web page, that makes the pixel results non-portable, so I would recommend putting the text in an HTML comment instead. You may then be able to share the pixel results across platforms and put them under platform/chromium-gpu/ . Because you aren't fixing the Mac code path in this patch, you'll need to add your new test to the Skipped file in LayoutTests/platform/mac/ . I don't think the other ports are running WebGL layout tests by default right now. You'll also need to add it to that in LayoutTests/platform/mac-wk2/ to keep the bots green at http://build.webkit.org/console . See http://www.chromium.org/developers/testing/webkit-layout-tests for instructions on building DumpRenderTree out of your Chromium tree and running layout tests. You will likely need to pass the arguments "--debug --platform chromium-gpu" to run_webkit_tests.sh. > LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html:20 > + .compare { > + margin: 20px; > + width: 200px; > + height: 200px; > + background-color: rgba(0, 0, 128, 0.5); > + } It looks like the "compare" class is left over and should be taken out. > LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html:62 > + <div class="compare"></div> This should be taken out. 359486 7 kbr 2011-02-28 16:44:08 -0800 Also, when adding your test to the Skipped list for the mac platform, you should file a new bug to track proper implementation of the premultipliedAlpha flag on that code path. 360222 8 84292 jbauman 2011-03-01 14:18:10 -0800 Created attachment 84292 Patch 360226 9 jbauman 2011-03-01 14:19:57 -0800 Note: This needs the chromium patch in order for the layout test to work properly. 360228 10 jamesr 2011-03-01 14:20:58 -0800 What does this need on the chromium side? Can the chromium patch land first? Preferably we wouldn't land a WebKit patch until it would pass. 360229 11 84292 kbr 2011-03-01 14:22:15 -0800 Comment on attachment 84292 Patch Please file a bug about the fact that premultipliedAlpha=false isn't implemented on Mac WebKit yet, and reference it in LayoutTests/platform/mac/Skipped. Looks perfect otherwise. 360232 12 jbauman 2011-03-01 14:23:26 -0800 It needs a patch to make sure that DumpRenderTree's GL implementation doesn't disable the premultipliedAlpha flag. The patch to do that has been reviewed, but not committed yet. 361324 13 84514 jbauman 2011-03-02 20:03:50 -0800 Created attachment 84514 Patch 361899 14 jbauman 2011-03-03 13:42:31 -0800 Ok, the fix for DumpRenderTree is in chromium, so this should be ready. 362804 15 84514 kbr 2011-03-04 16:52:22 -0800 Comment on attachment 84514 Patch Looks good. r=me 362859 16 84514 commit-queue 2011-03-04 20:27:29 -0800 Comment on attachment 84514 Patch Clearing flags on attachment: 84514 Committed r80404: <http://trac.webkit.org/changeset/80404> 362860 17 commit-queue 2011-03-04 20:27:35 -0800 All reviewed patches have been landed. Closing bug. 363539 18 mihaip 2011-03-07 13:25:02 -0800 (In reply to comment #11) > (From update of attachment 84292 [details]) > Please file a bug about the fact that premultipliedAlpha=false isn't implemented on Mac WebKit yet, and reference it in LayoutTests/platform/mac/Skipped. Looks perfect otherwise. Does this apply to chromium-mac too? The test is failing there: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&tests=compositing%2Fwebgl%2Fwebgl-nonpremultiplied-blend.html&group=%40ToT%20GPU%20Mesa%20-%20chromium.org (chromium-mac does not use the mac Skipped file) Also, there's a failure on on the Windows debug bot only that you may want to look into. 363545 19 jbauman 2011-03-07 13:32:44 -0800 I'm not sure why the render-tree is different; some pixel-precision issues, I guess. Also, I'm curious why a win debug CPU machine is running this test. As for the pixel results do you know whether they're using accelerated compositing on those macs? I'm pretty sure that non-accelerated compositing is still broken for the moment. 363546 20 mihaip 2011-03-07 13:34:34 -0800 (In reply to comment #19) > I'm not sure why the render-tree is different; some pixel-precision issues, I guess. Also, I'm curious why a win debug CPU machine is running this test. That's a Windows GPU bot (running with Mesa). > As for the pixel results do you know whether they're using accelerated compositing on those macs? I'm pretty sure that non-accelerated compositing is still broken for the moment. It should be accelerated compositing (also with Mesa). 363572 21 kbr 2011-03-07 14:05:11 -0800 (In reply to comment #18) > (In reply to comment #11) > > (From update of attachment 84292 [details] [details]) > > Please file a bug about the fact that premultipliedAlpha=false isn't implemented on Mac WebKit yet, and reference it in LayoutTests/platform/mac/Skipped. Looks perfect otherwise. > > Does this apply to chromium-mac too? The test is failing there: > > http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&tests=compositing%2Fwebgl%2Fwebgl-nonpremultiplied-blend.html&group=%40ToT%20GPU%20Mesa%20-%20chromium.org > > (chromium-mac does not use the mac Skipped file) The exclusion doesn't apply to Chromium's Mac port; it's Core Animation-specific and so only applies to Safari. The various failures need to be investigated. John, could you please file a new bug tracking them? 84121 2011-02-28 14:28:10 -0800 2011-02-28 14:43:01 -0800 Patch bug-55411-20110228142808.patch text/plain 8009 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZDg2ZjVhYWEzNGJlNmJlMTAxNGVj NDU2MzFiNDk1YTI3ZmRlYjAwLi42ZjExM2FmNzlkYWExZTE5M2E2ZmM1MWZhNjg5YmNkZjlkZDEw OWNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDItMjggIEpvaG4gQmF1bWFuICA8amJh dW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBwcmVtdWx0aXBsaWVkQWxwaGEgV2ViR0wgY29udGV4dCBh dHRyaWJ1dGUgaXMgaWdub3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1NDExCisKKyAgICAgICAgKiBjb21wb3NpdGluZy93ZWJnbC93ZWJnbC1u b25wcmVtdWx0aXBsaWVkLWJsZW5kLmh0bWw6IEFkZGVkLgorCiAyMDExLTAyLTI4ICBDaGFuZyBT aHUgIDxjc2h1QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRlbGUgUGV0ZXJz b24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25w cmVtdWx0aXBsaWVkLWJsZW5kLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy93ZWJnbC93 ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmVhMGJjODY5ZTA1 ZjFmYzc1M2IwMDU5ZmRhMTc1MzU4ZDNlZmIwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbApA QCAtMCwwICsxLDcyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICA8aGVhZD4KKyAgICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgICAgYm9keSB7CisgICAg ICAgIG91dGxpbmU6IDEwcHggc29saWQgdHJhbnNwYXJlbnQ7IC8qIGFmZmVjdHMgbGF5ZXIgc2l6 ZXMgKi8KKyAgICAgIH0KKyAgICAgIC5jYW52YXMgeworICAgICAgICBtYXJnaW46IDIwcHg7Cisg ICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAxMjgsIDAuMCk7CisgICAgICB9CisgICAgCisgICAg ICAuY29tcGFyZSB7CisgICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgICAgd2lkdGg6IDIwMHB4 OworICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2Jh KDAsIDAsIDEyOCwgMC41KTsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQ+Cisg ICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICBsYXlv dXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktpdFdlYkdMRW5hYmxlZCIs ICIxIik7CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdFdlYkdMKGNhbnZhc05hbWUsIHZzaGFkZXIs IGZzaGFkZXIsIGF0dHJpYnMsIGNsZWFyQ29sb3IsIGNsZWFyRGVwdGgsIHByZW11bHRBbHBoYSkK KyAgICAgICAgeworICAgICAgICAgICAgdmFyIGNhbnZhcyA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKGNhbnZhc05hbWUpOworICAgICAgICAgICAgdmFyIGdsID0gY2FudmFzLmdldENvbnRleHQo ImV4cGVyaW1lbnRhbC13ZWJnbCIsIHtwcmVtdWx0aXBsaWVkQWxwaGE6IHByZW11bHRBbHBoYX0p OworICAgICAgICAgICAgaWYgKCFnbCkgeworICAgICAgICAgICAgICAgIGFsZXJ0KCJObyBXZWJH TCBjb250ZXh0IGZvdW5kIik7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIGdsLmNsZWFyQ29sb3IoY2xlYXJDb2xvclswXSwgY2xlYXJD b2xvclsxXSwgY2xlYXJDb2xvclsyXSwgY2xlYXJDb2xvclszXSk7CisgICAgICAgICAgICBnbC5j bGVhckRlcHRoKGNsZWFyRGVwdGgpOworCisgICAgICAgICAgICBnbC5lbmFibGUoZ2wuREVQVEhf VEVTVCk7CisgICAgICAgICAgICBnbC5lbmFibGUoZ2wuQkxFTkQpOworICAgICAgICAgICAgZ2wu YmxlbmRGdW5jKGdsLlNSQ19BTFBIQSwgZ2wuT05FKTsKKworICAgICAgICAgICAgcmV0dXJuIGds OworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gZHJhd0NhbnZhcyhjYW52YXNJRCwgcHJl bXVsdEFscGhhKQorICAgICAgICB7CisgICAgICAgICAgdmFyIGJsdWVDb2xvciA9IDEyOC4wIC8g MjU1LjAgKiAocHJlbXVsdEFscGhhID8gMC41IDogMS4wKTsKKyAgICAgICAgICB2YXIgZ2wgPSBp bml0V2ViR0woY2FudmFzSUQsICIiLCAiIiwgW10sIFsgMCwgMCwgYmx1ZUNvbG9yLCAwLjUgXSwg MSwgcHJlbXVsdEFscGhhKTsKKyAgICAgICAgICBnbC52aWV3cG9ydCgwLCAwLCAyMDAsIDIwMCk7 CisgICAgICAgICAgZ2wuY2xlYXIoZ2wuQ09MT1JfQlVGRkVSX0JJVCB8IGdsLkRFUFRIX0JVRkZF Ul9CSVQpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpCisgICAgICAgIHsK KyAgICAgICAgICBkcmF3Q2FudmFzKCdjYW52YXMxJywgZmFsc2UpOworICAgICAgICAgIGRyYXdD YW52YXMoJ2NhbnZhczInLCB0cnVlKTsKKyAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnY2FudmFzMycpLmdldENvbnRleHQoJzJkJykuZHJhd0ltYWdlKGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdjYW52YXMxJyksIDAsIDApOworICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdjYW52YXM0JykuZ2V0Q29udGV4dCgnMmQnKS5kcmF3SW1hZ2UoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2NhbnZhczInKSwgMCwgMCk7CisgICAgICAgfQorICAgIDwvc2NyaXB0PgorICA8 L2hlYWQ+CisgIDxib2R5IG9ubG9hZD0iaW5pdCgpIj4KKyAgIAorICAgIDxkaXYgY2xhc3M9ImNv bXBhcmUiPjwvZGl2PgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZhcyIgaWQ9ImNhbnZhczEiIHN0 eWxlPSJsZWZ0OiAyMHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PC9jYW52YXM+CisgICAg PGNhbnZhcyBjbGFzcz0iY2FudmFzIiBpZD0iY2FudmFzMiIgc3R5bGU9ImxlZnQ6IDIwcHgiIHdp ZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48L2NhbnZhcz4KKyAgICA8Y2FudmFzIGNsYXNzPSJjYW52 YXMiIGlkPSJjYW52YXMzIiBzdHlsZT0ibGVmdDogMjBweCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIy MDAiPjwvY2FudmFzPgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZhcyIgaWQ9ImNhbnZhczQiIHN0 eWxlPSJsZWZ0OiAyMHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PC9jYW52YXM+CisKKyAg ICA8cD5Ub3AgYW5kIGFsbCBib3R0b20gc2hvdWxkIGxvb2sgdGhlIHNhbWUuPC9wPgorICA8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWIzNmNhZjI0OWM4NzE1NTMxZWJiODFjYzljMThh ZTU0NzM2ZDY5Mi4uMWMzNTU3OTVkNmEwOGY5NDYzYWZkYWViOTE0MWNjNjYxMzYxMjFmYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTAyLTI4ICBKb2huIEJhdW1hbiAgPGpiYXVt YW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtjaHJvbWl1bV0gcHJlbXVsdGlwbGllZEFscGhhIFdlYkdMIGNvbnRleHQgYXR0 cmlidXRlIGlzIGlnbm9yZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NTQxMQorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL3dlYmdsL3dlYmds LW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD YW52YXNMYXllckNocm9taXVtOjpDYW52YXNMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNv cmU6OkNhbnZhc0xheWVyQ2hyb21pdW06OmRyYXcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGV4dCk6CisKIDIwMTEtMDItMjggIE9saXZlciBI dW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJy YWNsb3VnaC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNzYwOTkxNzU5 MTAzMzBkYWIwYjQ3ZjhjOGJmZmEzNzU4N2U4M2Y0Ny4uMDI2NDg2ODk5MjRjMTYwNzE1ZmY0YzJi OWM0Zjg3NDgxZmY4YTE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKQEAg LTQ2LDYgKzQ2LDcgQEAgQ2FudmFzTGF5ZXJDaHJvbWl1bTo6Q2FudmFzTGF5ZXJDaHJvbWl1bShH cmFwaGljc0xheWVyQ2hyb21pdW0qIG93bmVyKQogICAgIDogTGF5ZXJDaHJvbWl1bShvd25lcikK ICAgICAsIG1fdGV4dHVyZUNoYW5nZWQodHJ1ZSkKICAgICAsIG1fdGV4dHVyZUlkKDApCisgICAg LCBtX3ByZW11bHRpcGxpZWRBbHBoYSh0cnVlKQogewogfQogCkBAIC02MSw2ICs2Miw4IEBAIHZv aWQgQ2FudmFzTGF5ZXJDaHJvbWl1bTo6ZHJhdygpCiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQgPSBsYXllclJlbmRlcmVyQ29udGV4dCgpOwogICAgIEdMQyhjb250ZXh0LCBjb250ZXh0 LT5hY3RpdmVUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFMCkpOwogICAgIEdMQyhj b250ZXh0LCBjb250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8y RCwgbV90ZXh0dXJlSWQpKTsKKyAgICBHQzNEZW51bSBzZmFjdG9yID0gbV9wcmVtdWx0aXBsaWVk QWxwaGEgPyBHcmFwaGljc0NvbnRleHQzRDo6T05FIDogR3JhcGhpY3NDb250ZXh0M0Q6OlNSQ19B TFBIQTsKKyAgICBHTEMoY29udGV4dCwgY29udGV4dC0+YmxlbmRGdW5jKHNmYWN0b3IsIEdyYXBo aWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JDX0FMUEhBKSk7CiAgICAgbGF5ZXJSZW5kZXJlcigp LT51c2VTaGFkZXIocHJvZ3JhbS0+cHJvZ3JhbSgpKTsKICAgICBHTEMoY29udGV4dCwgY29udGV4 dC0+dW5pZm9ybTFpKHByb2dyYW0tPmZyYWdtZW50U2hhZGVyKCkuc2FtcGxlckxvY2F0aW9uKCks IDApKTsKICAgICBkcmF3VGV4dHVyZWRRdWFkKGNvbnRleHQsIGxheWVyUmVuZGVyZXIoKS0+cHJv amVjdGlvbk1hdHJpeCgpLCBjY0xheWVySW1wbCgpLT5kcmF3VHJhbnNmb3JtKCksCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXll ckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D YW52YXNMYXllckNocm9taXVtLmgKaW5kZXggOTgxMWIwNjVjYmM2MTkwNjE1ODk4ZmE2ODRjYmEz OWRjZjhhMWU4Zi4uZjk0NzIyYzk3N2EzZGVjMDQ3YjA4NjY1NWUzZmRiNzQ3ODdjMzk2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFz TGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaApAQCAtNTEsNiArNTEsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgZXhwbGljaXQgQ2FudmFzTGF5ZXJDaHJvbWl1bShHcmFwaGljc0xheWVyQ2hyb21pdW0q IG93bmVyKTsKICAgICBib29sIG1fdGV4dHVyZUNoYW5nZWQ7CiAgICAgdW5zaWduZWQgbV90ZXh0 dXJlSWQ7CisgICAgYm9vbCBtX3ByZW11bHRpcGxpZWRBbHBoYTsKIAogcHJpdmF0ZToKICAgICBz dGF0aWMgdW5zaWduZWQgbV9zaGFkZXJQcm9ncmFtSWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJD aHJvbWl1bS5jcHAKaW5kZXggMjU3M2VkM2RlMGUwODc5ZmJhN2VjOTU5Y2RlM2IyNDllMjIzNGIx YS4uZDRjMTgyYzg4YzdmZTRlMmRiNGYyOWEzZDZmZmFlNjE2ZjQyZTYzMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NvbnRlbnRMYXllckNocm9taXVtLmNwcApAQCAtMzQwLDYgKzM0MCw3IEBAIHZvaWQgQ29udGVu dExheWVyQ2hyb21pdW06OmRyYXcoKQogICAgIGJpbmRDb250ZW50c1RleHR1cmUoKTsKICAgICBs YXllclJlbmRlcmVyKCktPnVzZVNoYWRlcihwcm9ncmFtLT5wcm9ncmFtKCkpOwogICAgIEdMQyhj b250ZXh0LCBjb250ZXh0LT51bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1w bGVyTG9jYXRpb24oKSwgMCkpOworICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5ibGVuZEZ1bmMo R3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNf QUxQSEEpKTsKIAogICAgIGlmIChyZXF1aXJlc0NsaXBwZWRVcGRhdGVSZWN0KCkpIHsKICAgICAg ICAgZmxvYXQgbTQzID0gY2NMYXllckltcGwoKS0+ZHJhd1RyYW5zZm9ybSgpLm00MygpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xM YXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNWIzNGJiOWExYWVjODY3Nzk3NjE5NmU3 MmMyMjk0YTE3NmZlMDZkNi4uZTgzZDA0NTZhNWM1ZWE1ODJiZmE3MWE0YmQ3NzRkYzY3ZTBlODc1 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v V2ViR0xMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCkBAIC04Miw2ICs4Miw3IEBAIHZv aWQgV2ViR0xMYXllckNocm9taXVtOjpzZXRDb250ZXh0KGNvbnN0IEdyYXBoaWNzQ29udGV4dDNE KiBjb250ZXh0KQogICAgIGlmICh0ZXh0dXJlSWQgIT0gbV90ZXh0dXJlSWQpCiAgICAgICAgIG1f dGV4dHVyZUNoYW5nZWQgPSB0cnVlOwogICAgIG1fdGV4dHVyZUlkID0gdGV4dHVyZUlkOworICAg IG1fcHJlbXVsdGlwbGllZEFscGhhID0gbV9jb250ZXh0LT5nZXRDb250ZXh0QXR0cmlidXRlcygp LnByZW11bHRpcGxpZWRBbHBoYTsKIH0KIAogfQo= 84126 2011-02-28 14:43:03 -0800 2011-02-28 16:03:02 -0800 Patch bug-55411-20110228144302.patch text/plain 9437 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZDg2ZjVhYWEzNGJlNmJlMTAxNGVj NDU2MzFiNDk1YTI3ZmRlYjAwLi5mMjY1NWM0NmJmMWM5M2IwMzVkYWE5NDEzNTZmMTgxZmUxNWFk MmE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDItMjggIEpvaG4gQmF1bWFuICA8amJh dW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBwcmVtdWx0aXBsaWVkQWxwaGEgV2ViR0wgY29udGV4dCBh dHRyaWJ1dGUgaXMgaWdub3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1NDExCisKKyAgICAgICAgQWRkIHRlc3QgY2FzZSBmb3IgcHJlbXVsdGlw bGllZC1hbHBoYSBkcmF3SW1hZ2UgYW5kIHRoZSBjb21wb3NpdG9yLgorCisgICAgICAgICogY29t cG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sOiBBZGRlZC4K KwogMjAxMS0wMi0yOCAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sIGIvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmZlYTBiYzg2OWUwNWYxZmM3NTNiMDA1OWZkYTE3NTM1OGQzZWZiMDIKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVt dWx0aXBsaWVkLWJsZW5kLmh0bWwKQEAgLTAsMCArMSw3MiBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKyAgPGhlYWQ+CisgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVu Ij4KKyAgICAgIGJvZHkgeworICAgICAgICBvdXRsaW5lOiAxMHB4IHNvbGlkIHRyYW5zcGFyZW50 OyAvKiBhZmZlY3RzIGxheWVyIHNpemVzICovCisgICAgICB9CisgICAgICAuY2FudmFzIHsKKyAg ICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdo dDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMTI4LCAwLjAp OworICAgICAgfQorICAgIAorICAgICAgLmNvbXBhcmUgeworICAgICAgICBtYXJnaW46IDIwcHg7 CisgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAxMjgsIDAuNSk7CisgICAgICB9CisgICAgPC9z dHlsZT4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNl KCJXZWJLaXRXZWJHTEVuYWJsZWQiLCAiMSIpOworCisgICAgICAgIGZ1bmN0aW9uIGluaXRXZWJH TChjYW52YXNOYW1lLCB2c2hhZGVyLCBmc2hhZGVyLCBhdHRyaWJzLCBjbGVhckNvbG9yLCBjbGVh ckRlcHRoLCBwcmVtdWx0QWxwaGEpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBjYW52YXMg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChjYW52YXNOYW1lKTsKKyAgICAgICAgICAgIHZhciBn bCA9IGNhbnZhcy5nZXRDb250ZXh0KCJleHBlcmltZW50YWwtd2ViZ2wiLCB7cHJlbXVsdGlwbGll ZEFscGhhOiBwcmVtdWx0QWxwaGF9KTsKKyAgICAgICAgICAgIGlmICghZ2wpIHsKKyAgICAgICAg ICAgICAgICBhbGVydCgiTm8gV2ViR0wgY29udGV4dCBmb3VuZCIpOworICAgICAgICAgICAgICAg IHJldHVybiBudWxsOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBnbC5jbGVhckNvbG9y KGNsZWFyQ29sb3JbMF0sIGNsZWFyQ29sb3JbMV0sIGNsZWFyQ29sb3JbMl0sIGNsZWFyQ29sb3Jb M10pOworICAgICAgICAgICAgZ2wuY2xlYXJEZXB0aChjbGVhckRlcHRoKTsKKworICAgICAgICAg ICAgZ2wuZW5hYmxlKGdsLkRFUFRIX1RFU1QpOworICAgICAgICAgICAgZ2wuZW5hYmxlKGdsLkJM RU5EKTsKKyAgICAgICAgICAgIGdsLmJsZW5kRnVuYyhnbC5TUkNfQUxQSEEsIGdsLk9ORSk7CisK KyAgICAgICAgICAgIHJldHVybiBnbDsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGRy YXdDYW52YXMoY2FudmFzSUQsIHByZW11bHRBbHBoYSkKKyAgICAgICAgeworICAgICAgICAgIHZh ciBibHVlQ29sb3IgPSAxMjguMCAvIDI1NS4wICogKHByZW11bHRBbHBoYSA/IDAuNSA6IDEuMCk7 CisgICAgICAgICAgdmFyIGdsID0gaW5pdFdlYkdMKGNhbnZhc0lELCAiIiwgIiIsIFtdLCBbIDAs IDAsIGJsdWVDb2xvciwgMC41IF0sIDEsIHByZW11bHRBbHBoYSk7CisgICAgICAgICAgZ2wudmll d3BvcnQoMCwgMCwgMjAwLCAyMDApOworICAgICAgICAgIGdsLmNsZWFyKGdsLkNPTE9SX0JVRkZF Ul9CSVQgfCBnbC5ERVBUSF9CVUZGRVJfQklUKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0 aW9uIGluaXQoKQorICAgICAgICB7CisgICAgICAgICAgZHJhd0NhbnZhcygnY2FudmFzMScsIGZh bHNlKTsKKyAgICAgICAgICBkcmF3Q2FudmFzKCdjYW52YXMyJywgdHJ1ZSk7CisgICAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NhbnZhczMnKS5nZXRDb250ZXh0KCcyZCcpLmRyYXdJ bWFnZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY2FudmFzMScpLCAwLCAwKTsKKyAgICAgICAg ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY2FudmFzNCcpLmdldENvbnRleHQoJzJkJykuZHJh d0ltYWdlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMyJyksIDAsIDApOworICAgICAg IH0KKyAgICA8L3NjcmlwdD4KKyAgPC9oZWFkPgorICA8Ym9keSBvbmxvYWQ9ImluaXQoKSI+Cisg ICAKKyAgICA8ZGl2IGNsYXNzPSJjb21wYXJlIj48L2Rpdj4KKyAgICA8Y2FudmFzIGNsYXNzPSJj YW52YXMiIGlkPSJjYW52YXMxIiBzdHlsZT0ibGVmdDogMjBweCIgd2lkdGg9IjIwMCIgaGVpZ2h0 PSIyMDAiPjwvY2FudmFzPgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZhcyIgaWQ9ImNhbnZhczIi IHN0eWxlPSJsZWZ0OiAyMHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PC9jYW52YXM+Cisg ICAgPGNhbnZhcyBjbGFzcz0iY2FudmFzIiBpZD0iY2FudmFzMyIgc3R5bGU9ImxlZnQ6IDIwcHgi IHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj48L2NhbnZhcz4KKyAgICA8Y2FudmFzIGNsYXNzPSJj YW52YXMiIGlkPSJjYW52YXM0IiBzdHlsZT0ibGVmdDogMjBweCIgd2lkdGg9IjIwMCIgaGVpZ2h0 PSIyMDAiPjwvY2FudmFzPgorCisgICAgPHA+VG9wIGFuZCBhbGwgYm90dG9tIHNob3VsZCBsb29r IHRoZSBzYW1lLjwvcD4KKyAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDliMzZjYWYy NDljODcxNTUzMWViYjgxY2M5YzE4YWU1NDczNmQ2OTIuLjU4NzEyMTc1NWZkYjY4ZjIyMzA1NzA1 MWZmZTE5ZmFjOTU3NmJmMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wMi0y OCAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIHByZW11bHRpcGxpZWRB bHBoYSBXZWJHTCBjb250ZXh0IGF0dHJpYnV0ZSBpcyBpZ25vcmVkLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU0MTEKKworICAgICAgICBVcGRhdGUg Y29tcG9zaXRvciB0byBzZXQgdGhlIGJsZW5kaW5nIG9mIGVhY2ggbGF5ZXIgY29ycmVjdGx5Lgor CisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQt YmxlbmQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFz TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNMYXllckNocm9taXVt OjpDYW52YXNMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0xheWVyQ2hy b21pdW06OmRyYXcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZh c0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D b250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50TGF5ZXJD aHJvbWl1bTo6ZHJhdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJD aHJvbWl1bTo6ZHJhd0xheWVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vV2ViR0xMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMTGF5ZXJD aHJvbWl1bTo6c2V0Q29udGV4dCk6CisKIDIwMTEtMDItMjggIE9saXZlciBIdW50ICA8b2xpdmVy QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZh c0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNzYwOTkxNzU5MTAzMzBkYWIwYjQ3 ZjhjOGJmZmEzNzU4N2U4M2Y0Ny4uMDI2NDg2ODk5MjRjMTYwNzE1ZmY0YzJiOWM0Zjg3NDgxZmY4 YTE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQ2LDYgKzQ2LDcg QEAgQ2FudmFzTGF5ZXJDaHJvbWl1bTo6Q2FudmFzTGF5ZXJDaHJvbWl1bShHcmFwaGljc0xheWVy Q2hyb21pdW0qIG93bmVyKQogICAgIDogTGF5ZXJDaHJvbWl1bShvd25lcikKICAgICAsIG1fdGV4 dHVyZUNoYW5nZWQodHJ1ZSkKICAgICAsIG1fdGV4dHVyZUlkKDApCisgICAgLCBtX3ByZW11bHRp cGxpZWRBbHBoYSh0cnVlKQogewogfQogCkBAIC02MSw2ICs2Miw4IEBAIHZvaWQgQ2FudmFzTGF5 ZXJDaHJvbWl1bTo6ZHJhdygpCiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQgPSBsYXll clJlbmRlcmVyQ29udGV4dCgpOwogICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5hY3RpdmVUZXh0 dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFMCkpOwogICAgIEdMQyhjb250ZXh0LCBjb250 ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgbV90ZXh0dXJl SWQpKTsKKyAgICBHQzNEZW51bSBzZmFjdG9yID0gbV9wcmVtdWx0aXBsaWVkQWxwaGEgPyBHcmFw aGljc0NvbnRleHQzRDo6T05FIDogR3JhcGhpY3NDb250ZXh0M0Q6OlNSQ19BTFBIQTsKKyAgICBH TEMoY29udGV4dCwgY29udGV4dC0+YmxlbmRGdW5jKHNmYWN0b3IsIEdyYXBoaWNzQ29udGV4dDNE OjpPTkVfTUlOVVNfU1JDX0FMUEhBKSk7CiAgICAgbGF5ZXJSZW5kZXJlcigpLT51c2VTaGFkZXIo cHJvZ3JhbS0+cHJvZ3JhbSgpKTsKICAgICBHTEMoY29udGV4dCwgY29udGV4dC0+dW5pZm9ybTFp KHByb2dyYW0tPmZyYWdtZW50U2hhZGVyKCkuc2FtcGxlckxvY2F0aW9uKCksIDApKTsKICAgICBk cmF3VGV4dHVyZWRRdWFkKGNvbnRleHQsIGxheWVyUmVuZGVyZXIoKS0+cHJvamVjdGlvbk1hdHJp eCgpLCBjY0xheWVySW1wbCgpLT5kcmF3VHJhbnNmb3JtKCksCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNo cm9taXVtLmgKaW5kZXggOTgxMWIwNjVjYmM2MTkwNjE1ODk4ZmE2ODRjYmEzOWRjZjhhMWU4Zi4u Zjk0NzIyYzk3N2EzZGVjMDQ3YjA4NjY1NWUzZmRiNzQ3ODdjMzk2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1 bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZh c0xheWVyQ2hyb21pdW0uaApAQCAtNTEsNiArNTEsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgZXhwbGlj aXQgQ2FudmFzTGF5ZXJDaHJvbWl1bShHcmFwaGljc0xheWVyQ2hyb21pdW0qIG93bmVyKTsKICAg ICBib29sIG1fdGV4dHVyZUNoYW5nZWQ7CiAgICAgdW5zaWduZWQgbV90ZXh0dXJlSWQ7CisgICAg Ym9vbCBtX3ByZW11bHRpcGxpZWRBbHBoYTsKIAogcHJpdmF0ZToKICAgICBzdGF0aWMgdW5zaWdu ZWQgbV9zaGFkZXJQcm9ncmFtSWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAK aW5kZXggMjU3M2VkM2RlMGUwODc5ZmJhN2VjOTU5Y2RlM2IyNDllMjIzNGIxYS4uZDRjMTgyYzg4 YzdmZTRlMmRiNGYyOWEzZDZmZmFlNjE2ZjQyZTYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXll ckNocm9taXVtLmNwcApAQCAtMzQwLDYgKzM0MCw3IEBAIHZvaWQgQ29udGVudExheWVyQ2hyb21p dW06OmRyYXcoKQogICAgIGJpbmRDb250ZW50c1RleHR1cmUoKTsKICAgICBsYXllclJlbmRlcmVy KCktPnVzZVNoYWRlcihwcm9ncmFtLT5wcm9ncmFtKCkpOwogICAgIEdMQyhjb250ZXh0LCBjb250 ZXh0LT51bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1wbGVyTG9jYXRpb24o KSwgMCkpOworICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250 ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKIAog ICAgIGlmIChyZXF1aXJlc0NsaXBwZWRVcGRhdGVSZWN0KCkpIHsKICAgICAgICAgZmxvYXQgbTQz ID0gY2NMYXllckltcGwoKS0+ZHJhd1RyYW5zZm9ybSgpLm00MygpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggYzRiODY4NzA4YTI1ZDdjMjUwMjU3MjQyMDIyYTRm YmRmZThjZmNhYy4uNjQ5MWM4MzU2NzYxNjZhYWE1YTJiYjU2ZTc3MDc5ZDcyMTkxM2E3ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJS ZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0yODksMTAgKzI4OSw3IEBA IHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IEludFJlY3QmIHZp c2libGVSZWN0LCBjb25zdCBJbnRSZWN0CiAgICAgbV9kZWZhdWx0UmVuZGVyU3VyZmFjZS0+bV9s YXllckxpc3QuY2xlYXIoKTsKICAgICB1cGRhdGVMYXllcnNSZWN1cnNpdmUobV9yb290TGF5ZXIu Z2V0KCksIGlkZW50aXR5TWF0cml4LCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LCBtX2RlZmF1bHRS ZW5kZXJTdXJmYWNlLT5tX2xheWVyTGlzdCk7CiAKLSAgICAvLyBUaGUgc2hhZGVyIHVzZWQgdG8g cmVuZGVyIGxheWVycyByZXR1cm5zIHByZS1tdWx0aXBsaWVkIGFscGhhIGNvbG9ycwotICAgIC8v IHNvIHdlIG5lZWQgdG8gc2VuZCB0aGUgYmxlbmRpbmcgbW9kZSBhcHByb3ByaWF0ZWx5LgogICAg IEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNE OjpCTEVORCkpOwotICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+YmxlbmRGdW5j KEdyYXBoaWNzQ29udGV4dDNEOjpPTkUsIEdyYXBoaWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JD X0FMUEhBKSk7CiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5lbmFibGUoR3Jh cGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkpOwogCiAgICAgLy8gVXBkYXRlIHRoZSBjb250 ZW50cyBvZiB0aGUgcmVuZGVyIHN1cmZhY2VzLiBXZSB0cmF2ZXJzZSB0aGUgYXJyYXkgZnJvbQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2Vi R0xMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNWIzNGJiOWExYWVjODY3Nzk3NjE5 NmU3MmMyMjk0YTE3NmZlMDZkNi4uZTgzZDA0NTZhNWM1ZWE1ODJiZmE3MWE0YmQ3NzRkYzY3ZTBl ODc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vV2ViR0xMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCkBAIC04Miw2ICs4Miw3IEBA IHZvaWQgV2ViR0xMYXllckNocm9taXVtOjpzZXRDb250ZXh0KGNvbnN0IEdyYXBoaWNzQ29udGV4 dDNEKiBjb250ZXh0KQogICAgIGlmICh0ZXh0dXJlSWQgIT0gbV90ZXh0dXJlSWQpCiAgICAgICAg IG1fdGV4dHVyZUNoYW5nZWQgPSB0cnVlOwogICAgIG1fdGV4dHVyZUlkID0gdGV4dHVyZUlkOwor ICAgIG1fcHJlbXVsdGlwbGllZEFscGhhID0gbV9jb250ZXh0LT5nZXRDb250ZXh0QXR0cmlidXRl cygpLnByZW11bHRpcGxpZWRBbHBoYTsKIH0KIAogfQo= 84143 2011-02-28 16:03:04 -0800 2011-03-01 14:18:08 -0800 Patch bug-55411-20110228160303.patch text/plain 9004 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5MDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZDg2ZjVhYWEzNGJlNmJlMTAxNGVj NDU2MzFiNDk1YTI3ZmRlYjAwLi40MjkyZGE3ZDAyZmJlOGE1ZGVjNmZiMTA3OGM0OTUwMWJiZDM0 NzFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDItMjggIEpvaG4gQmF1bWFuICA8amJh dW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBwcmVtdWx0aXBsaWVkQWxwaGEgV2ViR0wgY29udGV4dCBh dHRyaWJ1dGUgaXMgaWdub3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1NDExCisKKyAgICAgICAgQWRkIHRlc3QgY2FzZSBmb3IgKG5vbi0pcHJl bXVsdGlwbGllZC1hbHBoYSBjb21wb3NpdGluZy4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3dl YmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDIt MjggIENoYW5nIFNodSAgPGNzaHVAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGVsZSBQZXRlcnNvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3dlYmds L3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4z YTAwNjA3NGMwZTcwZjU0Mjc0YTc1MDEzODMyOTljNDMxMjg1YjRiCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1i bGVuZC5odG1sCkBAIC0wLDAgKzEsNjggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgIDxo ZWFkPgorICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgICBi b2R5IHsKKyAgICAgICAgb3V0bGluZTogMTBweCBzb2xpZCB0cmFuc3BhcmVudDsgLyogYWZmZWN0 cyBsYXllciBzaXplcyAqLworICAgICAgfQorICAgICAgLmNhbnZhcyB7CisgICAgICAgIG1hcmdp bjogMjBweDsKKyAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICBoZWlnaHQ6IDIwMHB4Owor ICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAsIDEyOCwgMC4wKTsKKyAgICAgIH0K KyAgICAKKyAgICAgIC5jb21wYXJlIHsKKyAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgICB3 aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYmEoMCwgMCwgMTI4LCAwLjUpOworICAgICAgfQorICAgIDwvc3R5bGU+CisgICAg PHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0V2Vi R0xFbmFibGVkIiwgIjEiKTsKKworICAgICAgICBmdW5jdGlvbiBpbml0V2ViR0woY2FudmFzTmFt ZSwgdnNoYWRlciwgZnNoYWRlciwgYXR0cmlicywgY2xlYXJDb2xvciwgY2xlYXJEZXB0aCwgcHJl bXVsdEFscGhhKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgY2FudmFzID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoY2FudmFzTmFtZSk7CisgICAgICAgICAgICB2YXIgZ2wgPSBjYW52YXMu Z2V0Q29udGV4dCgiZXhwZXJpbWVudGFsLXdlYmdsIiwge3ByZW11bHRpcGxpZWRBbHBoYTogcHJl bXVsdEFscGhhfSk7CisgICAgICAgICAgICBpZiAoIWdsKSB7CisgICAgICAgICAgICAgICAgYWxl cnQoIk5vIFdlYkdMIGNvbnRleHQgZm91bmQiKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs bDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZ2wuY2xlYXJDb2xvcihjbGVhckNvbG9y WzBdLCBjbGVhckNvbG9yWzFdLCBjbGVhckNvbG9yWzJdLCBjbGVhckNvbG9yWzNdKTsKKyAgICAg ICAgICAgIGdsLmNsZWFyRGVwdGgoY2xlYXJEZXB0aCk7CisKKyAgICAgICAgICAgIGdsLmVuYWJs ZShnbC5ERVBUSF9URVNUKTsKKyAgICAgICAgICAgIGdsLmVuYWJsZShnbC5CTEVORCk7CisgICAg ICAgICAgICBnbC5ibGVuZEZ1bmMoZ2wuU1JDX0FMUEhBLCBnbC5PTkUpOworCisgICAgICAgICAg ICByZXR1cm4gZ2w7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBkcmF3Q2FudmFzKGNh bnZhc0lELCBwcmVtdWx0QWxwaGEpCisgICAgICAgIHsKKyAgICAgICAgICB2YXIgYmx1ZUNvbG9y ID0gMTI4LjAgLyAyNTUuMCAqIChwcmVtdWx0QWxwaGEgPyAwLjUgOiAxLjApOworICAgICAgICAg IHZhciBnbCA9IGluaXRXZWJHTChjYW52YXNJRCwgIiIsICIiLCBbXSwgWyAwLCAwLCBibHVlQ29s b3IsIDAuNSBdLCAxLCBwcmVtdWx0QWxwaGEpOworICAgICAgICAgIGdsLnZpZXdwb3J0KDAsIDAs IDIwMCwgMjAwKTsKKyAgICAgICAgICBnbC5jbGVhcihnbC5DT0xPUl9CVUZGRVJfQklUIHwgZ2wu REVQVEhfQlVGRkVSX0JJVCk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBpbml0KCkK KyAgICAgICAgeworICAgICAgICAgIGRyYXdDYW52YXMoJ2NhbnZhczEnLCBmYWxzZSk7CisgICAg ICAgICAgZHJhd0NhbnZhcygnY2FudmFzMicsIHRydWUpOworICAgICAgIH0KKyAgICA8L3Njcmlw dD4KKyAgPC9oZWFkPgorICA8Ym9keSBvbmxvYWQ9ImluaXQoKSI+CisgICAKKyAgICA8ZGl2IGNs YXNzPSJjb21wYXJlIj48L2Rpdj4KKyAgICA8Y2FudmFzIGNsYXNzPSJjYW52YXMiIGlkPSJjYW52 YXMxIiBzdHlsZT0ibGVmdDogMjBweCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjwvY2FudmFz PgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZhcyIgaWQ9ImNhbnZhczIiIHN0eWxlPSJsZWZ0OiAy MHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PC9jYW52YXM+CisKKyAgICA8cD5Ub3AgYW5k IGFsbCBib3R0b20gc2hvdWxkIGxvb2sgdGhlIHNhbWUuPC9wPgorICA8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggOWIzNmNhZjI0OWM4NzE1NTMxZWJiODFjYzljMThhZTU0NzM2ZDY5Mi4u NTg3MTIxNzU1ZmRiNjhmMjIzMDU3MDUxZmZlMTlmYWM5NTc2YmYyOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI1IEBACisyMDExLTAyLTI4ICBKb2huIEJhdW1hbiAgPGpiYXVtYW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtj aHJvbWl1bV0gcHJlbXVsdGlwbGllZEFscGhhIFdlYkdMIGNvbnRleHQgYXR0cmlidXRlIGlzIGln bm9yZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NTQxMQorCisgICAgICAgIFVwZGF0ZSBjb21wb3NpdG9yIHRvIHNldCB0aGUgYmxlbmRpbmcgb2Yg ZWFjaCBsYXllciBjb3JyZWN0bHkuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvd2ViZ2wv d2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNhbnZhc0xheWVyQ2hyb21pdW06OkNhbnZhc0xheWVyQ2hyb21pdW0pOgorICAgICAgICAo V2ViQ29yZTo6Q2FudmFzTGF5ZXJDaHJvbWl1bTo6ZHJhdyk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNvbnRlbnRMYXllckNocm9taXVtOjpkcmF3KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6V2ViR0xMYXllckNocm9taXVtOjpzZXRDb250ZXh0KToKKwogMjAxMS0wMi0y OCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEdhdmluIEJhcnJhY2xvdWdoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcAppbmRl eCA3NjA5OTE3NTkxMDMzMGRhYjBiNDdmOGM4YmZmYTM3NTg3ZTgzZjQ3Li4wMjY0ODY4OTkyNGMx NjA3MTVmZjRjMmI5YzRmODc0ODFmZjhhMTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9t aXVtLmNwcApAQCAtNDYsNiArNDYsNyBAQCBDYW52YXNMYXllckNocm9taXVtOjpDYW52YXNMYXll ckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSogb3duZXIpCiAgICAgOiBMYXllckNocm9t aXVtKG93bmVyKQogICAgICwgbV90ZXh0dXJlQ2hhbmdlZCh0cnVlKQogICAgICwgbV90ZXh0dXJl SWQoMCkKKyAgICAsIG1fcHJlbXVsdGlwbGllZEFscGhhKHRydWUpCiB7CiB9CiAKQEAgLTYxLDYg KzYyLDggQEAgdm9pZCBDYW52YXNMYXllckNocm9taXVtOjpkcmF3KCkKICAgICBHcmFwaGljc0Nv bnRleHQzRCogY29udGV4dCA9IGxheWVyUmVuZGVyZXJDb250ZXh0KCk7CiAgICAgR0xDKGNvbnRl eHQsIGNvbnRleHQtPmFjdGl2ZVRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwKSk7 CiAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNE OjpURVhUVVJFXzJELCBtX3RleHR1cmVJZCkpOworICAgIEdDM0RlbnVtIHNmYWN0b3IgPSBtX3By ZW11bHRpcGxpZWRBbHBoYSA/IEdyYXBoaWNzQ29udGV4dDNEOjpPTkUgOiBHcmFwaGljc0NvbnRl eHQzRDo6U1JDX0FMUEhBOworICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5ibGVuZEZ1bmMoc2Zh Y3RvciwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBsYXll clJlbmRlcmVyKCktPnVzZVNoYWRlcihwcm9ncmFtLT5wcm9ncmFtKCkpOwogICAgIEdMQyhjb250 ZXh0LCBjb250ZXh0LT51bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1wbGVy TG9jYXRpb24oKSwgMCkpOwogICAgIGRyYXdUZXh0dXJlZFF1YWQoY29udGV4dCwgbGF5ZXJSZW5k ZXJlcigpLT5wcm9qZWN0aW9uTWF0cml4KCksIGNjTGF5ZXJJbXBsKCktPmRyYXdUcmFuc2Zvcm0o KSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NhbnZhc0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaAppbmRleCA5ODExYjA2NWNiYzYxOTA2MTU4 OThmYTY4NGNiYTM5ZGNmOGExZThmLi5mOTQ3MjJjOTc3YTNkZWMwNDdiMDg2NjU1ZTNmZGI3NDc4 N2MzOTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9DYW52YXNMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oCkBAIC01MSw2ICs1MSw3IEBA IHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBDYW52YXNMYXllckNocm9taXVtKEdyYXBoaWNzTGF5 ZXJDaHJvbWl1bSogb3duZXIpOwogICAgIGJvb2wgbV90ZXh0dXJlQ2hhbmdlZDsKICAgICB1bnNp Z25lZCBtX3RleHR1cmVJZDsKKyAgICBib29sIG1fcHJlbXVsdGlwbGllZEFscGhhOwogCiBwcml2 YXRlOgogICAgIHN0YXRpYyB1bnNpZ25lZCBtX3NoYWRlclByb2dyYW1JZDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nv bnRlbnRMYXllckNocm9taXVtLmNwcAppbmRleCAyNTczZWQzZGUwZTA4NzlmYmE3ZWM5NTljZGUz YjI0OWUyMjM0YjFhLi5kNGMxODJjODhjN2ZlNGUyZGI0ZjI5YTNkNmZmYWU2MTZmNDJlNjMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250 ZW50TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zNDAsNiArMzQwLDcgQEAg dm9pZCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdygpCiAgICAgYmluZENvbnRlbnRzVGV4dHVy ZSgpOwogICAgIGxheWVyUmVuZGVyZXIoKS0+dXNlU2hhZGVyKHByb2dyYW0tPnByb2dyYW0oKSk7 CiAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPnVuaWZvcm0xaShwcm9ncmFtLT5mcmFnbWVudFNo YWRlcigpLnNhbXBsZXJMb2NhdGlvbigpLCAwKSk7CisgICAgR0xDKGNvbnRleHQsIGNvbnRleHQt PmJsZW5kRnVuYyhHcmFwaGljc0NvbnRleHQzRDo6T05FLCBHcmFwaGljc0NvbnRleHQzRDo6T05F X01JTlVTX1NSQ19BTFBIQSkpOwogCiAgICAgaWYgKHJlcXVpcmVzQ2xpcHBlZFVwZGF0ZVJlY3Qo KSkgewogICAgICAgICBmbG9hdCBtNDMgPSBjY0xheWVySW1wbCgpLT5kcmF3VHJhbnNmb3JtKCku bTQzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBjNGI4Njg3 MDhhMjVkN2MyNTAyNTcyNDIwMjJhNGZiZGZlOGNmY2FjLi42NDkxYzgzNTY3NjE2NmFhYTVhMmJi NTZlNzcwNzlkNzIxOTEzYTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5j cHAKQEAgLTI4OSwxMCArMjg5LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdM YXllcnMoY29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QKICAgICBtX2Rl ZmF1bHRSZW5kZXJTdXJmYWNlLT5tX2xheWVyTGlzdC5jbGVhcigpOwogICAgIHVwZGF0ZUxheWVy c1JlY3Vyc2l2ZShtX3Jvb3RMYXllci5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIHJlbmRlclN1cmZh Y2VMYXllckxpc3QsIG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPm1fbGF5ZXJMaXN0KTsKIAotICAg IC8vIFRoZSBzaGFkZXIgdXNlZCB0byByZW5kZXIgbGF5ZXJzIHJldHVybnMgcHJlLW11bHRpcGxp ZWQgYWxwaGEgY29sb3JzCi0gICAgLy8gc28gd2UgbmVlZCB0byBzZW5kIHRoZSBibGVuZGluZyBt b2RlIGFwcHJvcHJpYXRlbHkuCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5l bmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQo KSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3ND b250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBHTEMobV9jb250ZXh0LmdldCgp LCBtX2NvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7CiAK ICAgICAvLyBVcGRhdGUgdGhlIGNvbnRlbnRzIG9mIHRoZSByZW5kZXIgc3VyZmFjZXMuIFdlIHRy YXZlcnNlIHRoZSBhcnJheSBmcm9tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcAppbmRl eCA1YjM0YmI5YTFhZWM4Njc3OTc2MTk2ZTcyYzIyOTRhMTc2ZmUwNmQ2Li5lODNkMDQ1NmE1YzVl YTU4MmJmYTcxYTRiZDc3NGRjNjdlMGU4NzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1 bS5jcHAKQEAgLTgyLDYgKzgyLDcgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldENvbnRl eHQoY29uc3QgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgaWYgKHRleHR1cmVJZCAh PSBtX3RleHR1cmVJZCkKICAgICAgICAgbV90ZXh0dXJlQ2hhbmdlZCA9IHRydWU7CiAgICAgbV90 ZXh0dXJlSWQgPSB0ZXh0dXJlSWQ7CisgICAgbV9wcmVtdWx0aXBsaWVkQWxwaGEgPSBtX2NvbnRl eHQtPmdldENvbnRleHRBdHRyaWJ1dGVzKCkucHJlbXVsdGlwbGllZEFscGhhOwogfQogCiB9Cg== 84292 2011-03-01 14:18:10 -0800 2011-03-02 20:03:48 -0800 Patch bug-55411-20110301141809.patch text/plain 12598 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5NjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2ZTRkYzE0ZjliMjJlMmJhZmYxNjE5 YTFiYmFmNWI4MjdiYTk5MzY1Li41YWE2YWI5ZmJkNDExNGFjMmNlMjdlY2VkMmJmYWJjZTEyNDBk M2IyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDMtMDEgIEpvaG4gQmF1bWFuICA8amJh dW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBwcmVtdWx0aXBsaWVkQWxwaGEgV2ViR0wgY29udGV4dCBh dHRyaWJ1dGUgaXMgaWdub3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1NDExCisKKyAgICAgICAgQWRkIHRlc3QgY2FzZSBmb3IgKG5vbi0pcHJl bXVsdGlwbGllZC1hbHBoYSBjb21wb3NpdGluZy4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3dl YmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbDogQWRkZWQuCisgICAgICAgICog cGxhdGZvcm0vY2hyb21pdW0tZ3B1L2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRp cGxpZWQtYmxlbmQtZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJs ZW5kLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1 L2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQ6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1NraXBwZWQ6CisKIDIwMTEtMDItMjggIEphbWVzIFJvYmluc29uICA8 amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaHJvbWl1bSBiYXNlbGluZSB1cGRhdGVz LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJl bXVsdGlwbGllZC1ibGVuZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvd2ViZ2wvd2Vi Z2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJiZWNiNmI1MDk1NWIz OTU0MDFhZjA2MDM4YTRkMzhkMTZiNjE1YmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLmh0bWwKQEAg LTAsMCArMSw2MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHN0 eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KKyAgICAgIGJvZHkgeworICAgICAg ICBvdXRsaW5lOiAxMHB4IHNvbGlkIHRyYW5zcGFyZW50OyAvKiBhZmZlY3RzIGxheWVyIHNpemVz ICovCisgICAgICB9CisgICAgICAuY2FudmFzIHsKKyAgICAgICAgbWFyZ2luOiAyMHB4OworICAg ICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tn cm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMTI4LCAwLjApOworICAgICAgfQorICAgIDwvc3R5bGU+ CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2Vi S2l0V2ViR0xFbmFibGVkIiwgIjEiKTsKKworICAgICAgICBmdW5jdGlvbiBpbml0V2ViR0woY2Fu dmFzTmFtZSwgdnNoYWRlciwgZnNoYWRlciwgYXR0cmlicywgY2xlYXJDb2xvciwgY2xlYXJEZXB0 aCwgcHJlbXVsdEFscGhhKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgY2FudmFzID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoY2FudmFzTmFtZSk7CisgICAgICAgICAgICB2YXIgZ2wgPSBj YW52YXMuZ2V0Q29udGV4dCgiZXhwZXJpbWVudGFsLXdlYmdsIiwge3ByZW11bHRpcGxpZWRBbHBo YTogcHJlbXVsdEFscGhhfSk7CisgICAgICAgICAgICBpZiAoIWdsKSB7CisgICAgICAgICAgICAg ICAgYWxlcnQoIk5vIFdlYkdMIGNvbnRleHQgZm91bmQiKTsKKyAgICAgICAgICAgICAgICByZXR1 cm4gbnVsbDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZ2wuY2xlYXJDb2xvcihjbGVh ckNvbG9yWzBdLCBjbGVhckNvbG9yWzFdLCBjbGVhckNvbG9yWzJdLCBjbGVhckNvbG9yWzNdKTsK KyAgICAgICAgICAgIGdsLmNsZWFyRGVwdGgoY2xlYXJEZXB0aCk7CisKKyAgICAgICAgICAgIGds LmVuYWJsZShnbC5ERVBUSF9URVNUKTsKKyAgICAgICAgICAgIGdsLmVuYWJsZShnbC5CTEVORCk7 CisgICAgICAgICAgICBnbC5ibGVuZEZ1bmMoZ2wuU1JDX0FMUEhBLCBnbC5PTkUpOworCisgICAg ICAgICAgICByZXR1cm4gZ2w7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBkcmF3Q2Fu dmFzKGNhbnZhc0lELCBwcmVtdWx0QWxwaGEpCisgICAgICAgIHsKKyAgICAgICAgICB2YXIgYmx1 ZUNvbG9yID0gMTI4LjAgLyAyNTUuMCAqIChwcmVtdWx0QWxwaGEgPyAwLjUgOiAxLjApOworICAg ICAgICAgIHZhciBnbCA9IGluaXRXZWJHTChjYW52YXNJRCwgIiIsICIiLCBbXSwgWyAwLCAwLCBi bHVlQ29sb3IsIDAuNSBdLCAxLCBwcmVtdWx0QWxwaGEpOworICAgICAgICAgIGdsLnZpZXdwb3J0 KDAsIDAsIDIwMCwgMjAwKTsKKyAgICAgICAgICBnbC5jbGVhcihnbC5DT0xPUl9CVUZGRVJfQklU IHwgZ2wuREVQVEhfQlVGRkVSX0JJVCk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBp bml0KCkKKyAgICAgICAgeworICAgICAgICAgIGRyYXdDYW52YXMoJ2NhbnZhczEnLCBmYWxzZSk7 CisgICAgICAgICAgZHJhd0NhbnZhcygnY2FudmFzMicsIHRydWUpOworICAgICAgIH0KKyAgICA8 L3NjcmlwdD4KKyAgPC9oZWFkPgorICA8Ym9keSBvbmxvYWQ9ImluaXQoKSI+CisgICAKKyAgICA8 Y2FudmFzIGNsYXNzPSJjYW52YXMiIGlkPSJjYW52YXMxIiBzdHlsZT0ibGVmdDogMjBweCIgd2lk dGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjwvY2FudmFzPgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZh cyIgaWQ9ImNhbnZhczIiIHN0eWxlPSJsZWZ0OiAyMHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIw MCI+PC9jYW52YXM+CisKKyAgICA8IS0tIEJvdGggc2hvdWxkIGxvb2sgdGhlIHNhbWUuIC0tPgor ICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS1ncHUvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC1l eHBlY3RlZC5jaGVja3N1bSBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9jb21w b3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLmNoZWNr c3VtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmYyMDkyYzdhMzFjOGRjODVlMzA0OTJjNjI0MWNiOWNlOTg0YTY0ZmYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1ncHUvY29t cG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC1leHBlY3RlZC5jaGVj a3N1bQpAQCAtMCwwICsxIEBACitiMmM3YmE4Y2YyNjllN2Q1OGFlMTFmY2Y1Nzg0ZmVlZApcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJs ZW5kLWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9jb21w b3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLnBuZwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi44MWMxOTA3YjI5MDkyNTY4MmY2MWVkMzQ5ZjI3OTdhNzFlZGFmNGJmCkdJVCBi aW5hcnkgcGF0Y2gKbGl0ZXJhbCAyODE4CnpjbWVBU0BOPyhvbEh5YHVWQnEhaWEweX55VXsrdllW MmE+aTAqWik9aF5qTCVhR21zWWFTVy1MXlkrRjtVTTUyeAp6MjFtWD9pS1I8VHRjLW5nTGB1JHhC PmE0TXtNN1hgSFZoMGVaMmF7Wjd6KWdweEVVMUdIWlUrRyhVWS1XKjdeRmMKekh4ajRrTjU4SkVW JT5nTFk9Nk9SaHR1bz47U19wJGQoPHZFcj9iJWpDbjNQZyZZcFFHJWZPSSNiVGw4NTVOZFFVCnNK NGUmPlh6Yjl4I3ZWO3xxcDZPcnNxUCE9WExFdG8tQTB9QmZOZmdfUGdnJmVieHNMUTBIZGtSSVJG M3YKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVk LWJsZW5kLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9j b21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi4xMGFjNmNkZGFlMjA3NGNlZjg2YTRjNTZlMzBmZmYyZjM2MDAzMTExCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tZ3B1L2NvbXBv c2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTMgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3 IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4MjYxCisgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHgyNjEKKyAgICBSZW5kZXJCb2R5IHtC T0RZfSBhdCAoOCw4KSBzaXplIDc4NHgyNDUKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MjQwLDIyNSkgc2l6ZSA0eDE5CisgICAgICAgIHRleHQgcnVuIGF0ICgyNDAsMjI1KSB3aWR0aCA0 OiAiICIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCitsYXllciBhdCAoMjgsMjgpIHNp emUgMjAweDIwMAorICBSZW5kZXJIVE1MQ2FudmFzIHtDQU5WQVN9IGF0ICgyMCwyMCkgc2l6ZSAy MDB4MjAwIFtiZ2NvbG9yPSMwMDAwODAwMF0KK2xheWVyIGF0ICgyNzIsMjgpIHNpemUgMjAweDIw MAorICBSZW5kZXJIVE1MQ2FudmFzIHtDQU5WQVN9IGF0ICgyNjQsMjApIHNpemUgMjAweDIwMCBb Ymdjb2xvcj0jMDAwMDgwMDBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt d2syL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQKaW5kZXgg YjdmMWJhNDZkYzUwMjY1NTZiNTg1Mjk1ZGVkNDBiNDViNDQ5NDdmNy4uZWNiMDJjNjUzMjE0Yzdl MWI1Zjg5ZWM4OWE3OWY4MDYzYjc4Nzc3MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tp cHBlZApAQCAtMTAyNSw2ICsxMDI1LDcgQEAgZmFzdC9jYW52YXMvd2ViZ2wvY29udGV4dC1sb3N0 Lmh0bWwKIGZhc3QvY2FudmFzL3dlYmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sCiBjb21wb3Np dGluZy93ZWJnbC93ZWJnbC1iYWNrZ3JvdW5kLWNvbG9yLmh0bWwKIGNvbXBvc2l0aW5nL3dlYmds L3dlYmdsLXJlZmxlY3Rpb24uaHRtbAorY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVs dGlwbGllZC1ibGVuZC5odG1sCiBmYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZmZXItY3Jhc2gu aHRtbAogZmFzdC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2guaHRtbAogZmFz dC9jYW52YXMvd2ViZ2wvYXJyYXktZ2V0LWFuZC1zZXQtbWV0aG9kLXJlbW92YWwuaHRtbApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCA0ODc4ZjYxMjViODlhYzZlMTU3ZWYyZWFlNjlkZDNl YmM0MWYzMGZjLi4yN2YzMTQwNTU5YzFkZTM1ODRmNDU1NDcwMjRjZmRiZDlhODZhMjVkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZApAQCAtMzAwLDMgKzMwMCw2IEBAIGZhc3QvanMvaTE4bi1i aW5kaW5ncy1sb2NhbGUuaHRtbAogIyBXYWl0aW5nIGZvciBzb21lb25lIHdpdGggYSBtYWMgdG8g YmFzZWxpbmUgdGhpcyAobmV3KSB0ZXN0IGZvciBtYWMuCiAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NDQzNgogbWVkaWEvdmlkZW8tY29udHJvbHMtaW4tbWVkaWEt ZG9jdW1lbnQuaHRtbAorCisjbm9uLXByZW11bHRpcGxpZWQtYWxwaGEgY3VycmVudGx5IGJyb2tl biBvbiB3ZWJraXQKK2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxl bmQuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDMzMWY0NzQyYzk0ZDMxZjE0YTJkM2RmNmNjOGIzNzlkZTIw M2Y5MTAuLjY2NDU2NzgzNjBjNmUyNzNjZDc0NGVjZDg1Y2I0NjhjMjRlNTZiYzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wMy0wMSAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbY2hyb21pdW1dIHByZW11bHRpcGxpZWRBbHBoYSBXZWJHTCBjb250ZXh0IGF0dHJpYnV0 ZSBpcyBpZ25vcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTU0MTEKKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25w cmVtdWx0aXBsaWVkLWJsZW5kLmh0bWwKKworICAgICAgICBVcGRhdGUgY29tcG9zaXRvciB0byBz ZXQgdGhlIGJsZW5kaW5nIG9mIGVhY2ggbGF5ZXIgY29ycmVjdGx5LgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYW52YXNMYXllckNocm9taXVtOjpDYW52YXNMYXllckNocm9taXVtKToKKyAg ICAgICAgKFdlYkNvcmU6OkNhbnZhc0xheWVyQ2hyb21pdW06OmRyYXcpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OldlYkdMTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGV4dCk6CisKIDIw MTEtMDItMjggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcApp bmRleCA3NjA5OTE3NTkxMDMzMGRhYjBiNDdmOGM4YmZmYTM3NTg3ZTgzZjQ3Li4wMjY0ODY4OTky NGMxNjA3MTVmZjRjMmI5YzRmODc0ODFmZjhhMTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNo cm9taXVtLmNwcApAQCAtNDYsNiArNDYsNyBAQCBDYW52YXNMYXllckNocm9taXVtOjpDYW52YXNM YXllckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSogb3duZXIpCiAgICAgOiBMYXllckNo cm9taXVtKG93bmVyKQogICAgICwgbV90ZXh0dXJlQ2hhbmdlZCh0cnVlKQogICAgICwgbV90ZXh0 dXJlSWQoMCkKKyAgICAsIG1fcHJlbXVsdGlwbGllZEFscGhhKHRydWUpCiB7CiB9CiAKQEAgLTYx LDYgKzYyLDggQEAgdm9pZCBDYW52YXNMYXllckNocm9taXVtOjpkcmF3KCkKICAgICBHcmFwaGlj c0NvbnRleHQzRCogY29udGV4dCA9IGxheWVyUmVuZGVyZXJDb250ZXh0KCk7CiAgICAgR0xDKGNv bnRleHQsIGNvbnRleHQtPmFjdGl2ZVRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUw KSk7CiAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4 dDNEOjpURVhUVVJFXzJELCBtX3RleHR1cmVJZCkpOworICAgIEdDM0RlbnVtIHNmYWN0b3IgPSBt X3ByZW11bHRpcGxpZWRBbHBoYSA/IEdyYXBoaWNzQ29udGV4dDNEOjpPTkUgOiBHcmFwaGljc0Nv bnRleHQzRDo6U1JDX0FMUEhBOworICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5ibGVuZEZ1bmMo c2ZhY3RvciwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBs YXllclJlbmRlcmVyKCktPnVzZVNoYWRlcihwcm9ncmFtLT5wcm9ncmFtKCkpOwogICAgIEdMQyhj b250ZXh0LCBjb250ZXh0LT51bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1w bGVyTG9jYXRpb24oKSwgMCkpOwogICAgIGRyYXdUZXh0dXJlZFF1YWQoY29udGV4dCwgbGF5ZXJS ZW5kZXJlcigpLT5wcm9qZWN0aW9uTWF0cml4KCksIGNjTGF5ZXJJbXBsKCktPmRyYXdUcmFuc2Zv cm0oKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaAppbmRleCA5ODExYjA2NWNiYzYxOTA2 MTU4OThmYTY4NGNiYTM5ZGNmOGExZThmLi5mOTQ3MjJjOTc3YTNkZWMwNDdiMDg2NjU1ZTNmZGI3 NDc4N2MzOTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oCkBAIC01MSw2ICs1MSw3 IEBAIHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBDYW52YXNMYXllckNocm9taXVtKEdyYXBoaWNz TGF5ZXJDaHJvbWl1bSogb3duZXIpOwogICAgIGJvb2wgbV90ZXh0dXJlQ2hhbmdlZDsKICAgICB1 bnNpZ25lZCBtX3RleHR1cmVJZDsKKyAgICBib29sIG1fcHJlbXVsdGlwbGllZEFscGhhOwogCiBw cml2YXRlOgogICAgIHN0YXRpYyB1bnNpZ25lZCBtX3NoYWRlclByb2dyYW1JZDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXll ckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NvbnRlbnRMYXllckNocm9taXVtLmNwcAppbmRleCAyNTczZWQzZGUwZTA4NzlmYmE3ZWM5NTlj ZGUzYjI0OWUyMjM0YjFhLi5kNGMxODJjODhjN2ZlNGUyZGI0ZjI5YTNkNmZmYWU2MTZmNDJlNjMx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D b250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zNDAsNiArMzQwLDcg QEAgdm9pZCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdygpCiAgICAgYmluZENvbnRlbnRzVGV4 dHVyZSgpOwogICAgIGxheWVyUmVuZGVyZXIoKS0+dXNlU2hhZGVyKHByb2dyYW0tPnByb2dyYW0o KSk7CiAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPnVuaWZvcm0xaShwcm9ncmFtLT5mcmFnbWVu dFNoYWRlcigpLnNhbXBsZXJMb2NhdGlvbigpLCAwKSk7CisgICAgR0xDKGNvbnRleHQsIGNvbnRl eHQtPmJsZW5kRnVuYyhHcmFwaGljc0NvbnRleHQzRDo6T05FLCBHcmFwaGljc0NvbnRleHQzRDo6 T05FX01JTlVTX1NSQ19BTFBIQSkpOwogCiAgICAgaWYgKHJlcXVpcmVzQ2xpcHBlZFVwZGF0ZVJl Y3QoKSkgewogICAgICAgICBmbG9hdCBtNDMgPSBjY0xheWVySW1wbCgpLT5kcmF3VHJhbnNmb3Jt KCkubTQzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBjNGI4 Njg3MDhhMjVkN2MyNTAyNTcyNDIwMjJhNGZiZGZlOGNmY2FjLi42NDkxYzgzNTY3NjE2NmFhYTVh MmJiNTZlNzcwNzlkNzIxOTEzYTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5jcHAKQEAgLTI4OSwxMCArMjg5LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRy YXdMYXllcnMoY29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QKICAgICBt X2RlZmF1bHRSZW5kZXJTdXJmYWNlLT5tX2xheWVyTGlzdC5jbGVhcigpOwogICAgIHVwZGF0ZUxh eWVyc1JlY3Vyc2l2ZShtX3Jvb3RMYXllci5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIHJlbmRlclN1 cmZhY2VMYXllckxpc3QsIG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPm1fbGF5ZXJMaXN0KTsKIAot ICAgIC8vIFRoZSBzaGFkZXIgdXNlZCB0byByZW5kZXIgbGF5ZXJzIHJldHVybnMgcHJlLW11bHRp cGxpZWQgYWxwaGEgY29sb3JzCi0gICAgLy8gc28gd2UgbmVlZCB0byBzZW5kIHRoZSBibGVuZGlu ZyBtb2RlIGFwcHJvcHJpYXRlbHkuCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0 LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7Ci0gICAgR0xDKG1fY29udGV4dC5n ZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhp Y3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBHTEMobV9jb250ZXh0Lmdl dCgpLCBtX2NvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7 CiAKICAgICAvLyBVcGRhdGUgdGhlIGNvbnRlbnRzIG9mIHRoZSByZW5kZXIgc3VyZmFjZXMuIFdl IHRyYXZlcnNlIHRoZSBhcnJheSBmcm9tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcApp bmRleCA1YjM0YmI5YTFhZWM4Njc3OTc2MTk2ZTcyYzIyOTRhMTc2ZmUwNmQ2Li5lODNkMDQ1NmE1 YzVlYTU4MmJmYTcxYTRiZDc3NGRjNjdlMGU4NzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJv bWl1bS5jcHAKQEAgLTgyLDYgKzgyLDcgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldENv bnRleHQoY29uc3QgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgaWYgKHRleHR1cmVJ ZCAhPSBtX3RleHR1cmVJZCkKICAgICAgICAgbV90ZXh0dXJlQ2hhbmdlZCA9IHRydWU7CiAgICAg bV90ZXh0dXJlSWQgPSB0ZXh0dXJlSWQ7CisgICAgbV9wcmVtdWx0aXBsaWVkQWxwaGEgPSBtX2Nv bnRleHQtPmdldENvbnRleHRBdHRyaWJ1dGVzKCkucHJlbXVsdGlwbGllZEFscGhhOwogfQogCiB9 Cg== 84514 2011-03-02 20:03:50 -0800 2011-03-04 20:27:29 -0800 Patch bug-55411-20110302200349.patch text/plain 12646 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5NjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2ZTRkYzE0ZjliMjJlMmJhZmYxNjE5 YTFiYmFmNWI4MjdiYTk5MzY1Li5iNzc3ZDlhNmE3NzY0OTZkOThjMjI4NjNkMDA4YzZlM2E3NTA5 M2I1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDMtMDIgIEpvaG4gQmF1bWFuICA8amJh dW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBwcmVtdWx0aXBsaWVkQWxwaGEgV2ViR0wgY29udGV4dCBh dHRyaWJ1dGUgaXMgaWdub3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1NDExCisKKyAgICAgICAgQWRkIHRlc3QgY2FzZSBmb3IgKG5vbi0pcHJl bXVsdGlwbGllZC1hbHBoYSBjb21wb3NpdGluZy4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL3dl YmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbDogQWRkZWQuCisgICAgICAgICog cGxhdGZvcm0vY2hyb21pdW0tZ3B1L2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRp cGxpZWQtYmxlbmQtZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJs ZW5kLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1 L2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQ6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1NraXBwZWQ6CisKIDIwMTEtMDItMjggIEphbWVzIFJvYmluc29uICA8 amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaHJvbWl1bSBiYXNlbGluZSB1cGRhdGVz LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJl bXVsdGlwbGllZC1ibGVuZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvd2ViZ2wvd2Vi Z2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJiZWNiNmI1MDk1NWIz OTU0MDFhZjA2MDM4YTRkMzhkMTZiNjE1YmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLmh0bWwKQEAg LTAsMCArMSw2MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHN0 eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KKyAgICAgIGJvZHkgeworICAgICAg ICBvdXRsaW5lOiAxMHB4IHNvbGlkIHRyYW5zcGFyZW50OyAvKiBhZmZlY3RzIGxheWVyIHNpemVz ICovCisgICAgICB9CisgICAgICAuY2FudmFzIHsKKyAgICAgICAgbWFyZ2luOiAyMHB4OworICAg ICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tn cm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMTI4LCAwLjApOworICAgICAgfQorICAgIDwvc3R5bGU+ CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2Vi S2l0V2ViR0xFbmFibGVkIiwgIjEiKTsKKworICAgICAgICBmdW5jdGlvbiBpbml0V2ViR0woY2Fu dmFzTmFtZSwgdnNoYWRlciwgZnNoYWRlciwgYXR0cmlicywgY2xlYXJDb2xvciwgY2xlYXJEZXB0 aCwgcHJlbXVsdEFscGhhKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgY2FudmFzID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoY2FudmFzTmFtZSk7CisgICAgICAgICAgICB2YXIgZ2wgPSBj YW52YXMuZ2V0Q29udGV4dCgiZXhwZXJpbWVudGFsLXdlYmdsIiwge3ByZW11bHRpcGxpZWRBbHBo YTogcHJlbXVsdEFscGhhfSk7CisgICAgICAgICAgICBpZiAoIWdsKSB7CisgICAgICAgICAgICAg ICAgYWxlcnQoIk5vIFdlYkdMIGNvbnRleHQgZm91bmQiKTsKKyAgICAgICAgICAgICAgICByZXR1 cm4gbnVsbDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZ2wuY2xlYXJDb2xvcihjbGVh ckNvbG9yWzBdLCBjbGVhckNvbG9yWzFdLCBjbGVhckNvbG9yWzJdLCBjbGVhckNvbG9yWzNdKTsK KyAgICAgICAgICAgIGdsLmNsZWFyRGVwdGgoY2xlYXJEZXB0aCk7CisKKyAgICAgICAgICAgIGds LmVuYWJsZShnbC5ERVBUSF9URVNUKTsKKyAgICAgICAgICAgIGdsLmVuYWJsZShnbC5CTEVORCk7 CisgICAgICAgICAgICBnbC5ibGVuZEZ1bmMoZ2wuU1JDX0FMUEhBLCBnbC5PTkUpOworCisgICAg ICAgICAgICByZXR1cm4gZ2w7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBkcmF3Q2Fu dmFzKGNhbnZhc0lELCBwcmVtdWx0QWxwaGEpCisgICAgICAgIHsKKyAgICAgICAgICB2YXIgYmx1 ZUNvbG9yID0gMTI4LjAgLyAyNTUuMCAqIChwcmVtdWx0QWxwaGEgPyAwLjUgOiAxLjApOworICAg ICAgICAgIHZhciBnbCA9IGluaXRXZWJHTChjYW52YXNJRCwgIiIsICIiLCBbXSwgWyAwLCAwLCBi bHVlQ29sb3IsIDAuNSBdLCAxLCBwcmVtdWx0QWxwaGEpOworICAgICAgICAgIGdsLnZpZXdwb3J0 KDAsIDAsIDIwMCwgMjAwKTsKKyAgICAgICAgICBnbC5jbGVhcihnbC5DT0xPUl9CVUZGRVJfQklU IHwgZ2wuREVQVEhfQlVGRkVSX0JJVCk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBp bml0KCkKKyAgICAgICAgeworICAgICAgICAgIGRyYXdDYW52YXMoJ2NhbnZhczEnLCBmYWxzZSk7 CisgICAgICAgICAgZHJhd0NhbnZhcygnY2FudmFzMicsIHRydWUpOworICAgICAgIH0KKyAgICA8 L3NjcmlwdD4KKyAgPC9oZWFkPgorICA8Ym9keSBvbmxvYWQ9ImluaXQoKSI+CisgICAKKyAgICA8 Y2FudmFzIGNsYXNzPSJjYW52YXMiIGlkPSJjYW52YXMxIiBzdHlsZT0ibGVmdDogMjBweCIgd2lk dGg9IjIwMCIgaGVpZ2h0PSIyMDAiPjwvY2FudmFzPgorICAgIDxjYW52YXMgY2xhc3M9ImNhbnZh cyIgaWQ9ImNhbnZhczIiIHN0eWxlPSJsZWZ0OiAyMHB4IiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIw MCI+PC9jYW52YXM+CisKKyAgICA8IS0tIEJvdGggc2hvdWxkIGxvb2sgdGhlIHNhbWUuIC0tPgor ICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS1ncHUvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC1l eHBlY3RlZC5jaGVja3N1bSBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9jb21w b3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLmNoZWNr c3VtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmYyMDkyYzdhMzFjOGRjODVlMzA0OTJjNjI0MWNiOWNlOTg0YTY0ZmYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1ncHUvY29t cG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVsdGlwbGllZC1ibGVuZC1leHBlY3RlZC5jaGVj a3N1bQpAQCAtMCwwICsxIEBACitiMmM3YmE4Y2YyNjllN2Q1OGFlMTFmY2Y1Nzg0ZmVlZApcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJs ZW5kLWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9jb21w b3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLnBuZwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi44MWMxOTA3YjI5MDkyNTY4MmY2MWVkMzQ5ZjI3OTdhNzFlZGFmNGJmCkdJVCBi aW5hcnkgcGF0Y2gKbGl0ZXJhbCAyODE4CnpjbWVBU0BOPyhvbEh5YHVWQnEhaWEweX55VXsrdllW MmE+aTAqWik9aF5qTCVhR21zWWFTVy1MXlkrRjtVTTUyeAp6MjFtWD9pS1I8VHRjLW5nTGB1JHhC PmE0TXtNN1hgSFZoMGVaMmF7Wjd6KWdweEVVMUdIWlUrRyhVWS1XKjdeRmMKekh4ajRrTjU4SkVW JT5nTFk9Nk9SaHR1bz47U19wJGQoPHZFcj9iJWpDbjNQZyZZcFFHJWZPSSNiVGw4NTVOZFFVCnNK NGUmPlh6Yjl4I3ZWO3xxcDZPcnNxUCE9WExFdG8tQTB9QmZOZmdfUGdnJmVieHNMUTBIZGtSSVJG M3YKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLWdwdS9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVk LWJsZW5kLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS9j b21wb3NpdGluZy93ZWJnbC93ZWJnbC1ub25wcmVtdWx0aXBsaWVkLWJsZW5kLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi4xMGFjNmNkZGFlMjA3NGNlZjg2YTRjNTZlMzBmZmYyZjM2MDAzMTExCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tZ3B1L2NvbXBv c2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTMgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3 IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4MjYxCisgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHgyNjEKKyAgICBSZW5kZXJCb2R5IHtC T0RZfSBhdCAoOCw4KSBzaXplIDc4NHgyNDUKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MjQwLDIyNSkgc2l6ZSA0eDE5CisgICAgICAgIHRleHQgcnVuIGF0ICgyNDAsMjI1KSB3aWR0aCA0 OiAiICIKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCitsYXllciBhdCAoMjgsMjgpIHNp emUgMjAweDIwMAorICBSZW5kZXJIVE1MQ2FudmFzIHtDQU5WQVN9IGF0ICgyMCwyMCkgc2l6ZSAy MDB4MjAwIFtiZ2NvbG9yPSMwMDAwODAwMF0KK2xheWVyIGF0ICgyNzIsMjgpIHNpemUgMjAweDIw MAorICBSZW5kZXJIVE1MQ2FudmFzIHtDQU5WQVN9IGF0ICgyNjQsMjApIHNpemUgMjAweDIwMCBb Ymdjb2xvcj0jMDAwMDgwMDBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt d2syL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQKaW5kZXgg YjdmMWJhNDZkYzUwMjY1NTZiNTg1Mjk1ZGVkNDBiNDViNDQ5NDdmNy4uZWNiMDJjNjUzMjE0Yzdl MWI1Zjg5ZWM4OWE3OWY4MDYzYjc4Nzc3MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tp cHBlZApAQCAtMTAyNSw2ICsxMDI1LDcgQEAgZmFzdC9jYW52YXMvd2ViZ2wvY29udGV4dC1sb3N0 Lmh0bWwKIGZhc3QvY2FudmFzL3dlYmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sCiBjb21wb3Np dGluZy93ZWJnbC93ZWJnbC1iYWNrZ3JvdW5kLWNvbG9yLmh0bWwKIGNvbXBvc2l0aW5nL3dlYmds L3dlYmdsLXJlZmxlY3Rpb24uaHRtbAorY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtbm9ucHJlbXVs dGlwbGllZC1ibGVuZC5odG1sCiBmYXN0L2NhbnZhcy93ZWJnbC9hcnJheS1idWZmZXItY3Jhc2gu aHRtbAogZmFzdC9jYW52YXMvd2ViZ2wvYXJyYXktYnVmZmVyLXZpZXctY3Jhc2guaHRtbAogZmFz dC9jYW52YXMvd2ViZ2wvYXJyYXktZ2V0LWFuZC1zZXQtbWV0aG9kLXJlbW92YWwuaHRtbApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCA0ODc4ZjYxMjViODlhYzZlMTU3ZWYyZWFlNjlkZDNl YmM0MWYzMGZjLi5jYjk4MTI5MzM5ODViZjE0ZmEzNjA4OGIwNjY5YzZlZjRhNThkNzBmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZApAQCAtMzAwLDMgKzMwMCw3IEBAIGZhc3QvanMvaTE4bi1i aW5kaW5ncy1sb2NhbGUuaHRtbAogIyBXYWl0aW5nIGZvciBzb21lb25lIHdpdGggYSBtYWMgdG8g YmFzZWxpbmUgdGhpcyAobmV3KSB0ZXN0IGZvciBtYWMuCiAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NDQzNgogbWVkaWEvdmlkZW8tY29udHJvbHMtaW4tbWVkaWEt ZG9jdW1lbnQuaHRtbAorCisjIE5vbi1wcmVtdWx0aXBsaWVkLWFscGhhIGN1cnJlbnRseSBicm9r ZW4gb24gbWFjLgorIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU1 MDkKK2NvbXBvc2l0aW5nL3dlYmdsL3dlYmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDMzMWY0NzQyYzk0ZDMxZjE0YTJkM2RmNmNjOGIzNzlkZTIwM2Y5MTAuLmQ3 ZGJlNzQzZTBlYmI0MmZiZjc1NTc0YWEyMTI5NDU2NDM1MDU0ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxMS0wMy0wMiAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hy b21pdW1dIHByZW11bHRpcGxpZWRBbHBoYSBXZWJHTCBjb250ZXh0IGF0dHJpYnV0ZSBpcyBpZ25v cmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU0 MTEKKworICAgICAgICBVcGRhdGUgY29tcG9zaXRvciB0byBzZXQgdGhlIGJsZW5kaW5nIG9mIGVh Y2ggbGF5ZXIgY29ycmVjdGx5LgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL3dlYmdsL3dl YmdsLW5vbnByZW11bHRpcGxpZWQtYmxlbmQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYW52YXNMYXllckNocm9taXVtOjpDYW52YXNMYXllckNocm9taXVtKToKKyAgICAgICAgKFdl YkNvcmU6OkNhbnZhc0xheWVyQ2hyb21pdW06OmRyYXcpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdyk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYkdMTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGV4dCk6CisKIDIwMTEtMDItMjgg IERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcAppbmRleCA3NjA5 OTE3NTkxMDMzMGRhYjBiNDdmOGM4YmZmYTM3NTg3ZTgzZjQ3Li4wMjY0ODY4OTkyNGMxNjA3MTVm ZjRjMmI5YzRmODc0ODFmZjhhMTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVtLmNw cApAQCAtNDYsNiArNDYsNyBAQCBDYW52YXNMYXllckNocm9taXVtOjpDYW52YXNMYXllckNocm9t aXVtKEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSogb3duZXIpCiAgICAgOiBMYXllckNocm9taXVtKG93 bmVyKQogICAgICwgbV90ZXh0dXJlQ2hhbmdlZCh0cnVlKQogICAgICwgbV90ZXh0dXJlSWQoMCkK KyAgICAsIG1fcHJlbXVsdGlwbGllZEFscGhhKHRydWUpCiB7CiB9CiAKQEAgLTYxLDYgKzYyLDgg QEAgdm9pZCBDYW52YXNMYXllckNocm9taXVtOjpkcmF3KCkKICAgICBHcmFwaGljc0NvbnRleHQz RCogY29udGV4dCA9IGxheWVyUmVuZGVyZXJDb250ZXh0KCk7CiAgICAgR0xDKGNvbnRleHQsIGNv bnRleHQtPmFjdGl2ZVRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwKSk7CiAgICAg R0xDKGNvbnRleHQsIGNvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhU VVJFXzJELCBtX3RleHR1cmVJZCkpOworICAgIEdDM0RlbnVtIHNmYWN0b3IgPSBtX3ByZW11bHRp cGxpZWRBbHBoYSA/IEdyYXBoaWNzQ29udGV4dDNEOjpPTkUgOiBHcmFwaGljc0NvbnRleHQzRDo6 U1JDX0FMUEhBOworICAgIEdMQyhjb250ZXh0LCBjb250ZXh0LT5ibGVuZEZ1bmMoc2ZhY3Rvciwg R3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBsYXllclJlbmRl cmVyKCktPnVzZVNoYWRlcihwcm9ncmFtLT5wcm9ncmFtKCkpOwogICAgIEdMQyhjb250ZXh0LCBj b250ZXh0LT51bmlmb3JtMWkocHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5zYW1wbGVyTG9jYXRp b24oKSwgMCkpOwogICAgIGRyYXdUZXh0dXJlZFF1YWQoY29udGV4dCwgbGF5ZXJSZW5kZXJlcigp LT5wcm9qZWN0aW9uTWF0cml4KCksIGNjTGF5ZXJJbXBsKCktPmRyYXdUcmFuc2Zvcm0oKSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZh c0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaAppbmRleCA5ODExYjA2NWNiYzYxOTA2MTU4OThmYTY4 NGNiYTM5ZGNmOGExZThmLi5mOTQ3MjJjOTc3YTNkZWMwNDdiMDg2NjU1ZTNmZGI3NDc4N2MzOTY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D YW52YXNMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oCkBAIC01MSw2ICs1MSw3IEBAIHByb3Rl Y3RlZDoKICAgICBleHBsaWNpdCBDYW52YXNMYXllckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJv bWl1bSogb3duZXIpOwogICAgIGJvb2wgbV90ZXh0dXJlQ2hhbmdlZDsKICAgICB1bnNpZ25lZCBt X3RleHR1cmVJZDsKKyAgICBib29sIG1fcHJlbXVsdGlwbGllZEFscGhhOwogCiBwcml2YXRlOgog ICAgIHN0YXRpYyB1bnNpZ25lZCBtX3NoYWRlclByb2dyYW1JZDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVt LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRM YXllckNocm9taXVtLmNwcAppbmRleCAyNTczZWQzZGUwZTA4NzlmYmE3ZWM5NTljZGUzYjI0OWUy MjM0YjFhLi5kNGMxODJjODhjN2ZlNGUyZGI0ZjI5YTNkNmZmYWU2MTZmNDJlNjMxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5 ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCkBAIC0zNDAsNiArMzQwLDcgQEAgdm9pZCBD b250ZW50TGF5ZXJDaHJvbWl1bTo6ZHJhdygpCiAgICAgYmluZENvbnRlbnRzVGV4dHVyZSgpOwog ICAgIGxheWVyUmVuZGVyZXIoKS0+dXNlU2hhZGVyKHByb2dyYW0tPnByb2dyYW0oKSk7CiAgICAg R0xDKGNvbnRleHQsIGNvbnRleHQtPnVuaWZvcm0xaShwcm9ncmFtLT5mcmFnbWVudFNoYWRlcigp LnNhbXBsZXJMb2NhdGlvbigpLCAwKSk7CisgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPmJsZW5k RnVuYyhHcmFwaGljc0NvbnRleHQzRDo6T05FLCBHcmFwaGljc0NvbnRleHQzRDo6T05FX01JTlVT X1NSQ19BTFBIQSkpOwogCiAgICAgaWYgKHJlcXVpcmVzQ2xpcHBlZFVwZGF0ZVJlY3QoKSkgewog ICAgICAgICBmbG9hdCBtNDMgPSBjY0xheWVySW1wbCgpLT5kcmF3VHJhbnNmb3JtKCkubTQzKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBjNGI4Njg3MDhhMjVk N2MyNTAyNTcyNDIwMjJhNGZiZGZlOGNmY2FjLi42NDkxYzgzNTY3NjE2NmFhYTVhMmJiNTZlNzcw NzlkNzIxOTEzYTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAg LTI4OSwxMCArMjg5LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMo Y29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QKICAgICBtX2RlZmF1bHRS ZW5kZXJTdXJmYWNlLT5tX2xheWVyTGlzdC5jbGVhcigpOwogICAgIHVwZGF0ZUxheWVyc1JlY3Vy c2l2ZShtX3Jvb3RMYXllci5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIHJlbmRlclN1cmZhY2VMYXll ckxpc3QsIG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPm1fbGF5ZXJMaXN0KTsKIAotICAgIC8vIFRo ZSBzaGFkZXIgdXNlZCB0byByZW5kZXIgbGF5ZXJzIHJldHVybnMgcHJlLW11bHRpcGxpZWQgYWxw aGEgY29sb3JzCi0gICAgLy8gc28gd2UgbmVlZCB0byBzZW5kIHRoZSBibGVuZGluZyBtb2RlIGFw cHJvcHJpYXRlbHkuCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5lbmFibGUo R3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7Ci0gICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9j b250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0 M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKICAgICBHTEMobV9jb250ZXh0LmdldCgpLCBtX2Nv bnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKSk7CiAKICAgICAv LyBVcGRhdGUgdGhlIGNvbnRlbnRzIG9mIHRoZSByZW5kZXIgc3VyZmFjZXMuIFdlIHRyYXZlcnNl IHRoZSBhcnJheSBmcm9tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNwcAppbmRleCA1YjM0 YmI5YTFhZWM4Njc3OTc2MTk2ZTcyYzIyOTRhMTc2ZmUwNmQ2Li5lODNkMDQ1NmE1YzVlYTU4MmJm YTcxYTRiZDc3NGRjNjdlMGU4NzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAK QEAgLTgyLDYgKzgyLDcgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldENvbnRleHQoY29u c3QgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgaWYgKHRleHR1cmVJZCAhPSBtX3Rl eHR1cmVJZCkKICAgICAgICAgbV90ZXh0dXJlQ2hhbmdlZCA9IHRydWU7CiAgICAgbV90ZXh0dXJl SWQgPSB0ZXh0dXJlSWQ7CisgICAgbV9wcmVtdWx0aXBsaWVkQWxwaGEgPSBtX2NvbnRleHQtPmdl dENvbnRleHRBdHRyaWJ1dGVzKCkucHJlbXVsdGlwbGllZEFscGhhOwogfQogCiB9Cg==