52095 2011-01-07 17:51:58 -0800 REGRESSION (r75277): 2 test cases (<1%) had incorrect layout after fullscreen changes 2011-01-10 16:29:48 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r75291%20(23297)/results.html P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson eric jamesr simon.fraser oldest_to_newest 331117 0 jer.noble 2011-01-07 17:51:58 -0800 Changes to full screen mode caused two test cases to start generating extra test. The tests technically pass, but the javascript source code contained is being dumped by DRT. 331118 1 jer.noble 2011-01-07 17:52:32 -0800 Failing tests: fullscreen/full-screen-remove-ancestor.html fullscreen/full-screen-remove.html 331119 2 78295 jer.noble 2011-01-07 17:57:42 -0800 Created attachment 78295 Patch 331355 3 78295 commit-queue 2011-01-08 19:20:48 -0800 Comment on attachment 78295 Patch Rejecting attachment 78295 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']" exit_code: 2 Last 500 characters of output: ...... fast/xmlhttprequest ................ fast/xpath ..................................... fast/xpath/4XPath/Borrowed ...... fast/xpath/4XPath/Core .......... fast/xpath/py-dom-xpath ........ fast/xsl ....................................... fonts ...... fullscreen ... fullscreen/full-screen-remove-ancestor.html -> crashed Exiting early after 1 failures. 16612 tests run. 325.49s total testing time 16611 test cases (99%) succeeded 1 test case (<1%) crashed 8 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/7396070 331389 4 78344 jer.noble 2011-01-09 00:34:14 -0800 Created attachment 78344 Patch 331391 5 eric 2011-01-09 00:38:10 -0800 Thanks for fixing. Unfortunately I don't really understand the patch, so best to leave this for someone else to review. :) 331393 6 78344 jer.noble 2011-01-09 00:41:07 -0800 Comment on attachment 78344 Patch Updated patch to fix the crash while running the full-screen-remove-ancestor test. 331438 7 78344 simon.fraser 2011-01-09 08:42:28 -0800 Comment on attachment 78344 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78344&action=review r=me, bonus points if you explain why the patch fixes <script> being dumped into the output, in the changelog. > Source/WebCore/ChangeLog:13 > + In nodeWillBeRemoved(), match the code in webkitDidExitFullScreen(). > + Don't detach the documentElement, but rather simply call recalcStyle(Force). Don't you mean "don't detach the fullscreen element"? 331448 8 78344 commit-queue 2011-01-09 10:24:57 -0800 Comment on attachment 78344 Patch Rejecting attachment 78344 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 78344]" exit_code: 1 Last 500 characters of output: st/html/script-tests/disable-style-element.js A LayoutTests/fast/html/disable-style-element-expected.txt M LayoutTests/ChangeLog M Source/WebCore/dom/StyleElement.h M Source/WebCore/ChangeLog M Source/WebCore/html/HTMLStyleElement.h M Source/WebCore/html/HTMLStyleElement.idl M Source/WebCore/html/HTMLStyleElement.cpp r75352 = 5b0a15fef122c3d163eb2e34b13253e38202ffea (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Full output: http://queues.webkit.org/results/7400083 331449 9 eric 2011-01-09 10:27:17 -0800 Ah. :) Yes. Setting cq+ will land the patch regardless. We should probably teach it to not try to land patches which are still marked r?: From the output: NOBODY (OOPS!) found in /mnt/git/webkit-commit-queue/LayoutTests/ChangeLog does not appear to be a valid reviewer according to committers.py. 331450 10 eric 2011-01-09 10:28:57 -0800 Bug 36638 is about this strange behavior. I'll look at making a patch. Sorry for the trouble. 331503 11 78344 mjs 2011-01-09 21:13:01 -0800 Comment on attachment 78344 Patch I don't think this fix is right. I think the right change is to make RenderFullScreen properly anonymous. That will remove the risk of the document's renderer being destroyed, which is ultimately what goes wrong here. Like so: Index: rendering/RenderFullScreen.h =================================================================== --- rendering/RenderFullScreen.h (revision 75328) +++ rendering/RenderFullScreen.h (working copy) @@ -33,7 +33,7 @@ class RenderFullScreen : public RenderFlexibleBox { public: - RenderFullScreen(Node* node) : RenderFlexibleBox(node) { setReplaced(false); setIsAnonymous(false); } + RenderFullScreen(Node* node) : RenderFlexibleBox(node) { setReplaced(false); } virtual bool isRenderFullScreen() const { return true; } virtual const char* renderName() const { return "RenderFullScreen"; } Is there a reason RenderFullScreen is non-anonymous? 331647 12 jer.noble 2011-01-10 09:00:42 -0800 (In reply to comment #11) > (From update of attachment 78344 [details]) > > Is there a reason RenderFullScreen is non-anonymous? Yes, I found that, if RenderFullScreen was anonymous and the parent element of the full screen element also had an anonymous renderer, the layout system would collapse the two anonymous blocks and remove the RenderFullScreen renderer from the render tree. 331649 13 jer.noble 2011-01-10 09:03:32 -0800 (continuing...) I believe the function which pruned out the anonymous RenderFullScreen was void RenderBlock::removeLeftoverAnonymousBlock(RenderBlock* child). 331653 14 jer.noble 2011-01-10 09:09:40 -0800 (continuing...) However, it looks like that was before RenderFullScreen became a flex-box; the code which calls removeLeftoverAnonymousBlock will first check that the anonymous block's display style is BLOCK, and the RenderFullScreen will have a display style of BOX; the collapsing behavior described above may no longer be an issue. 331669 15 jer.noble 2011-01-10 10:00:03 -0800 (In reply to comment #14) > (continuing...) > > However, it looks like that was before RenderFullScreen became a flex-box; the code which calls removeLeftoverAnonymousBlock will first check that the anonymous block's display style is BLOCK, and the RenderFullScreen will have a display style of BOX; the collapsing behavior described above may no longer be an issue. After making the change Maciej suggested, it appears the RenderFullScreen render is still being pruned in the majority of my test cases, which breaks the animation aspect of the full screen feature. 331673 16 jer.noble 2011-01-10 10:16:54 -0800 (In reply to comment #7) > (From update of attachment 78344 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=78344&action=review > > r=me, bonus points if you explain why the patch fixes <script> being dumped into the output, in the changelog. I haven't debugged into DRT yet, but I believe the render tree was being left in an inconsistent state when an ancestor was removed. > > Source/WebCore/ChangeLog:13 > > + In nodeWillBeRemoved(), match the code in webkitDidExitFullScreen(). > > + Don't detach the documentElement, but rather simply call recalcStyle(Force). > > Don't you mean "don't detach the fullscreen element"? In this case, the full screen element is the documentElement. When an ancestor of the current full screen element is removed, the documentElement becomes the new full screen element. 331725 17 jer.noble 2011-01-10 11:13:32 -0800 (In reply to comment #15) > After making the change Maciej suggested, it appears the RenderFullScreen render is still being pruned in the majority of my test cases, which breaks the animation aspect of the full screen feature. Upon further testing, it appears the renderer isn't being pruned, but rather the RenderLayer tree will not use hardware-compositing for an anonymous renderer. 331909 18 78446 jer.noble 2011-01-10 13:45:58 -0800 Created attachment 78446 Patch 331912 19 jer.noble 2011-01-10 13:48:04 -0800 (In reply to comment #18) > Created an attachment (id=78446) [details] > Patch Thanks for the r+ Simon; but I wanted to address Maciej's comment about anonymity. This new patch no longer marks RenderFullScreen as a non-anonymous renderer. The lack of accelerated compositing on the RenderFullScreen object has been fixed in this patch as well. 332034 20 78446 commit-queue 2011-01-10 16:29:41 -0800 Comment on attachment 78446 Patch Clearing flags on attachment: 78446 Committed r75450: <http://trac.webkit.org/changeset/75450> 332035 21 commit-queue 2011-01-10 16:29:48 -0800 All reviewed patches have been landed. Closing bug. 78295 2011-01-07 17:57:42 -0800 2011-01-09 00:34:10 -0800 Patch bug-52095-20110107175741.patch text/plain 1624 jer.noble ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGVjMzNhZmVmODQwNDk2MGRjN2FlNzlmM2E2NWMyN2ViYjU1ODAzNC4uOGYxYzExY2NiNDcxZTlj ZmQzNDA5MjAwZGI3ZDdiNTFjNzU0MDM3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMS0wMS0wNyAgSmVy IE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIwOTUKKyAgICAgICAgUkVHUkVTU0lPTiAocjc1Mjc3 KTogMiB0ZXN0IGNhc2VzICg8MSUpIGhhZCBpbmNvcnJlY3QgbGF5b3V0CisgICAgICAgIAorICAg ICAgICBGaXhlcyB0ZXN0czoKKyAgICAgICAgICAgIGZ1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVt b3ZlLWFuY2VzdG9yLmh0bWwKKyAgICAgICAgICAgIGZ1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVt b3ZlLmh0bWwKKyAgICAgICAgCisgICAgICAgIEluIG5vZGVXaWxsQmVSZW1vdmVkKCksIG1hdGNo IHRoZSBjb2RlIGluIHdlYmtpdERpZEV4aXRGdWxsU2NyZWVuKCkuCisgICAgICAgIERvbid0IGRl dGFjaCB0aGUgZG9jdW1lbnRFbGVtZW50LCBidXQgcmF0aGVyIHNpbXBseSBjYWxsIHJlY2FsY1N0 eWxlKEZvcmNlKS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6bm9kZVdpbGxCZVJlbW92ZWQpOgorCisyMDExLTAxLTA3ICBKZXIgTm9i bGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCiAgICAgICAgIEdUSyBMaW51eCBidWlsZCBmaXg6 IGlzRG9jdW1lbnRSdW5uaW5nRnVsbFNjcmVlbkFuaW1hdGlvbiBzaG91bGQKICAgICAgICAgYmUg cHJvdGVjdGVkIGJvdGggYnkgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKSAmJiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBkNzZmN2MwNWRkZGEzZjIxY2IxMzQ3OTM1 MDcwMjMwNzQ1MTI5YWVlLi5lZWZhMTMyYzBmNDU1YzViMzk4OTY4MjBhNjdmYTU3NzkwOWFmYjY0 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCkBAIC0zMzg1LDkgKzMzODUsNyBAQCB2b2lkIERvY3VtZW50Ojpub2RlV2ls bEJlUmVtb3ZlZChOb2RlKiBuKQogICAgICAgICBBU1NFUlQobiAhPSBkb2N1bWVudEVsZW1lbnQo KSk7CiAgICAgICAgIHNldEZ1bGxTY3JlZW5SZW5kZXJlcigwKTsKICAgICAgICAgbV9mdWxsU2Ny ZWVuRWxlbWVudCA9IGRvY3VtZW50RWxlbWVudCgpOwotICAgICAgICBtX2Z1bGxTY3JlZW5FbGVt ZW50LT5zZXROZWVkc1N0eWxlUmVjYWxjKCk7Ci0gICAgICAgIG1fZnVsbFNjcmVlbkVsZW1lbnQt PmRldGFjaCgpOwotICAgICAgICB1cGRhdGVTdHlsZUlmTmVlZGVkKCk7CisgICAgICAgIHJlY2Fs Y1N0eWxlKEZvcmNlKTsKICAgICAgICAgbV9mdWxsU2NyZWVuQ2hhbmdlRGVsYXlUaW1lci5zdGFy dE9uZVNob3QoMCk7CiAgICAgfQogI2VuZGlmCg== 78344 2011-01-09 00:34:14 -0800 2011-01-10 13:45:51 -0800 Patch bug-52095-20110109003412.patch text/plain 6497 jer.noble ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjRmMDYyNWVhZDg4MjE2ODQ2MWFjNGQ2NDliN2IxNjIyNzcyYzJjLi5hMjkyMDM0 ZDJiODEyOWEwNjc3ZDUxZjZkYWVhNDVjYTlmNjliM2VhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDEtMDkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDk1CisgICAgICAgIFJFR1JFU1NJT04gKHI3NTI3Nyk6 IDIgdGVzdCBjYXNlcyAoPDElKSBoYWQgaW5jb3JyZWN0IGxheW91dAorICAgICAgICAKKyAgICAg ICAgRml4ZXMgdGVzdHM6CisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS1hbmNlc3Rvci5odG1sCisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS5odG1sCisgICAgICAgICAgICAKKyAgICAgICAgUmV2ZXJ0IGNoYW5nZSBtYWRlIGluIHI3NTMy Niwgbm93IHRoYXQgdGhlIHVuZGVybHlpbmcgaXNzdWUgaGFzIGJlZW4gZml4ZWQuCisKKyAgICAg ICAgKiBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92ZS1hbmNlc3Rvci1leHBlY3RlZC50eHQ6 CisgICAgICAgICogZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtZXhwZWN0ZWQudHh0Ogor CiAyMDExLTAxLTA4ICBIZWxkZXIgQ29ycmVpYSAgPGhlbGRlckBzZW5jaGEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Z1 bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWFuY2VzdG9yLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWFuY2VzdG9yLWV4cGVjdGVkLnR4 dAppbmRleCA3MDQ3OWYzNzRjNmE1NDM5YTk2OGIwMTRmOWI0OTllMzlhNTYyMTk1Li5kOWEwYWIz MDBjZmRjZTBiMzFjYjg1OTMwMmU5NzU4ZjFhZGFkNGJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92ZS1hbmNlc3Rvci1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtYW5jZXN0b3ItZXhw ZWN0ZWQudHh0CkBAIC0xLDQyICsxLDYgQEAKLQogRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5n ZSkKIEVYUEVDVEVEIChkb2N1bWVudC53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQgPT0g J1tvYmplY3QgSFRNTEVsZW1lbnRdJykgT0sKIEVWRU5UKHdlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Up CiBFWFBFQ1RFRCAoZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50ID09ICdb b2JqZWN0IEhUTUxIdG1sRWxlbWVudF0nKSBPSwogRU5EIE9GIFRFU1QKIAotCi0KLSAgICAvLyBC YWlsIG91dCBlYXJseSBpZiB0aGUgZnVsbCBzY3JlZW4gQVBJIGlzIG5vdCBlbmFibGVkIG9yIGlz IG1pc3Npbmc6Ci0gICAgaWYgKEVsZW1lbnQucHJvdG90eXBlLndlYmtpdFJlcXVlc3RGdWxsU2Ny ZWVuID09IHVuZGVmaW5lZCkgewotICAgICAgICBsb2dSZXN1bHQoZmFsc2UsICJFbGVtZW50LnBy b3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVsbFNjcmVlbiA9PSB1bmRlZmluZWQiKTsKLSAgICAgICAg ZW5kVGVzdCgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHZhciBjYWxsYmFjazsKLSAgICAgICAg dmFyIGZ1bGxzY3JlZW5DaGFuZ2VkID0gZnVuY3Rpb24oZXZlbnQpCi0gICAgICAgIHsKLSAgICAg ICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhldmVudCkKLSAg ICAgICAgfTsKLSAgICAgICAgd2FpdEZvckV2ZW50KGRvY3VtZW50LCAnd2Via2l0ZnVsbHNjcmVl bmNoYW5nZScsIGZ1bGxzY3JlZW5DaGFuZ2VkKTsKLQotICAgICAgICB2YXIgc3BhbiA9IGRvY3Vt ZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdzcGFuJylbMF07Ci0gICAgICAgIHZhciBkaXYgPSBz cGFuLnBhcmVudE5vZGU7Ci0KLSAgICAgICAgdmFyIHNwYW5FbnRlcmVkRnVsbFNjcmVlbiA9IGZ1 bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgICAgICBjYWxsYmFjayA9IGRvY3VtZW50RW50ZXJlZEZ1 bGxTY3JlZW47Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJl bnRGdWxsU2NyZWVuRWxlbWVudCIsIHNwYW4pOwotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5y ZW1vdmVDaGlsZChkaXYpOwotICAgICAgICB9OwotCi0gICAgICAgIHZhciBkb2N1bWVudEVudGVy ZWRGdWxsU2NyZWVuID0gZnVuY3Rpb24oZXZlbnQpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrID0g bnVsbDsKLSAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1 bGxTY3JlZW5FbGVtZW50IiwgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KTsKLSAgICAgICAgICAg IGVuZFRlc3QoKTsKLSAgICAgICAgfTsKLQotICAgICAgICBjYWxsYmFjayA9IHNwYW5FbnRlcmVk RnVsbFNjcmVlbjsKLSAgICAgICAgc3Bhbi53ZWJraXRSZXF1ZXN0RnVsbFNjcmVlbigpOwotICAg IH0KLQotCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJl bW92ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJl bW92ZS1leHBlY3RlZC50eHQKaW5kZXggOGRjMjcxNDc0Yjc4MDUzNzM0YjY3ZjVmMGVhNGU2MzRl ZTRjNWNmMC4uZDlhMGFiMzAwY2ZkY2UwYjMxY2I4NTkzMDJlOTc1OGYxYWRhZDRiZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWV4cGVj dGVkLnR4dApAQCAtMSw0MSArMSw2IEBACi0KIEVWRU5UKHdlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Up CiBFWFBFQ1RFRCAoZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50ID09ICdb b2JqZWN0IEhUTUxFbGVtZW50XScpIE9LCiBFVkVOVCh3ZWJraXRmdWxsc2NyZWVuY2hhbmdlKQog RVhQRUNURUQgKGRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCA9PSAnW29i amVjdCBIVE1MSHRtbEVsZW1lbnRdJykgT0sKIEVORCBPRiBURVNUCiAKLQotCi0gICAgLy8gQmFp bCBvdXQgZWFybHkgaWYgdGhlIGZ1bGwgc2NyZWVuIEFQSSBpcyBub3QgZW5hYmxlZCBvciBpcyBt aXNzaW5nOgotICAgIGlmIChFbGVtZW50LnByb3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVsbFNjcmVl biA9PSB1bmRlZmluZWQpIHsKLSAgICAgICAgbG9nUmVzdWx0KGZhbHNlLCAiRWxlbWVudC5wcm90 b3R5cGUud2Via2l0UmVxdWVzdEZ1bGxTY3JlZW4gPT0gdW5kZWZpbmVkIik7Ci0gICAgICAgIGVu ZFRlc3QoKTsKLSAgICB9IGVsc2UgewotICAgICAgICB2YXIgY2FsbGJhY2s7Ci0gICAgICAgIHZh ciBmdWxsc2NyZWVuQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2ZW50KQotICAgICAgICB7Ci0gICAgICAg ICAgICBpZiAoY2FsbGJhY2spCi0gICAgICAgICAgICAgICAgY2FsbGJhY2soZXZlbnQpCi0gICAg ICAgIH07Ci0gICAgICAgIHdhaXRGb3JFdmVudChkb2N1bWVudCwgJ3dlYmtpdGZ1bGxzY3JlZW5j aGFuZ2UnLCBmdWxsc2NyZWVuQ2hhbmdlZCk7Ci0gICAgCi0gICAgICAgIHZhciBzcGFuID0gZG9j dW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3NwYW4nKVswXTsKLSAgICAKLSAgICAgICAgdmFy IHNwYW5FbnRlcmVkRnVsbFNjcmVlbiA9IGZ1bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgICAgICBj YWxsYmFjayA9IGRvY3VtZW50RW50ZXJlZEZ1bGxTY3JlZW47Ci0gICAgICAgICAgICB0ZXN0RXhw ZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCIsIHNwYW4pOwot ICAgICAgICAgICAgc3Bhbi5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHNwYW4pOwotICAgICAgICB9 OwotICAgIAotICAgICAgICB2YXIgZG9jdW1lbnRFbnRlcmVkRnVsbFNjcmVlbiA9IGZ1bmN0aW9u KGV2ZW50KSB7Ci0gICAgICAgICAgICBjYWxsYmFjayA9IG51bGw7Ci0gICAgICAgICAgICB0ZXN0 RXhwZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCIsIGRvY3Vt ZW50LmRvY3VtZW50RWxlbWVudCk7Ci0gICAgICAgICAgICBlbmRUZXN0KCk7Ci0gICAgICAgIH07 Ci0gICAgCi0gICAgICAgIGNhbGxiYWNrID0gc3BhbkVudGVyZWRGdWxsU2NyZWVuOwotICAgICAg ICBzcGFuLndlYmtpdFJlcXVlc3RGdWxsU2NyZWVuKCk7Ci0gICAgfQotCi0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5NmJkMjliMTQxMTAwZDY3Y2NlOGVjOTA1M2IyNjc3MWExZTlhYzVjLi40NjYzZDU3ZjY5MzVl ZjUyNzUwOGYwMmRjZjU5ZGEyOTkzMjFjYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTEtMDEtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDk1CisgICAgICAgIFJFR1JFU1NJT04gKHI3NTI3Nyk6 IDIgdGVzdCBjYXNlcyAoPDElKSBoYWQgaW5jb3JyZWN0IGxheW91dAorICAgICAgICAKKyAgICAg ICAgRml4ZXMgdGVzdHM6CisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS1hbmNlc3Rvci5odG1sCisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS5odG1sCisgICAgICAgIAorICAgICAgICBJbiBub2RlV2lsbEJlUmVtb3ZlZCgpLCBtYXRjaCB0 aGUgY29kZSBpbiB3ZWJraXREaWRFeGl0RnVsbFNjcmVlbigpLgorICAgICAgICBEb24ndCBkZXRh Y2ggdGhlIGRvY3VtZW50RWxlbWVudCwgYnV0IHJhdGhlciBzaW1wbHkgY2FsbCByZWNhbGNTdHls ZShGb3JjZSkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6Om5vZGVXaWxsQmVSZW1vdmVkKToKKwogMjAxMS0wMS0wOCBBbXJ1dGggUmFq ICA8YW1ydXRocmFqQG1vdG9yb2xhLmNvbT4gYW5kIFJhdmkgUGhhbmVlbmRyYSBLYXNpYmhhdGxh ICA8cmF2aS5rYXNpYmhhdGxhQG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YXJ0aW4gUm9iaW5zb24uCkBAIC00MDcsNiArNDI0LDcgQEAKICAgICAgICAgKFdlYkNvcmU6OnNj cm9sbGJhclN0YXRlVG9UaGVtZVN0YXRlKToKICAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRo ZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKIAorCiAyMDExLTAxLTA3ICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEdUSyBMaW51eCBidWlsZCBmaXg6IGlzRG9jdW1l bnRSdW5uaW5nRnVsbFNjcmVlbkFuaW1hdGlvbiBzaG91bGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CmluZGV4IGU0YjExMjhjOTk4OTIyZTAzOWNiNTI5NTlhY2NjMjNhMGMxNWYxM2EuLjBiZjI1NGUx MzY1ZDIxYWY0NGRhNzhlZGIxMjQzZTEyNDc3Y2Y5M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cApAQCAtMzM4OSwxMSArMzM4OSwxMyBAQCB2b2lkIERvY3VtZW50Ojpub2RlV2lsbEJlUmVtb3Zl ZChOb2RlKiBuKQogICAgIEFTU0VSVChuKTsKICAgICBpZiAobi0+Y29udGFpbnMobV9mdWxsU2Ny ZWVuRWxlbWVudC5nZXQoKSkpIHsKICAgICAgICAgQVNTRVJUKG4gIT0gZG9jdW1lbnRFbGVtZW50 KCkpOworCisgICAgICAgIGlmIChtX2Z1bGxTY3JlZW5SZW5kZXJlcikKKyAgICAgICAgICAgIG1f ZnVsbFNjcmVlblJlbmRlcmVyLT5yZW1vdmUoKTsKKwogICAgICAgICBzZXRGdWxsU2NyZWVuUmVu ZGVyZXIoMCk7CiAgICAgICAgIG1fZnVsbFNjcmVlbkVsZW1lbnQgPSBkb2N1bWVudEVsZW1lbnQo KTsKLSAgICAgICAgbV9mdWxsU2NyZWVuRWxlbWVudC0+c2V0TmVlZHNTdHlsZVJlY2FsYygpOwot ICAgICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50LT5kZXRhY2goKTsKLSAgICAgICAgdXBkYXRlU3R5 bGVJZk5lZWRlZCgpOworICAgICAgICByZWNhbGNTdHlsZShGb3JjZSk7CiAgICAgICAgIG1fZnVs bFNjcmVlbkNoYW5nZURlbGF5VGltZXIuc3RhcnRPbmVTaG90KDApOwogICAgIH0KICNlbmRpZgo= 78446 2011-01-10 13:45:58 -0800 2011-01-10 16:29:41 -0800 Patch bug-52095-20110110134556.patch text/plain 8188 jer.noble ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjRmMDYyNWVhZDg4MjE2ODQ2MWFjNGQ2NDliN2IxNjIyNzcyYzJjLi5hMjkyMDM0 ZDJiODEyOWEwNjc3ZDUxZjZkYWVhNDVjYTlmNjliM2VhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDEtMDkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDk1CisgICAgICAgIFJFR1JFU1NJT04gKHI3NTI3Nyk6 IDIgdGVzdCBjYXNlcyAoPDElKSBoYWQgaW5jb3JyZWN0IGxheW91dAorICAgICAgICAKKyAgICAg ICAgRml4ZXMgdGVzdHM6CisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS1hbmNlc3Rvci5odG1sCisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS5odG1sCisgICAgICAgICAgICAKKyAgICAgICAgUmV2ZXJ0IGNoYW5nZSBtYWRlIGluIHI3NTMy Niwgbm93IHRoYXQgdGhlIHVuZGVybHlpbmcgaXNzdWUgaGFzIGJlZW4gZml4ZWQuCisKKyAgICAg ICAgKiBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92ZS1hbmNlc3Rvci1leHBlY3RlZC50eHQ6 CisgICAgICAgICogZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtZXhwZWN0ZWQudHh0Ogor CiAyMDExLTAxLTA4ICBIZWxkZXIgQ29ycmVpYSAgPGhlbGRlckBzZW5jaGEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Z1 bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWFuY2VzdG9yLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWFuY2VzdG9yLWV4cGVjdGVkLnR4 dAppbmRleCA3MDQ3OWYzNzRjNmE1NDM5YTk2OGIwMTRmOWI0OTllMzlhNTYyMTk1Li5kOWEwYWIz MDBjZmRjZTBiMzFjYjg1OTMwMmU5NzU4ZjFhZGFkNGJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92ZS1hbmNlc3Rvci1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtYW5jZXN0b3ItZXhw ZWN0ZWQudHh0CkBAIC0xLDQyICsxLDYgQEAKLQogRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5n ZSkKIEVYUEVDVEVEIChkb2N1bWVudC53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQgPT0g J1tvYmplY3QgSFRNTEVsZW1lbnRdJykgT0sKIEVWRU5UKHdlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Up CiBFWFBFQ1RFRCAoZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50ID09ICdb b2JqZWN0IEhUTUxIdG1sRWxlbWVudF0nKSBPSwogRU5EIE9GIFRFU1QKIAotCi0KLSAgICAvLyBC YWlsIG91dCBlYXJseSBpZiB0aGUgZnVsbCBzY3JlZW4gQVBJIGlzIG5vdCBlbmFibGVkIG9yIGlz IG1pc3Npbmc6Ci0gICAgaWYgKEVsZW1lbnQucHJvdG90eXBlLndlYmtpdFJlcXVlc3RGdWxsU2Ny ZWVuID09IHVuZGVmaW5lZCkgewotICAgICAgICBsb2dSZXN1bHQoZmFsc2UsICJFbGVtZW50LnBy b3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVsbFNjcmVlbiA9PSB1bmRlZmluZWQiKTsKLSAgICAgICAg ZW5kVGVzdCgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHZhciBjYWxsYmFjazsKLSAgICAgICAg dmFyIGZ1bGxzY3JlZW5DaGFuZ2VkID0gZnVuY3Rpb24oZXZlbnQpCi0gICAgICAgIHsKLSAgICAg ICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhldmVudCkKLSAg ICAgICAgfTsKLSAgICAgICAgd2FpdEZvckV2ZW50KGRvY3VtZW50LCAnd2Via2l0ZnVsbHNjcmVl bmNoYW5nZScsIGZ1bGxzY3JlZW5DaGFuZ2VkKTsKLQotICAgICAgICB2YXIgc3BhbiA9IGRvY3Vt ZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdzcGFuJylbMF07Ci0gICAgICAgIHZhciBkaXYgPSBz cGFuLnBhcmVudE5vZGU7Ci0KLSAgICAgICAgdmFyIHNwYW5FbnRlcmVkRnVsbFNjcmVlbiA9IGZ1 bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgICAgICBjYWxsYmFjayA9IGRvY3VtZW50RW50ZXJlZEZ1 bGxTY3JlZW47Ci0gICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJl bnRGdWxsU2NyZWVuRWxlbWVudCIsIHNwYW4pOwotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5y ZW1vdmVDaGlsZChkaXYpOwotICAgICAgICB9OwotCi0gICAgICAgIHZhciBkb2N1bWVudEVudGVy ZWRGdWxsU2NyZWVuID0gZnVuY3Rpb24oZXZlbnQpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrID0g bnVsbDsKLSAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1 bGxTY3JlZW5FbGVtZW50IiwgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KTsKLSAgICAgICAgICAg IGVuZFRlc3QoKTsKLSAgICAgICAgfTsKLQotICAgICAgICBjYWxsYmFjayA9IHNwYW5FbnRlcmVk RnVsbFNjcmVlbjsKLSAgICAgICAgc3Bhbi53ZWJraXRSZXF1ZXN0RnVsbFNjcmVlbigpOwotICAg IH0KLQotCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJl bW92ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJl bW92ZS1leHBlY3RlZC50eHQKaW5kZXggOGRjMjcxNDc0Yjc4MDUzNzM0YjY3ZjVmMGVhNGU2MzRl ZTRjNWNmMC4uZDlhMGFiMzAwY2ZkY2UwYjMxY2I4NTkzMDJlOTc1OGYxYWRhZDRiZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZnVsbHNjcmVlbi9mdWxsLXNjcmVlbi1yZW1vdmUtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2Z1bGxzY3JlZW4vZnVsbC1zY3JlZW4tcmVtb3ZlLWV4cGVj dGVkLnR4dApAQCAtMSw0MSArMSw2IEBACi0KIEVWRU5UKHdlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Up CiBFWFBFQ1RFRCAoZG9jdW1lbnQud2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50ID09ICdb b2JqZWN0IEhUTUxFbGVtZW50XScpIE9LCiBFVkVOVCh3ZWJraXRmdWxsc2NyZWVuY2hhbmdlKQog RVhQRUNURUQgKGRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCA9PSAnW29i amVjdCBIVE1MSHRtbEVsZW1lbnRdJykgT0sKIEVORCBPRiBURVNUCiAKLQotCi0gICAgLy8gQmFp bCBvdXQgZWFybHkgaWYgdGhlIGZ1bGwgc2NyZWVuIEFQSSBpcyBub3QgZW5hYmxlZCBvciBpcyBt aXNzaW5nOgotICAgIGlmIChFbGVtZW50LnByb3RvdHlwZS53ZWJraXRSZXF1ZXN0RnVsbFNjcmVl biA9PSB1bmRlZmluZWQpIHsKLSAgICAgICAgbG9nUmVzdWx0KGZhbHNlLCAiRWxlbWVudC5wcm90 b3R5cGUud2Via2l0UmVxdWVzdEZ1bGxTY3JlZW4gPT0gdW5kZWZpbmVkIik7Ci0gICAgICAgIGVu ZFRlc3QoKTsKLSAgICB9IGVsc2UgewotICAgICAgICB2YXIgY2FsbGJhY2s7Ci0gICAgICAgIHZh ciBmdWxsc2NyZWVuQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2ZW50KQotICAgICAgICB7Ci0gICAgICAg ICAgICBpZiAoY2FsbGJhY2spCi0gICAgICAgICAgICAgICAgY2FsbGJhY2soZXZlbnQpCi0gICAg ICAgIH07Ci0gICAgICAgIHdhaXRGb3JFdmVudChkb2N1bWVudCwgJ3dlYmtpdGZ1bGxzY3JlZW5j aGFuZ2UnLCBmdWxsc2NyZWVuQ2hhbmdlZCk7Ci0gICAgCi0gICAgICAgIHZhciBzcGFuID0gZG9j dW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3NwYW4nKVswXTsKLSAgICAKLSAgICAgICAgdmFy IHNwYW5FbnRlcmVkRnVsbFNjcmVlbiA9IGZ1bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgICAgICBj YWxsYmFjayA9IGRvY3VtZW50RW50ZXJlZEZ1bGxTY3JlZW47Ci0gICAgICAgICAgICB0ZXN0RXhw ZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCIsIHNwYW4pOwot ICAgICAgICAgICAgc3Bhbi5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHNwYW4pOwotICAgICAgICB9 OwotICAgIAotICAgICAgICB2YXIgZG9jdW1lbnRFbnRlcmVkRnVsbFNjcmVlbiA9IGZ1bmN0aW9u KGV2ZW50KSB7Ci0gICAgICAgICAgICBjYWxsYmFjayA9IG51bGw7Ci0gICAgICAgICAgICB0ZXN0 RXhwZWN0ZWQoImRvY3VtZW50LndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCIsIGRvY3Vt ZW50LmRvY3VtZW50RWxlbWVudCk7Ci0gICAgICAgICAgICBlbmRUZXN0KCk7Ci0gICAgICAgIH07 Ci0gICAgCi0gICAgICAgIGNhbGxiYWNrID0gc3BhbkVudGVyZWRGdWxsU2NyZWVuOwotICAgICAg ICBzcGFuLndlYmtpdFJlcXVlc3RGdWxsU2NyZWVuKCk7Ci0gICAgfQotCi0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5NmJkMjliMTQxMTAwZDY3Y2NlOGVjOTA1M2IyNjc3MWExZTlhYzVjLi44ZjBmYzdjMDgxZTNj OWRmNmQ4MTU5YzVhYmJhYTE3OGVmMDM5YmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAK KzIwMTEtMDEtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDk1CisgICAgICAgIFJFR1JFU1NJT04gKHI3NTI3Nyk6 IDIgdGVzdCBjYXNlcyAoPDElKSBoYWQgaW5jb3JyZWN0IGxheW91dAorICAgICAgICAKKyAgICAg ICAgRml4ZXMgdGVzdHM6CisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS1hbmNlc3Rvci5odG1sCisgICAgICAgICAgICBmdWxsc2NyZWVuL2Z1bGwtc2NyZWVuLXJlbW92 ZS5odG1sCisgICAgICAgICAgICAKKyAgICAgICAgUHJldmlvdXNseSwgdGhlIGFib3ZlIHRlc3Rz IHdlcmUgZmFpbGluZyBiZWNhdXNlIERSVCBkdW1wZWQgdGhlIGNvbnRlbnRzIG9mIHRoZWlyCisg ICAgICAgIDxzY3JpcHQ+IHRhZ3MsIHRob3VnaCBhbGwgdGhlIGV4cGxpY2l0IHRlc3RzIHdlcmUg cGFzc2luZy4gIFRoaXMgd2FzIGNhdXNlZCBieQorICAgICAgICB0aGUgZG9jdW1lbnQncyByZW5k ZXIgdHJlZSBiZWluZyBsZWZ0IGluIGFuIGluY29uc2lzdGVudCBzdGF0ZSB3aGVuIGEgZnVsbCBz Y3JlZW4KKyAgICAgICAgZWxlbWVudCdzIGFuY2VzdG9yIHdhcyByZW1vdmVkIGZyb20gdGhlIERP TS4KKyAgICAgICAgCisgICAgICAgIEluIG5vZGVXaWxsQmVSZW1vdmVkKCksIG1hdGNoIHRoZSBj b2RlIGluIHdlYmtpdERpZEV4aXRGdWxsU2NyZWVuKCkuCisgICAgICAgIERvbid0IGRldGFjaCB0 aGUgZG9jdW1lbnRFbGVtZW50LCBidXQgcmF0aGVyIHNpbXBseSBjYWxsIHJlY2FsY1N0eWxlKEZv cmNlKS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudDo6bm9kZVdpbGxCZVJlbW92ZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJG dWxsU2NyZWVuLmNwcDoKKyAgICAgICAgKFJlbmRlckZ1bGxTY3JlZW46OnNldEFuaW1hdGluZyk6 ICNpZiBFTkFCTEVEIC0+ICMgaWYgVVNFCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZ1bGxT Y3JlZW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZ1bGxTY3JlZW46OlJlbmRlckZ1bGxT Y3JlZW4pOiBSZW5kZXJGdWxsU2NyZWVuIHNob3VsZCBiZSBhbiBhbm9ueW1vdXMgcmVuZGVyZXIu CisKIDIwMTEtMDEtMDggQW1ydXRoIFJhaiAgPGFtcnV0aHJhakBtb3Rvcm9sYS5jb20+IGFuZCBS YXZpIFBoYW5lZW5kcmEgS2FzaWJoYXRsYSAgPHJhdmkua2FzaWJoYXRsYUBtb3Rvcm9sYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKaW5kZXggZTRiMTEyOGM5OTg5MjJlMDM5Y2I1Mjk1OWFjY2MyM2EwYzE1ZjEzYS4uMWUx Mjk1OGUwYmQwYTFiZTk3ZjI2OGVmYmFmMGM0MzMxMTI1OGU2MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCkBAIC0zMzg5LDExICszMzg5LDEzIEBAIHZvaWQgRG9jdW1lbnQ6Om5vZGVXaWxsQmVS ZW1vdmVkKE5vZGUqIG4pCiAgICAgQVNTRVJUKG4pOwogICAgIGlmIChuLT5jb250YWlucyhtX2Z1 bGxTY3JlZW5FbGVtZW50LmdldCgpKSkgewogICAgICAgICBBU1NFUlQobiAhPSBkb2N1bWVudEVs ZW1lbnQoKSk7CisgICAgICAgIAorICAgICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVyZXIpCisg ICAgICAgICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlci0+cmVtb3ZlKCk7CisKICAgICAgICAgc2V0 RnVsbFNjcmVlblJlbmRlcmVyKDApOwogICAgICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50ID0gZG9j dW1lbnRFbGVtZW50KCk7Ci0gICAgICAgIG1fZnVsbFNjcmVlbkVsZW1lbnQtPnNldE5lZWRzU3R5 bGVSZWNhbGMoKTsKLSAgICAgICAgbV9mdWxsU2NyZWVuRWxlbWVudC0+ZGV0YWNoKCk7Ci0gICAg ICAgIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKKyAgICAgICAgcmVjYWxjU3R5bGUoRm9yY2UpOwog ICAgICAgICBtX2Z1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKICAg ICB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG dWxsU2NyZWVuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGdWxsU2NyZWVu LmNwcAppbmRleCA3Y2Q0NTJmOGMxMTFiYzg5OTY2YjczODUxMGMyM2ZkNGU3NTZmYTJiLi5jYzUz YTZlNmNhNDlkYWNkOGNhOThmZGQzOGY1M2RhYTFlOTQwZDg0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNjcmVlbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uY3BwCkBAIC0zNSw3ICszNSw3IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogdm9pZCBSZW5kZXJGdWxsU2NyZWVuOjpzZXRBbmltYXRpbmco Ym9vbCBhbmltYXRpbmcpCiB7CiAgICAgbV9pc0FuaW1hdGluZyA9IGFuaW1hdGluZzsKLSNpZiBF TkFCTEUoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIGlmIChsYXllcigpKQogICAgICAgICBsYXllcigpLT5jb250ZW50Q2hhbmdl ZChSZW5kZXJMYXllcjo6RnVsbFNjcmVlbkNoYW5nZWQpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNjcmVlbi5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uaAppbmRleCA1MmQ0ZWUyYTdiZDRlZGI3NmE3 OWYwYTdhOTk5MDQzNDRiZjMyMDEwLi4zMGY5NWMxYTM4ZjNhODllYmZmZDg2NTQ3NjE5YjcxNTQy MjY0YThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNj cmVlbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGdWxsU2NyZWVuLmgK QEAgLTMzLDcgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBSZW5kZXJGdWxs U2NyZWVuIDogcHVibGljIFJlbmRlckZsZXhpYmxlQm94IHsKIHB1YmxpYzoKLSAgICBSZW5kZXJG dWxsU2NyZWVuKE5vZGUqIG5vZGUpIDogUmVuZGVyRmxleGlibGVCb3gobm9kZSkgeyBzZXRSZXBs YWNlZChmYWxzZSk7IHNldElzQW5vbnltb3VzKGZhbHNlKTsgfQorICAgIFJlbmRlckZ1bGxTY3Jl ZW4oTm9kZSogbm9kZSkgOiBSZW5kZXJGbGV4aWJsZUJveChub2RlKSB7IHNldFJlcGxhY2VkKGZh bHNlKTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1JlbmRlckZ1bGxTY3JlZW4oKSBjb25zdCB7IHJl dHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5kZXJOYW1lKCkgY29uc3Qg eyByZXR1cm4gIlJlbmRlckZ1bGxTY3JlZW4iOyB9CiAgICAgCg==