74017 2011-12-07 11:55:43 -0800 [Chromium] Add per-tile painting flag to DumpRenderTree and rename AcceleratedDrawing to AcceleratedPainting in chromium specific code. 2011-12-08 17:05:11 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74125 1 reveman reveman abarth alokp dglazkov fishd jamesr ojan tkent webkit.review.bot oldest_to_newest 516810 0 reveman 2011-12-07 11:55:43 -0800 Add support for command line flag enable-per-tile-drawing in DumpRenderTree. 516826 1 118250 reveman 2011-12-07 12:08:19 -0800 Created attachment 118250 Patch 516831 2 webkit.review.bot 2011-12-07 12:11:01 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 516938 3 118250 fishd 2011-12-07 14:51:00 -0800 Comment on attachment 118250 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118250&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:2906 > + ccSettings.perTilePainting = page()->settings()->perTileDrawingEnabled(); is it per-tile drawing or per-tile painting? i thought we made a careful distinction between those terms. seeing them equated here makes me confused. 516941 4 reveman 2011-12-07 14:58:14 -0800 (In reply to comment #3) > (From update of attachment 118250 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118250&action=review > > > Source/WebKit/chromium/src/WebViewImpl.cpp:2906 > > + ccSettings.perTilePainting = page()->settings()->perTileDrawingEnabled(); > > is it per-tile drawing or per-tile painting? > > i thought we made a careful distinction between those terms. seeing > them equated here makes me confused. It's currently "accelerated painting" in the compositor but "accelerated drawing" outside. This change makes the "per-tile" option consistent with the "accelerated" option. If we want "painting" to be used everywhere, both of these options should change. 516943 5 118250 webkit.review.bot 2011-12-07 15:06:30 -0800 Comment on attachment 118250 Patch Attachment 118250 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10752277 New failing tests: compositing/plugins/invalidate_rect.html 517019 6 118250 jamesr 2011-12-07 17:36:19 -0800 Comment on attachment 118250 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118250&action=review Can you look into the test failure? > Source/WebCore/page/Settings.h:504 > + void setPerTileDrawingEnabled(bool enabled) { m_perTileDrawingEnabled = enabled; } > + bool perTileDrawingEnabled() const { return m_perTileDrawingEnabled; } this should be painting, methinks >>> Source/WebKit/chromium/src/WebViewImpl.cpp:2906 >>> + ccSettings.perTilePainting = page()->settings()->perTileDrawingEnabled(); >> >> is it per-tile drawing or per-tile painting? >> >> i thought we made a careful distinction between those terms. seeing >> them equated here makes me confused. > > It's currently "accelerated painting" in the compositor but "accelerated drawing" outside. This change makes the "per-tile" option consistent with the "accelerated" option. If we want "painting" to be used everywhere, both of these options should change. "accelerated drawing" exists only in cross-platform code because it's the term that apple likes to use for what we call accelerated painting. We should continue to use that term in cross-platform code where it's necessary, but stick to painting everywhere else > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:223 > + optparse.make_option("--per-tile-drawing", this also should be painting > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:225 > + help="Use per-tile drawing of composited pages"), painting 517029 7 reveman 2011-12-07 17:45:30 -0800 (In reply to comment #6) > (From update of attachment 118250 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118250&action=review > > Can you look into the test failure? > > > Source/WebCore/page/Settings.h:504 > > + void setPerTileDrawingEnabled(bool enabled) { m_perTileDrawingEnabled = enabled; } > > + bool perTileDrawingEnabled() const { return m_perTileDrawingEnabled; } > > this should be painting, methinks > > >>> Source/WebKit/chromium/src/WebViewImpl.cpp:2906 > >>> + ccSettings.perTilePainting = page()->settings()->perTileDrawingEnabled(); > >> > >> is it per-tile drawing or per-tile painting? > >> > >> i thought we made a careful distinction between those terms. seeing > >> them equated here makes me confused. > > > > It's currently "accelerated painting" in the compositor but "accelerated drawing" outside. This change makes the "per-tile" option consistent with the "accelerated" option. If we want "painting" to be used everywhere, both of these options should change. > > "accelerated drawing" exists only in cross-platform code because it's the term that apple likes to use for what we call accelerated painting. We should continue to use that term in cross-platform code where it's necessary, but stick to painting everywhere else > > > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:223 > > + optparse.make_option("--per-tile-drawing", > > this also should be painting > > > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:225 > > + help="Use per-tile drawing of composited pages"), > > painting OK, no problem. I'll change this patch so that every chromium specific use of "accelerated/per-tile drawing" becomes "accelerated/per-tile painting" instead. This also means changing the chromium command line option "--enable-accelerated-drawing" to "--enable-accelerated-painting", which I'll take care of while adding the "--enable-per-tile-painting" option. 517160 8 alokp 2011-12-07 21:05:14 -0800 DRT uses accelerated-drawing, which I think is appropriate because it is changing the cross-platform accelerated-drawing setting. By the same argument, --enable-accelerated-drawing flag is appropriate for chrome? I prefer using one name everywhere. I do not care which one it is. If we hate "drawing" so much, can we persuade Apple engineers to use "painting"? 517453 9 reveman 2011-12-08 09:02:49 -0800 Started changing to "painting" where possible but think this makes it more confusing than the current patch unless cross-platform code is also changed to "painting". The current patch makes it clear where "drawing" vs "painting" is used so I think we should stick with it for now until we can convince apple to use "painting" instead. 517640 10 jamesr 2011-12-08 11:59:41 -0800 I disagree. We should keep all chromium-specific code consistent, at the very least. 517768 11 118464 reveman 2011-12-08 14:03:09 -0800 Created attachment 118464 Patch 517771 12 118464 jamesr 2011-12-08 14:05:08 -0800 Comment on attachment 118464 Patch R=me 517935 13 118464 webkit.review.bot 2011-12-08 17:05:06 -0800 Comment on attachment 118464 Patch Clearing flags on attachment: 118464 Committed r102400: <http://trac.webkit.org/changeset/102400> 517937 14 webkit.review.bot 2011-12-08 17:05:11 -0800 All reviewed patches have been landed. Closing bug. 118250 2011-12-07 12:08:19 -0800 2011-12-08 14:03:05 -0800 Patch bug-74017-20111207150818.patch text/plain 15775 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcyMGJiYWRlNGJiMDRk ZjIzMjI3NDA5MWFlOGI3ZTNkMjY3ZjQyZi4uNWZmZGI3YWY2MDFjMmJjZDI4ZjM3Y2EyNTZmMGYx MzFkMDAxODYyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTA3ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgcGVyLXRpbGUgZHJhd2luZyBmbGFnIHRvIER1bXBSZW5kZXJUcmVlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQwMTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgcGVyLXRpbGUgZHJhd2luZyB0 byBwYWdlIHNldHRpbmdzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBh Z2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRQZXJUaWxlRHJh d2luZ0VuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnBlclRpbGVEcmF3aW5n RW5hYmxlZCk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW50ZXJuYWxzOjpzZXRQZXJUaWxlRHJhd2luZ0VuYWJsZWQpOgorICAgICAgICAqIHRl c3RpbmcvSW50ZXJuYWxzLmg6CisKIDIwMTEtMTItMDcgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxh cEBhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxpbmcgb2YgIWltcG9ydGFudCBpbiBpbmxpbmUg c3R5bGUgc2V0cyBpcyBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNjk3OTk1 ZmUxNjgxNDViMmNkMDlmOWFiZTAzOWJjOGQxYWVhNDM1NC4uZjc0ZDQyNzFjOTJjZGNmNTAwNWYx OTVkYjZkODE1Yzc5MjhhY2UxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMCBAQAorMjAxMS0xMi0wNyAgRGF2aWQgUmV2ZW1hbiAgPHJldmVtYW5AY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtDaHJvbWl1bV0gQWRkIHBlci10aWxlIGRyYXdpbmcgZmxhZyB0byBEdW1w UmVuZGVyVHJlZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc0MDE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIHBlci10aWxlIGRyYXdpbmcgdG8gcGFnZSBzZXR0aW5ncy4KKworICAgICAgICAqIHB1 YmxpYy9XZWJTZXR0aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OldlYlNldHRpbmdzSW1wbCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0UGVyVGlsZURyYXdpbmdFbmFibGVkKToK KyAgICAgICAgKiBzcmMvV2ViU2V0dGluZ3NJbXBsLmg6CisgICAgICAgICogc3JjL1dlYlZpZXdJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0FjdGl2ZSk6CisKIDIwMTEtMTItMDcgIEpvbmF0aGFuIEJhY2tlciAgPGJhY2tl ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBQbHVtYiBkYW1hZ2UgZnJvbSBX ZWJFeHRlcm5hbFRleHR1cmVMYXllciBhbmQgV2ViUGx1Z2luQ29udGFpbmVyIHRvIENDRGFtYWdl VHJhY2tlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IGE5NTZjYjFhYmNkMGY1YzQwMDM3ZmNi NjE4M2IxZmRmOGViMmQ0NDMuLjhmNDQyMjJmYzFlMWEwYTk5Y2VmYWIxNjAzZDBiY2FjNzdlMGMx MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTUwMCw2ICs1MDAsOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGJvb2wgc2hvdWxkRGlzcGxheVRleHREZXNjcmlwdGlvbnMoKSBj b25zdCB7IHJldHVybiBtX3Nob3VsZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zOyB9CiAjZW5kaWYK IAorICAgICAgICB2b2lkIHNldFBlclRpbGVEcmF3aW5nRW5hYmxlZChib29sIGVuYWJsZWQpIHsg bV9wZXJUaWxlRHJhd2luZ0VuYWJsZWQgPSBlbmFibGVkOyB9CisgICAgICAgIGJvb2wgcGVyVGls ZURyYXdpbmdFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9wZXJUaWxlRHJhd2luZ0VuYWJsZWQ7 IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIFBhZ2UqIG1fcGFnZTsKIApAQCAtNjMyLDYgKzYz NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3Nob3VsZERpc3BsYXlD YXB0aW9ucyA6IDE7CiAgICAgICAgIGJvb2wgbV9zaG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9u cyA6IDE7CiAjZW5kaWYKKyAgICAgICAgYm9vbCBtX3BlclRpbGVEcmF3aW5nRW5hYmxlZCA6IDE7 CiAKICAgICAgICAgVGltZXI8U2V0dGluZ3M+IG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGlt ZXI7CiAgICAgICAgIHZvaWQgbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXJGaXJlZChUaW1l cjxTZXR0aW5ncz4qKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCAzZjA2 MDZmYTNkN2MxZmEyNTlmODJiYTQwOTFiOGM4Y2RiZDEzYjk5Li5hY2VmMjMwOWNhYWRmMDY2NWJm N2RjNmRjNjFkYjM1OTg2MTI3OTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3Bw CkBAIC02NTEsNCArNjUxLDE0IEBAIGludCBJbnRlcm5hbHM6Omxhc3RTcGVsbENoZWNrUHJvY2Vz c2VkU2VxdWVuY2UoRG9jdW1lbnQqIGRvY3VtZW50LCBFeGNlcHRpb25Db2RlCiAgICAgcmV0dXJu IGNoZWNrZXItPmxhc3RQcm9jZXNzZWRTZXF1ZW5jZSgpOwogfQogCit2b2lkIEludGVybmFsczo6 c2V0UGVyVGlsZURyYXdpbmdFbmFibGVkKERvY3VtZW50KiBkb2N1bWVudCwgYm9vbCBlbmFibGVk LCBFeGNlcHRpb25Db2RlJiBlYykKK3sKKyAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+ c2V0dGluZ3MoKSkgeworICAgICAgICBlYyA9IElOVkFMSURfQUNDRVNTX0VSUjsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKworICAgIGRvY3VtZW50LT5zZXR0aW5ncygpLT5zZXRQZXJUaWxlRHJh d2luZ0VuYWJsZWQoZW5hYmxlZCk7Cit9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o CmluZGV4IDE0ZDlkZmRmM2IxZDhkNGE0MTdmZDJmZmU4YjNhNTc1M2I0OGM3MzIuLmVhMDBkMTU4 ZGI2Nzc5MDg5YjdmNTMzZjBmNGQ1MjYxM2ViNjExMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRl cm5hbHMuaApAQCAtMTEzLDYgKzExMyw4IEBAIHB1YmxpYzoKICAgICBpbnQgbGFzdFNwZWxsQ2hl Y2tSZXF1ZXN0U2VxdWVuY2UoRG9jdW1lbnQqLCBFeGNlcHRpb25Db2RlJik7CiAgICAgaW50IGxh c3RTcGVsbENoZWNrUHJvY2Vzc2VkU2VxdWVuY2UoRG9jdW1lbnQqLCBFeGNlcHRpb25Db2RlJik7 CiAKKyAgICB2b2lkIHNldFBlclRpbGVEcmF3aW5nRW5hYmxlZChEb2N1bWVudCosIGJvb2wgZW5h YmxlZCwgRXhjZXB0aW9uQ29kZSYpOworCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGludGVybmFs c0lkOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViU2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRp bmdzLmgKaW5kZXggZTJlNzQzYTEwZGIxOTZjZDk3MjBiODM4OTg4ZTg3Yjg3NzZiOWY0MC4uMmRj Mzk2ODM2NTkyODc4YzViYjhhOTgwOTMwYjMxNTAyZmI4ZDc5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCkBAIC0xMzMsOCArMTMzLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBzZXRFbmFibGVTY3JvbGxBbmltYXRvcihib29sKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIHNldEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQoYm9vbCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWaXN1YWxXb3JkTW92ZW1lbnRFbmFibGVkKGJvb2wp ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0UGVyVGlsZVBhaW50aW5nKGJvb2wpID0gMDsKLSAg ICB2aXJ0dWFsIGJvb2wgcGVyVGlsZVBhaW50aW5nKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwg dm9pZCBzZXRQZXJUaWxlRHJhd2luZ0VuYWJsZWQoYm9vbCkgPSAwOwogCiBwcm90ZWN0ZWQ6CiAg ICAgfldlYlNldHRpbmdzKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmNwcAppbmRleCAwNmVlMDEwMTI4YTg1NmYyZWM3M2Q1ZDIzZWRhZDgyMTQx ZmY2N2I4Li4zM2QzNWZkNzM2ZDZmMmM0MWU2ZWE1YzE4ODg3MDYyYjJjYTI5MTcwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAKQEAgLTUwLDcg KzUwLDYgQEAgV2ViU2V0dGluZ3NJbXBsOjpXZWJTZXR0aW5nc0ltcGwoU2V0dGluZ3MqIHNldHRp bmdzKQogICAgICwgbV9jb21wb3NpdGVUb1RleHR1cmVFbmFibGVkKGZhbHNlKQogICAgICwgbV9z aG93RlBTQ291bnRlcihmYWxzZSkKICAgICAsIG1fc2hvd1BsYXRmb3JtTGF5ZXJUcmVlKGZhbHNl KQotICAgICwgbV9wZXJUaWxlUGFpbnRpbmcoZmFsc2UpCiB7CiAgICAgQVNTRVJUKHNldHRpbmdz KTsKIH0KQEAgLTQ5OCwxMCArNDk3LDkgQEAgdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNob3Vs ZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zKGJvb2wgZW5hYmxlZCkKICNlbmRpZgogfQogCi0KLXZv aWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRQZXJUaWxlUGFpbnRpbmcoYm9vbCBlbmFibGVkKQordm9p ZCBXZWJTZXR0aW5nc0ltcGw6OnNldFBlclRpbGVEcmF3aW5nRW5hYmxlZChib29sIGVuYWJsZWQp CiB7Ci0gICAgbV9wZXJUaWxlUGFpbnRpbmcgPSBlbmFibGVkOworICAgIG1fc2V0dGluZ3MtPnNl dFBlclRpbGVEcmF3aW5nRW5hYmxlZChlbmFibGVkKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0lt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCmluZGV4 IDg4ZTI1ZTk2ZWZjYWZlNTI0ZTA4YTc2NjYxMTYxY2I3NTkzNDRlZTUuLmE5ZGIxNTFlZWU3YjM1 ZDYwYmU5MzQyM2IxZmRmYTQ4NDllMGZjYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlNldHRpbmdzSW1wbC5oCkBAIC0xMjgsMTUgKzEyOCwxMyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHNldFNob3VsZERpc3BsYXlTdWJ0aXRsZXMoYm9vbCk7CiAgICAgdmlydHVh bCB2b2lkIHNldFNob3VsZERpc3BsYXlDYXB0aW9ucyhib29sKTsKICAgICB2aXJ0dWFsIHZvaWQg c2V0U2hvdWxkRGlzcGxheVRleHREZXNjcmlwdGlvbnMoYm9vbCk7Ci0gICAgdmlydHVhbCB2b2lk IHNldFBlclRpbGVQYWludGluZyhib29sKTsKLSAgICB2aXJ0dWFsIGJvb2wgcGVyVGlsZVBhaW50 aW5nKCkgY29uc3QgeyByZXR1cm4gbV9wZXJUaWxlUGFpbnRpbmc7IH0KKyAgICB2aXJ0dWFsIHZv aWQgc2V0UGVyVGlsZURyYXdpbmdFbmFibGVkKGJvb2wpOwogCiBwcml2YXRlOgogICAgIFdlYkNv cmU6OlNldHRpbmdzKiBtX3NldHRpbmdzOwogICAgIGJvb2wgbV9jb21wb3NpdGVUb1RleHR1cmVF bmFibGVkOwogICAgIGJvb2wgbV9zaG93RlBTQ291bnRlcjsKICAgICBib29sIG1fc2hvd1BsYXRm b3JtTGF5ZXJUcmVlOwotICAgIGJvb2wgbV9wZXJUaWxlUGFpbnRpbmc7CiB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAppbmRleCA2MzE1YjUyYWQ4N2Q4ZWQyNmNhYmEwMGM0NTY1NTcwNDZiYzY3YTM1Li5jYjY4MmY4 NDhhMTlmZDJlOWZjMzQ2OWJiNjA1ZTBjMDhiNmVhNjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yOTAzLDcgKzI5MDMsNyBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAg ICAgICAgIGlmICghY2NTZXR0aW5ncy5yZWZyZXNoUmF0ZSkKICAgICAgICAgICAgIGNjU2V0dGlu Z3MucmVmcmVzaFJhdGUgPSBkZWZhdWx0UmVmcmVzaFJhdGU7CiAKLSAgICAgICAgY2NTZXR0aW5n cy5wZXJUaWxlUGFpbnRpbmcgPSBzZXR0aW5ncygpLT5wZXJUaWxlUGFpbnRpbmcoKTsKKyAgICAg ICAgY2NTZXR0aW5ncy5wZXJUaWxlUGFpbnRpbmcgPSBwYWdlKCktPnNldHRpbmdzKCktPnBlclRp bGVEcmF3aW5nRW5hYmxlZCgpOwogCiAgICAgICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0 ID0gTm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0OjpjcmVhdGUoV2ViVmlld0ltcGxDb250ZW50UGFp bnRlcjo6Y3JlYXRlKHRoaXMpKTsKICAgICAgICAgbV9sYXllclRyZWVIb3N0ID0gQ0NMYXllclRy ZWVIb3N0OjpjcmVhdGUodGhpcywgY2NTZXR0aW5ncyk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzE0NmIzMTY1ZGJlZGYyZjRhYzcxN2FhZGEw NDNiNmJhN2FkN2Q3Yi4uMDdlYjE1ZDVmZjc0Y2VmOWM0NTdjOWE5MWUwZjNkZjJmMTc1NjgyNyAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI3IEBACisyMDExLTEyLTA3ICBEYXZpZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBZGQgcGVyLXRpbGUgZHJhd2luZyBmbGFnIHRvIER1 bXBSZW5kZXJUcmVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzQwMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgc3VwcG9ydCBmb3IgY29tbWFuZCBsaW5lIGZsYWcgZW5hYmxlLXBlci10aWxlLWRy YXdpbmcgaW4gRHVtcFJlbmRlclRyZWUuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwOgorICAgICAgICAoVGVzdFNoZWxsOjpU ZXN0U2hlbGwpOgorICAgICAgICAoVGVzdFNoZWxsOjpyZXNldFdlYlNldHRpbmdzKToKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaDoKKyAgICAgICAgKFRlc3RT aGVsbDo6c2V0UGVyVGlsZURyYXdpbmdFbmFibGVkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6 cmVzZXQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2Vz Lmg6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bS5weToKKyAgICAgICAgKENocm9taXVtRHJpdmVyLl93cmFwcGVyX29wdGlvbnMpOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6Cisg ICAgICAgIChwYXJzZV9hcmdzKToKKwogMjAxMS0xMi0wNyAgVG9tIFpha3JhanNlayAgPHRvbXpA Y29kZWF1cm9yYS5vcmc+CiAKICAgICAgICAgTW92ZWQgbXlzZWxmIHRvIHRoZSBjb21taXR0ZXJz IGxpc3QuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVu ZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJl ZS5jcHAKaW5kZXggMDRmMmNiZDZmNGRjNDkwMDIzMWY1MmM0NDk2N2IwZDg5MGE5OTM4Yi4uMjMz ZjgzYjdkZjk3OGE0NmFmYmFiNjZmN2FlMDgwNGEyYjM4ZjVkZSAxMDA2NDQKLS0tIGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjEsNiArNjEsNyBA QCBzdGF0aWMgY29uc3QgY2hhciBvcHRpb25FbmFibGVBY2NlbGVyYXRlZERyYXdpbmdbXSA9ICIt LWVuYWJsZS1hY2NlbGVyYXRlZC1kcmF3aQogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxl QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZvclZpZGVvW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQt dmlkZW8iOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQ29tcG9zaXRlVG9UZXh0dXJl W10gPSAiLS1lbmFibGUtY29tcG9zaXRlLXRvLXRleHR1cmUiOwogc3RhdGljIGNvbnN0IGNoYXIg b3B0aW9uVXNlR3JhcGhpY3NDb250ZXh0M0RJbXBsZW1lbnRhdGlvbltdID0gIi0tdXNlLWdyYXBo aWNzLWNvbnRleHQtM2QtaW1wbGVtZW50YXRpb249IjsKK3N0YXRpYyBjb25zdCBjaGFyIG9wdGlv bkVuYWJsZVBlclRpbGVEcmF3aW5nW10gPSAiLS1lbmFibGUtcGVyLXRpbGUtZHJhd2luZyI7CiAK IHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvblN0cmVzc09wdFtdID0gIi0tc3RyZXNzLW9wdCI7CiBz dGF0aWMgY29uc3QgY2hhciBvcHRpb25TdHJlc3NEZW9wdFtdID0gIi0tc3RyZXNzLWRlb3B0IjsK QEAgLTE0NSw2ICsxNDYsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAg IGJvb2wgYWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQgPSBmYWxzZTsKICAgICBib29sIGxlZ2Fj eUFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkID0gZmFsc2U7CiAgICAgYm9vbCBhY2NlbGVyYXRl ZERyYXdpbmdFbmFibGVkID0gZmFsc2U7CisgICAgYm9vbCBwZXJUaWxlRHJhd2luZ0VuYWJsZWQg PSBmYWxzZTsKICAgICBib29sIHN0cmVzc09wdCA9IGZhbHNlOwogICAgIGJvb2wgc3RyZXNzRGVv cHQgPSBmYWxzZTsKICAgICBib29sIGhhcmR3YXJlQWNjZWxlcmF0ZWRHTCA9IGZhbHNlOwpAQCAt MTk4LDcgKzIwMCw5IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgICAg ICAgICAgIHdlYmtpdF9zdXBwb3J0OjpTZXRHcmFwaGljc0NvbnRleHQzREltcGxlbWVudGF0aW9u KHdlYmtpdF9zdXBwb3J0OjpJTl9QUk9DRVNTX0NPTU1BTkRfQlVGRkVSKTsKICAgICAgICAgICAg IGVsc2UgCiAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiVW5rbm93biBHcmFwaGljQ29u dGV4dDNEIGltcGxlbWVudGF0aW9uICVzXG4iLCBpbXBsZW1lbnRhdGlvbi5jX3N0cigpKTsKLSAg ICAgICAgfSBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25TdHJlc3NPcHQpCisgICAgICAgIH0g ZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlUGVyVGlsZURyYXdpbmcpCisgICAgICAg ICAgICBwZXJUaWxlRHJhd2luZ0VuYWJsZWQgPSB0cnVlOworICAgICAgICBlbHNlIGlmIChhcmd1 bWVudCA9PSBvcHRpb25TdHJlc3NPcHQpCiAgICAgICAgICAgICBzdHJlc3NPcHQgPSB0cnVlOwog ICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25TdHJlc3NEZW9wdCkKICAgICAgICAg ICAgIHN0cmVzc0Rlb3B0ID0gdHJ1ZTsKQEAgLTIzOCw2ICsyNDIsNyBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciogYXJndltdKQogICAgICAgICBzaGVsbC5zZXRBY2NlbGVyYXRlZDJkQ2FudmFz RW5hYmxlZChhY2NlbGVyYXRlZDJEQ2FudmFzRW5hYmxlZCk7CiAgICAgICAgIHNoZWxsLnNldExl Z2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGxlZ2FjeUFjY2VsZXJhdGVkMkRDYW52YXNF bmFibGVkKTsKICAgICAgICAgc2hlbGwuc2V0QWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZChhY2Nl bGVyYXRlZERyYXdpbmdFbmFibGVkKTsKKyAgICAgICAgc2hlbGwuc2V0UGVyVGlsZURyYXdpbmdF bmFibGVkKHBlclRpbGVEcmF3aW5nRW5hYmxlZCk7CiAgICAgICAgIHNoZWxsLnNldEphdmFTY3Jp cHRGbGFncyhqYXZhU2NyaXB0RmxhZ3MpOwogICAgICAgICBzaGVsbC5zZXRTdHJlc3NPcHQoc3Ry ZXNzT3B0KTsKICAgICAgICAgc2hlbGwuc2V0U3RyZXNzRGVvcHQoc3RyZXNzRGVvcHQpOwpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKaW5kZXggMTdmMTE1YmU2 MGQwNmRkYzhlOGU2NWViZjA3MGJjNmNkZTNmOTk3Mi4uYzU0ZDkyYWY4NWZmZjA0MTIxMDlmNjVl NTM1YjNhMjc1Nzk2OWMyMSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFNoZWxsLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0 U2hlbGwuY3BwCkBAIC0xMTMsNiArMTEzLDcgQEAgVGVzdFNoZWxsOjpUZXN0U2hlbGwoYm9vbCB0 ZXN0U2hlbGxNb2RlKQogICAgICwgbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChmYWxzZSkK ICAgICAsIG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBt X2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoZmFsc2UpCisgICAgLCBtX3BlclRpbGVEcmF3aW5n RW5hYmxlZChmYWxzZSkKICAgICAsIG1fc3RyZXNzT3B0KGZhbHNlKQogICAgICwgbV9zdHJlc3NE ZW9wdChmYWxzZSkKICAgICAsIG1fZHVtcFdoZW5GaW5pc2hlZCh0cnVlKQpAQCAtMjIwLDYgKzIy MSw3IEBAIHZvaWQgVGVzdFNoZWxsOjpyZXNldFdlYlNldHRpbmdzKFdlYlZpZXcmIHdlYlZpZXcp CiAgICAgbV9wcmVmcy5hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9IG1fYWNjZWxlcmF0ZWQy ZENhbnZhc0VuYWJsZWQ7CiAgICAgbV9wcmVmcy5sZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5h YmxlZCA9IG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgbV9wcmVmcy5h Y2NlbGVyYXRlZERyYXdpbmdFbmFibGVkID0gbV9hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkOwor ICAgIG1fcHJlZnMucGVyVGlsZURyYXdpbmdFbmFibGVkID0gbV9wZXJUaWxlRHJhd2luZ0VuYWJs ZWQ7CiAgICAgbV9wcmVmcy5hcHBseVRvKCZ3ZWJWaWV3KTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmggYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaAppbmRleCBlNzMxM2RmNWZmOTVkNzIyMmY0ZTc2Njc1 ZDgwOWY4MTAxYjI5MmFjLi5mYWEzNDAzOGViODFkZTZiYzQ3OWYwM2YzNzE0NzRlOTQ5NDU4Y2Zm IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaApAQCAtMTM4LDYg KzEzOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVk KGJvb2wgZW5hYmxlZCkgeyBtX2FjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gZW5hYmxlZDsg fQogICAgIHZvaWQgc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYm9vbCBlbmFi bGVkKSB7IG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQgPSBlbmFibGVkOyB9CiAg ICAgdm9pZCBzZXRBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2Fj Y2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQgPSBlbmFibGVkOyB9CisgICAgdm9pZCBzZXRQZXJUaWxl RHJhd2luZ0VuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fcGVyVGlsZURyYXdpbmdFbmFibGVkID0g ZW5hYmxlZDsgfQogI2lmIGRlZmluZWQoT1NfV0lOKQogICAgIC8vIEFjY2VzcyB0byB0aGUgZmlu aXNoZWQgZXZlbnQuIFVzZWQgYnkgdGhlIHN0YXRpYyBXYXRjaERvZyB0aHJlYWQuCiAgICAgSEFO RExFIGZpbmlzaGVkRXZlbnQoKSB7IHJldHVybiBtX2ZpbmlzaGVkRXZlbnQ7IH0KQEAgLTIyNyw2 ICsyMjgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxl ZDsKICAgICBib29sIG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgYm9v bCBtX2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7CisgICAgYm9vbCBtX3BlclRpbGVEcmF3aW5n RW5hYmxlZDsKICAgICBXZWJQcmVmZXJlbmNlcyBtX3ByZWZzOwogICAgIGJvb2wgbV9zdHJlc3NP cHQ7CiAgICAgYm9vbCBtX3N0cmVzc0Rlb3B0OwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwCmluZGV4IDc1YTA1Nzc4OThhMmRmYWEzODU0ZDBm YjY1NThlOTA2ZDEzMzI2ZDkuLmI5MDEyNzdiMDgwZmNiNDc4NTA1MGNjZGU1MjZiNDMyYjkxZTRk YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVu Y2VzLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNl cy5jcHAKQEAgLTExNSw2ICsxMTUsNyBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpyZXNldCgpCiAg ICAgYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCA9IGZhbHNlOwogICAgIGZvcmNlQ29tcG9zaXRp bmdNb2RlID0gZmFsc2U7CiAgICAgaGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCA9IHRy dWU7CisgICAgcGVyVGlsZURyYXdpbmdFbmFibGVkID0gZmFsc2U7CiB9CiAKIHN0YXRpYyB2b2lk IHNldFN0YW5kYXJkRm9udEZhbWlseVdyYXBwZXIoV2ViU2V0dGluZ3MqIHNldHRpbmdzLCBjb25z dCBXZWJLaXQ6OldlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQpkaWZmIC0tZ2l0 IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuaCBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmgKaW5kZXggZDZhZTg5YWQ2 ZWE2ODdiNTExODMxODMyZTI4Y2U2NzdhZGMxMzM3OS4uZGYzYzA4ZjIzMzJjNDMwNWZlZWZlOGJk Njk0Y2ViNmI3OTk1MTA0NyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViUHJlZmVyZW5jZXMuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9X ZWJQcmVmZXJlbmNlcy5oCkBAIC0xMDgsNiArMTA4LDcgQEAgc3RydWN0IFdlYlByZWZlcmVuY2Vz IHsKICAgICBib29sIGxlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkOwogICAgIGJvb2wg YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZDsKICAgICBib29sIGhpeGllNzZXZWJTb2NrZXRQcm90 b2NvbEVuYWJsZWQ7CisgICAgYm9vbCBwZXJUaWxlRHJhd2luZ0VuYWJsZWQ7CiAKICAgICBXZWJQ cmVmZXJlbmNlcygpIHsgcmVzZXQoKTsgfQogICAgIHZvaWQgcmVzZXQoKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4 IDdkOWE1M2VhNjJhOTZmMGI4NzZmYWFhZmMxY2Y2NmI1YjVmMzYwZDYuLmRkYjk1OTExYTc3N2I4 YzRiYzQ5NDBiZjQ0NWQyMzAzNzNlNDljZTMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtNDI3LDYgKzQyNyw3IEBA IGNsYXNzIENocm9taXVtRHJpdmVyKERyaXZlcik6CiAgICAgICAgICAgICAnYWNjZWxlcmF0ZWRf ZHJhd2luZyc6ICctLWVuYWJsZS1hY2NlbGVyYXRlZC1kcmF3aW5nJywKICAgICAgICAgICAgICdh Y2NlbGVyYXRlZF92aWRlbyc6ICctLWVuYWJsZS1hY2NlbGVyYXRlZC12aWRlbycsCiAgICAgICAg ICAgICAnZW5hYmxlX2hhcmR3YXJlX2dwdSc6ICctLWVuYWJsZS1oYXJkd2FyZS1ncHUnLAorICAg ICAgICAgICAgJ3Blcl90aWxlX2RyYXdpbmcnOiAnLS1lbmFibGUtcGVyLXRpbGUtZHJhd2luZycs CiAgICAgICAgIH0KICAgICAgICAgZm9yIG5yd3Rfb3B0aW9uLCBkcnRfb3B0aW9uIGluIG9wdGlv bl9tYXBwaW5ncy5pdGVtcygpOgogICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9u KG5yd3Rfb3B0aW9uKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGQxMGIwYzE3ZmE5ZDcyZDI3M2VhYmJm MjgxMjVhN2UwMTFlNDM0NmQuLmY0YzJiNjVmMzFjNTcxMTJmMTQ0Y2E2YjMzZTcyYjhjOTVhM2Y1 OGQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjIwLDYgKzIyMCw5IEBAIGRlZiBwYXJzZV9hcmdzKGFy Z3M9Tm9uZSk6CiAgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAgICAgICAg ZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgIGhlbHA9IlJ1biBncmFwaGljcyB0ZXN0cyBvbiBy ZWFsIEdQVSBoYXJkd2FyZSB2cyBzb2Z0d2FyZSIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29w dGlvbigiLS1wZXItdGlsZS1kcmF3aW5nIiwKKyAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1 ZSIsCisgICAgICAgICAgICBoZWxwPSJVc2UgcGVyLXRpbGUgZHJhd2luZyBvZiBjb21wb3NpdGVk IHBhZ2VzIiksCiAgICAgXQogCiAgICAgd2Via2l0X29wdGlvbnMgPSBbCg== 118464 2011-12-08 14:03:09 -0800 2011-12-08 17:05:06 -0800 Patch bug-74017-20111208170308.patch text/plain 20031 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcyMGJiYWRlNGJiMDRk ZjIzMjI3NDA5MWFlOGI3ZTNkMjY3ZjQyZi4uYTkzNDJkNmQ4ODNmYjZhYjFlNTZhM2FkYzhmODg5 M2Y5NDNjOTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTA4ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgcGVyLXRpbGUgcGFpbnRpbmcgZmxhZyB0byBEdW1wUmVuZGVyVHJlZSBhbmQgcmVuYW1lIEFj Y2VsZXJhdGVkRHJhd2luZyB0byBBY2NlbGVyYXRlZFBhaW50aW5nIGluIGNocm9taXVtIHNwZWNp ZmljIGNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NDAxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBwZXItdGlsZSBkcmF3aW5nIHRvIHBhZ2Ugc2V0dGluZ3MuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6 U2V0dGluZ3M6OnNldFBlclRpbGVEcmF3aW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpT ZXR0aW5nczo6cGVyVGlsZURyYXdpbmdFbmFibGVkKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVy bmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNldFBlclRpbGVEcmF3aW5n RW5hYmxlZCk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaDoKKwogMjAxMS0xMi0wNyAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBIYW5kbGluZyBv ZiAhaW1wb3J0YW50IGluIGlubGluZSBzdHlsZSBzZXRzIGlzIGJyb2tlbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCA2OTc5OTVmZTE2ODE0NWIyY2QwOWY5YWJlMDM5YmM4ZDFhZWE0MzU0 Li45YWVlZDMwODY5N2VmODJjNWZmM2RmZmU2NTUwMTE3ZWY4NjdjNjgyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTA4ICBEYXZpZCBSZXZlbWFu ICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBZGQgcGVyLXRp bGUgcGFpbnRpbmcgZmxhZyB0byBEdW1wUmVuZGVyVHJlZSBhbmQgcmVuYW1lIEFjY2VsZXJhdGVk RHJhd2luZyB0byBBY2NlbGVyYXRlZFBhaW50aW5nIGluIGNocm9taXVtIHNwZWNpZmljIGNvZGUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDAxNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJT ZXR0aW5nczo6c2V0QWNjZWxlcmF0ZWRQYWludGluZ0VuYWJsZWQgdG8gcHVibGljIEFQSS4KKwor ICAgICAgICAqIHB1YmxpYy9XZWJTZXR0aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5n c0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OldlYlNldHRpbmdz SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0QWNjZWxlcmF0ZWRQ YWludGluZ0VuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldFBl clRpbGVQYWludGluZ0VuYWJsZWQpOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuaDoK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKToKKwogMjAxMS0xMi0wNyAg Sm9uYXRoYW4gQmFja2VyICA8YmFja2VyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21p dW1dIFBsdW1iIGRhbWFnZSBmcm9tIFdlYkV4dGVybmFsVGV4dHVyZUxheWVyIGFuZCBXZWJQbHVn aW5Db250YWluZXIgdG8gQ0NEYW1hZ2VUcmFja2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKaW5kZXgg YTk1NmNiMWFiY2QwZjVjNDAwMzdmY2I2MTgzYjFmZGY4ZWIyZDQ0My4uOGY0NDIyMmZjMWUxYTBh OTljZWZhYjE2MDNkMGJjYWM3N2UwYzExMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtNTAw LDYgKzUwMCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBzaG91bGREaXNw bGF5VGV4dERlc2NyaXB0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRGlzcGxheVRleHRE ZXNjcmlwdGlvbnM7IH0KICNlbmRpZgogCisgICAgICAgIHZvaWQgc2V0UGVyVGlsZURyYXdpbmdF bmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX3BlclRpbGVEcmF3aW5nRW5hYmxlZCA9IGVuYWJsZWQ7 IH0KKyAgICAgICAgYm9vbCBwZXJUaWxlRHJhd2luZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X3BlclRpbGVEcmF3aW5nRW5hYmxlZDsgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgUGFnZSog bV9wYWdlOwogCkBAIC02MzIsNiArNjM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBib29sIG1fc2hvdWxkRGlzcGxheUNhcHRpb25zIDogMTsKICAgICAgICAgYm9vbCBtX3Nob3Vs ZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zIDogMTsKICNlbmRpZgorICAgICAgICBib29sIG1fcGVy VGlsZURyYXdpbmdFbmFibGVkIDogMTsKIAogICAgICAgICBUaW1lcjxTZXR0aW5ncz4gbV9sb2Fk c0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lcjsKICAgICAgICAgdm9pZCBsb2Fkc0ltYWdlc0F1dG9t YXRpY2FsbHlUaW1lckZpcmVkKFRpbWVyPFNldHRpbmdzPiopOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuY3BwCmluZGV4IDNmMDYwNmZhM2Q3YzFmYTI1OWY4MmJhNDA5MWI4YzhjZGJkMTNi OTkuLmFjZWYyMzA5Y2FhZGYwNjY1YmY3ZGM2ZGM2MWRiMzU5ODYxMjc5NjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTY1MSw0ICs2NTEsMTQgQEAgaW50IEludGVybmFs czo6bGFzdFNwZWxsQ2hlY2tQcm9jZXNzZWRTZXF1ZW5jZShEb2N1bWVudCogZG9jdW1lbnQsIEV4 Y2VwdGlvbkNvZGUKICAgICByZXR1cm4gY2hlY2tlci0+bGFzdFByb2Nlc3NlZFNlcXVlbmNlKCk7 CiB9CiAKK3ZvaWQgSW50ZXJuYWxzOjpzZXRQZXJUaWxlRHJhd2luZ0VuYWJsZWQoRG9jdW1lbnQq IGRvY3VtZW50LCBib29sIGVuYWJsZWQsIEV4Y2VwdGlvbkNvZGUmIGVjKQoreworICAgIGlmICgh ZG9jdW1lbnQgfHwgIWRvY3VtZW50LT5zZXR0aW5ncygpKSB7CisgICAgICAgIGVjID0gSU5WQUxJ RF9BQ0NFU1NfRVJSOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZG9jdW1lbnQtPnNl dHRpbmdzKCktPnNldFBlclRpbGVEcmF3aW5nRW5hYmxlZChlbmFibGVkKTsKK30KKwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggMTRkOWRmZGYzYjFkOGQ0YTQxN2ZkMmZmZThi M2E1NzUzYjQ4YzczMi4uZWEwMGQxNThkYjY3NzkwODliN2Y1MzNmMGY0ZDUyNjEzZWI2MTEzNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC0xMTMsNiArMTEzLDggQEAgcHVibGlj OgogICAgIGludCBsYXN0U3BlbGxDaGVja1JlcXVlc3RTZXF1ZW5jZShEb2N1bWVudCosIEV4Y2Vw dGlvbkNvZGUmKTsKICAgICBpbnQgbGFzdFNwZWxsQ2hlY2tQcm9jZXNzZWRTZXF1ZW5jZShEb2N1 bWVudCosIEV4Y2VwdGlvbkNvZGUmKTsKIAorICAgIHZvaWQgc2V0UGVyVGlsZURyYXdpbmdFbmFi bGVkKERvY3VtZW50KiwgYm9vbCBlbmFibGVkLCBFeGNlcHRpb25Db2RlJik7CisKICAgICBzdGF0 aWMgY29uc3QgY2hhciogaW50ZXJuYWxzSWQ7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAppbmRleCBlMmU3NDNhMTBkYjE5NmNkOTcyMGI4 Mzg5ODhlODdiODc3NmI5ZjQwLi5mYjQ3NTYyMjY2NDBhYzZkOGVkZjljMDU5ZDJlZjc5ZGM1NGYy ZTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5n cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKQEAg LTEzMyw4ICsxMzMsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEVuYWJsZVNjcm9s bEFuaW1hdG9yKGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SGl4aWU3NldlYlNvY2tl dFByb3RvY29sRW5hYmxlZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZpc3VhbFdv cmRNb3ZlbWVudEVuYWJsZWQoYm9vbCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRQZXJUaWxl UGFpbnRpbmcoYm9vbCkgPSAwOwotICAgIHZpcnR1YWwgYm9vbCBwZXJUaWxlUGFpbnRpbmcoKSBj b25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkUGFpbnRpbmdFbmFibGVk KGJvb2wpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGVyVGlsZVBhaW50aW5nRW5hYmxlZChi b29sKSA9IDA7CiAKIHByb3RlY3RlZDoKICAgICB+V2ViU2V0dGluZ3MoKSB7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCmluZGV4IDA2ZWUwMTAx MjhhODU2ZjJlYzczZDVkMjNlZGFkODIxNDFmZjY3YjguLjYzZjEzYzRmNTE5YTc0ODQ4YmJmZmY5 MzVkN2YxMTU1NjVkYTJiMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmNwcApAQCAtNTAsNyArNTAsNiBAQCBXZWJTZXR0aW5nc0ltcGw6OldlYlNl dHRpbmdzSW1wbChTZXR0aW5ncyogc2V0dGluZ3MpCiAgICAgLCBtX2NvbXBvc2l0ZVRvVGV4dHVy ZUVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3Nob3dGUFNDb3VudGVyKGZhbHNlKQogICAgICwgbV9z aG93UGxhdGZvcm1MYXllclRyZWUoZmFsc2UpCi0gICAgLCBtX3BlclRpbGVQYWludGluZyhmYWxz ZSkKIHsKICAgICBBU1NFUlQoc2V0dGluZ3MpOwogfQpAQCAtNDk4LDEwICs0OTcsMTQgQEAgdm9p ZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNob3VsZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zKGJvb2wg ZW5hYmxlZCkKICNlbmRpZgogfQogCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0QWNjZWxlcmF0 ZWRQYWludGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQoreworICAgIG1fc2V0dGluZ3MtPnNldEFj Y2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoZW5hYmxlZCk7Cit9CiAKLXZvaWQgV2ViU2V0dGluZ3NJ bXBsOjpzZXRQZXJUaWxlUGFpbnRpbmcoYm9vbCBlbmFibGVkKQordm9pZCBXZWJTZXR0aW5nc0lt cGw6OnNldFBlclRpbGVQYWludGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewotICAgIG1fcGVy VGlsZVBhaW50aW5nID0gZW5hYmxlZDsKKyAgICBtX3NldHRpbmdzLT5zZXRQZXJUaWxlRHJhd2lu Z0VuYWJsZWQoZW5hYmxlZCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAppbmRleCA4OGUyNWU5NmVmY2Fm ZTUyNGUwOGE3NjY2MTE2MWNiNzU5MzQ0ZWU1Li4yYjlhMjVjNzE4NGQ2NzFhMjRkNWI0YTZlNTYx ODllMzEyZjQ5YjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJT ZXR0aW5nc0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5n c0ltcGwuaApAQCAtMTI4LDE1ICsxMjgsMTQgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBz ZXRTaG91bGREaXNwbGF5U3VidGl0bGVzKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91 bGREaXNwbGF5Q2FwdGlvbnMoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFNob3VsZERpc3Bs YXlUZXh0RGVzY3JpcHRpb25zKGJvb2wpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRQZXJUaWxlUGFp bnRpbmcoYm9vbCk7Ci0gICAgdmlydHVhbCBib29sIHBlclRpbGVQYWludGluZygpIGNvbnN0IHsg cmV0dXJuIG1fcGVyVGlsZVBhaW50aW5nOyB9CisgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJh dGVkUGFpbnRpbmdFbmFibGVkKGJvb2wpOworICAgIHZpcnR1YWwgdm9pZCBzZXRQZXJUaWxlUGFp bnRpbmdFbmFibGVkKGJvb2wpOwogCiBwcml2YXRlOgogICAgIFdlYkNvcmU6OlNldHRpbmdzKiBt X3NldHRpbmdzOwogICAgIGJvb2wgbV9jb21wb3NpdGVUb1RleHR1cmVFbmFibGVkOwogICAgIGJv b2wgbV9zaG93RlBTQ291bnRlcjsKICAgICBib29sIG1fc2hvd1BsYXRmb3JtTGF5ZXJUcmVlOwot ICAgIGJvb2wgbV9wZXJUaWxlUGFpbnRpbmc7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA2MzE1YjUy YWQ4N2Q4ZWQyNmNhYmEwMGM0NTY1NTcwNDZiYzY3YTM1Li5jYjY4MmY4NDhhMTlmZDJlOWZjMzQ2 OWJiNjA1ZTBjMDhiNmVhNjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwCkBAIC0yOTAzLDcgKzI5MDMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJc0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAgIGlmICghY2NT ZXR0aW5ncy5yZWZyZXNoUmF0ZSkKICAgICAgICAgICAgIGNjU2V0dGluZ3MucmVmcmVzaFJhdGUg PSBkZWZhdWx0UmVmcmVzaFJhdGU7CiAKLSAgICAgICAgY2NTZXR0aW5ncy5wZXJUaWxlUGFpbnRp bmcgPSBzZXR0aW5ncygpLT5wZXJUaWxlUGFpbnRpbmcoKTsKKyAgICAgICAgY2NTZXR0aW5ncy5w ZXJUaWxlUGFpbnRpbmcgPSBwYWdlKCktPnNldHRpbmdzKCktPnBlclRpbGVEcmF3aW5nRW5hYmxl ZCgpOwogCiAgICAgICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0ID0gTm9uQ29tcG9zaXRl ZENvbnRlbnRIb3N0OjpjcmVhdGUoV2ViVmlld0ltcGxDb250ZW50UGFpbnRlcjo6Y3JlYXRlKHRo aXMpKTsKICAgICAgICAgbV9sYXllclRyZWVIb3N0ID0gQ0NMYXllclRyZWVIb3N0OjpjcmVhdGUo dGhpcywgY2NTZXR0aW5ncyk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMzE0NmIzMTY1ZGJlZGYyZjRhYzcxN2FhZGEwNDNiNmJhN2FkN2Q3Yi4u OWQzOWEyNjQxNWJiNDFiNDkzNzczYTgxZGU3N2ExMTM4ODU5NDIzZSAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEx LTEyLTA4ICBEYXZpZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg W0Nocm9taXVtXSBBZGQgcGVyLXRpbGUgcGFpbnRpbmcgZmxhZyB0byBEdW1wUmVuZGVyVHJlZSBh bmQgcmVuYW1lIEFjY2VsZXJhdGVkRHJhd2luZyB0byBBY2NlbGVyYXRlZFBhaW50aW5nIGluIGNo cm9taXVtIHNwZWNpZmljIGNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NDAxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorICAgICAgICAKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGNvbW1hbmQgbGluZSBmbGFnIGVu YWJsZS1wZXItdGlsZS1wYWludGluZyBpbiBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4p OgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAg ICAgIChUZXN0U2hlbGw6OlRlc3RTaGVsbCk6CisgICAgICAgIChUZXN0U2hlbGw6OnJlc2V0V2Vi U2V0dGluZ3MpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5o OgorICAgICAgICAoVGVzdFNoZWxsOjpzZXRBY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZCk6Cisg ICAgICAgIChUZXN0U2hlbGw6OnNldFBlclRpbGVQYWludGluZ0VuYWJsZWQpOgorICAgICAgICAq IER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdl YlByZWZlcmVuY2VzOjpyZXNldCk6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuaDoKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5Ogor ICAgICAgICAoQ2hyb21pdW1Ecml2ZXIuX3dyYXBwZXJfb3B0aW9ucyk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAg KHBhcnNlX2FyZ3MpOgorCiAyMDExLTEyLTA3ICBUb20gWmFrcmFqc2VrICA8dG9tekBjb2RlYXVy b3JhLm9yZz4KIAogICAgICAgICBNb3ZlZCBteXNlbGYgdG8gdGhlIGNvbW1pdHRlcnMgbGlzdC4K ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVl LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNwcApp bmRleCAwNGYyY2JkNmY0ZGM0OTAwMjMxZjUyYzQ0OTY3YjBkODkwYTk5MzhiLi5mOWY2ZjVhNjk3 ZDMzNjBmNWVjYmQ1YTU0MjI2YWFiNjdkN2I2NjVkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01NywxMCArNTcsMTEgQEAgc3Rh dGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlVGhyZWFkZWRDb21wb3NpdGluZ1tdID0gIi0tZW5h YmxlLXRocmVhZGVkLWNvbXBvc2kKIHN0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkZvcmNlQ29tcG9z aXRpbmdNb2RlW10gPSAiLS1mb3JjZS1jb21wb3NpdGluZy1tb2RlIjsKIHN0YXRpYyBjb25zdCBj aGFyIG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkMkRDYW52YXNbXSA9ICItLWVuYWJsZS1hY2NlbGVy YXRlZC0yZC1jYW52YXMiOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlTGVnYWN5QWNj ZWxlcmF0ZWQyRENhbnZhc1tdID0gIi0tZW5hYmxlLWxlZ2FjeS1hY2NlbGVyYXRlZC0yZC1jYW52 YXMiOwotc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWREcmF3aW5nW10g PSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtZHJhd2luZyI7CitzdGF0aWMgY29uc3QgY2hhciBvcHRp b25FbmFibGVBY2NlbGVyYXRlZFBhaW50aW5nW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtcGFp bnRpbmciOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uRW5hYmxlQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0ZvclZpZGVvW10gPSAiLS1lbmFibGUtYWNjZWxlcmF0ZWQtdmlkZW8iOwogc3RhdGljIGNv bnN0IGNoYXIgb3B0aW9uRW5hYmxlQ29tcG9zaXRlVG9UZXh0dXJlW10gPSAiLS1lbmFibGUtY29t cG9zaXRlLXRvLXRleHR1cmUiOwogc3RhdGljIGNvbnN0IGNoYXIgb3B0aW9uVXNlR3JhcGhpY3ND b250ZXh0M0RJbXBsZW1lbnRhdGlvbltdID0gIi0tdXNlLWdyYXBoaWNzLWNvbnRleHQtM2QtaW1w bGVtZW50YXRpb249IjsKK3N0YXRpYyBjb25zdCBjaGFyIG9wdGlvbkVuYWJsZVBlclRpbGVQYWlu dGluZ1tdID0gIi0tZW5hYmxlLXBlci10aWxlLXBhaW50aW5nIjsKIAogc3RhdGljIGNvbnN0IGNo YXIgb3B0aW9uU3RyZXNzT3B0W10gPSAiLS1zdHJlc3Mtb3B0IjsKIHN0YXRpYyBjb25zdCBjaGFy IG9wdGlvblN0cmVzc0Rlb3B0W10gPSAiLS1zdHJlc3MtZGVvcHQiOwpAQCAtMTQ0LDcgKzE0NSw4 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgYm9vbCBmb3JjZUNvbXBv c2l0aW5nTW9kZSA9IGZhbHNlOwogICAgIGJvb2wgYWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQg PSBmYWxzZTsKICAgICBib29sIGxlZ2FjeUFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkID0gZmFs c2U7Ci0gICAgYm9vbCBhY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkID0gZmFsc2U7CisgICAgYm9v bCBhY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZCA9IGZhbHNlOworICAgIGJvb2wgcGVyVGlsZVBh aW50aW5nRW5hYmxlZCA9IGZhbHNlOwogICAgIGJvb2wgc3RyZXNzT3B0ID0gZmFsc2U7CiAgICAg Ym9vbCBzdHJlc3NEZW9wdCA9IGZhbHNlOwogICAgIGJvb2wgaGFyZHdhcmVBY2NlbGVyYXRlZEdM ID0gZmFsc2U7CkBAIC0xODgsOCArMTkwLDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFy Z3ZbXSkKICAgICAgICAgICAgIGFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkID0gdHJ1ZTsKICAg ICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlTGVnYWN5QWNjZWxlcmF0ZWQy RENhbnZhcykKICAgICAgICAgICAgIGxlZ2FjeUFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkID0g dHJ1ZTsKLSAgICAgICAgZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uRW5hYmxlQWNjZWxlcmF0 ZWREcmF3aW5nKQotICAgICAgICAgICAgYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCA9IHRydWU7 CisgICAgICAgIGVsc2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZUFjY2VsZXJhdGVkUGFp bnRpbmcpCisgICAgICAgICAgICBhY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZCA9IHRydWU7CiAg ICAgICAgIGVsc2UgaWYgKCFhcmd1bWVudC5maW5kKG9wdGlvblVzZUdyYXBoaWNzQ29udGV4dDNE SW1wbGVtZW50YXRpb24pKSB7CiAgICAgICAgICAgICBzdHJpbmcgaW1wbGVtZW50YXRpb24gPSBh cmd1bWVudC5zdWJzdHIoc3RybGVuKG9wdGlvblVzZUdyYXBoaWNzQ29udGV4dDNESW1wbGVtZW50 YXRpb24pKTsKICAgICAgICAgICAgIGlmICghaW1wbGVtZW50YXRpb24uY29tcGFyZSgiSU5fUFJP Q0VTUyIpKSAKQEAgLTE5OCw3ICsyMDAsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJn dltdKQogICAgICAgICAgICAgICB3ZWJraXRfc3VwcG9ydDo6U2V0R3JhcGhpY3NDb250ZXh0M0RJ bXBsZW1lbnRhdGlvbih3ZWJraXRfc3VwcG9ydDo6SU5fUFJPQ0VTU19DT01NQU5EX0JVRkZFUik7 CiAgICAgICAgICAgICBlbHNlIAogICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlVua25v d24gR3JhcGhpY0NvbnRleHQzRCBpbXBsZW1lbnRhdGlvbiAlc1xuIiwgaW1wbGVtZW50YXRpb24u Y19zdHIoKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAoYXJndW1lbnQgPT0gb3B0aW9uU3RyZXNzT3B0 KQorICAgICAgICB9IGVsc2UgaWYgKGFyZ3VtZW50ID09IG9wdGlvbkVuYWJsZVBlclRpbGVQYWlu dGluZykKKyAgICAgICAgICAgIHBlclRpbGVQYWludGluZ0VuYWJsZWQgPSB0cnVlOworICAgICAg ICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25TdHJlc3NPcHQpCiAgICAgICAgICAgICBzdHJl c3NPcHQgPSB0cnVlOwogICAgICAgICBlbHNlIGlmIChhcmd1bWVudCA9PSBvcHRpb25TdHJlc3NE ZW9wdCkKICAgICAgICAgICAgIHN0cmVzc0Rlb3B0ID0gdHJ1ZTsKQEAgLTIzNyw3ICsyNDEsOCBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICBzaGVsbC5zZXRGb3Jj ZUNvbXBvc2l0aW5nTW9kZShmb3JjZUNvbXBvc2l0aW5nTW9kZSk7CiAgICAgICAgIHNoZWxsLnNl dEFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGFjY2VsZXJhdGVkMkRDYW52YXNFbmFibGVkKTsK ICAgICAgICAgc2hlbGwuc2V0TGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQobGVnYWN5 QWNjZWxlcmF0ZWQyRENhbnZhc0VuYWJsZWQpOwotICAgICAgICBzaGVsbC5zZXRBY2NlbGVyYXRl ZERyYXdpbmdFbmFibGVkKGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQpOworICAgICAgICBzaGVs bC5zZXRBY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZChhY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxl ZCk7CisgICAgICAgIHNoZWxsLnNldFBlclRpbGVQYWludGluZ0VuYWJsZWQocGVyVGlsZVBhaW50 aW5nRW5hYmxlZCk7CiAgICAgICAgIHNoZWxsLnNldEphdmFTY3JpcHRGbGFncyhqYXZhU2NyaXB0 RmxhZ3MpOwogICAgICAgICBzaGVsbC5zZXRTdHJlc3NPcHQoc3RyZXNzT3B0KTsKICAgICAgICAg c2hlbGwuc2V0U3RyZXNzRGVvcHQoc3RyZXNzRGVvcHQpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKaW5kZXggMTdmMTE1YmU2MGQwNmRkYzhlOGU2NWViZjA3 MGJjNmNkZTNmOTk3Mi4uZjE1Y2I0NDRhZDI2YTJiY2M0MjMyNWM5M2Y4Y2Q5N2ZjMzRkMjUzZiAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCkBAIC0xMTIs NyArMTEyLDggQEAgVGVzdFNoZWxsOjpUZXN0U2hlbGwoYm9vbCB0ZXN0U2hlbGxNb2RlKQogICAg ICwgbV9mb3JjZUNvbXBvc2l0aW5nTW9kZShmYWxzZSkKICAgICAsIG1fYWNjZWxlcmF0ZWQyZENh bnZhc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX2xlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFi bGVkKGZhbHNlKQotICAgICwgbV9hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKGZhbHNlKQorICAg ICwgbV9hY2NlbGVyYXRlZFBhaW50aW5nRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fcGVyVGlsZVBh aW50aW5nRW5hYmxlZChmYWxzZSkKICAgICAsIG1fc3RyZXNzT3B0KGZhbHNlKQogICAgICwgbV9z dHJlc3NEZW9wdChmYWxzZSkKICAgICAsIG1fZHVtcFdoZW5GaW5pc2hlZCh0cnVlKQpAQCAtMjE5 LDcgKzIyMCw4IEBAIHZvaWQgVGVzdFNoZWxsOjpyZXNldFdlYlNldHRpbmdzKFdlYlZpZXcmIHdl YlZpZXcpCiAgICAgbV9wcmVmcy5mb3JjZUNvbXBvc2l0aW5nTW9kZSA9IG1fZm9yY2VDb21wb3Np dGluZ01vZGU7CiAgICAgbV9wcmVmcy5hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9IG1fYWNj ZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7CiAgICAgbV9wcmVmcy5sZWdhY3lBY2NlbGVyYXRlZDJk Q2FudmFzRW5hYmxlZCA9IG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7Ci0gICAg bV9wcmVmcy5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkID0gbV9hY2NlbGVyYXRlZERyYXdpbmdF bmFibGVkOworICAgIG1fcHJlZnMuYWNjZWxlcmF0ZWRQYWludGluZ0VuYWJsZWQgPSBtX2FjY2Vs ZXJhdGVkUGFpbnRpbmdFbmFibGVkOworICAgIG1fcHJlZnMucGVyVGlsZVBhaW50aW5nRW5hYmxl ZCA9IG1fcGVyVGlsZVBhaW50aW5nRW5hYmxlZDsKICAgICBtX3ByZWZzLmFwcGx5VG8oJndlYlZp ZXcpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0 U2hlbGwuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5oCmluZGV4 IGU3MzEzZGY1ZmY5NWQ3MjIyZjRlNzY2NzVkODA5ZjgxMDFiMjkyYWMuLmEwOTVlZjJkMGU5NTky YmVlZTc4MDkzYjBkZjM4YzM3ZWI4NzNjMmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbC5oCkBAIC0xMzcsNyArMTM3LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0 Rm9yY2VDb21wb3NpdGluZ01vZGUoYm9vbCBlbmFibGVkKSB7IG1fZm9yY2VDb21wb3NpdGluZ01v ZGUgPSBlbmFibGVkOyB9CiAgICAgdm9pZCBzZXRBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChi b29sIGVuYWJsZWQpIHsgbV9hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9IGVuYWJsZWQ7IH0K ICAgICB2b2lkIHNldExlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKGJvb2wgZW5hYmxl ZCkgeyBtX2xlZ2FjeUFjY2VsZXJhdGVkMmRDYW52YXNFbmFibGVkID0gZW5hYmxlZDsgfQotICAg IHZvaWQgc2V0QWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9hY2Nl bGVyYXRlZERyYXdpbmdFbmFibGVkID0gZW5hYmxlZDsgfQorICAgIHZvaWQgc2V0QWNjZWxlcmF0 ZWRQYWludGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fYWNjZWxlcmF0ZWRQYWludGluZ0Vu YWJsZWQgPSBlbmFibGVkOyB9CisgICAgdm9pZCBzZXRQZXJUaWxlUGFpbnRpbmdFbmFibGVkKGJv b2wgZW5hYmxlZCkgeyBtX3BlclRpbGVQYWludGluZ0VuYWJsZWQgPSBlbmFibGVkOyB9CiAjaWYg ZGVmaW5lZChPU19XSU4pCiAgICAgLy8gQWNjZXNzIHRvIHRoZSBmaW5pc2hlZCBldmVudC4gVXNl ZCBieSB0aGUgc3RhdGljIFdhdGNoRG9nIHRocmVhZC4KICAgICBIQU5ETEUgZmluaXNoZWRFdmVu dCgpIHsgcmV0dXJuIG1fZmluaXNoZWRFdmVudDsgfQpAQCAtMjI2LDcgKzIyNyw4IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX2ZvcmNlQ29tcG9zaXRpbmdNb2RlOwogICAgIGJvb2wgbV9hY2NlbGVy YXRlZDJkQ2FudmFzRW5hYmxlZDsKICAgICBib29sIG1fbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQ7Ci0gICAgYm9vbCBtX2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7CisgICAgYm9v bCBtX2FjY2VsZXJhdGVkUGFpbnRpbmdFbmFibGVkOworICAgIGJvb2wgbV9wZXJUaWxlUGFpbnRp bmdFbmFibGVkOwogICAgIFdlYlByZWZlcmVuY2VzIG1fcHJlZnM7CiAgICAgYm9vbCBtX3N0cmVz c09wdDsKICAgICBib29sIG1fc3RyZXNzRGVvcHQ7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKaW5kZXggNzVhMDU3Nzg5OGEyZGZhYTM4NTRk MGZiNjU1OGU5MDZkMTMzMjZkOS4uYzFiNDE2MjliNmQyMDFhZGMxMzAzN2ZhYzc3OTRjZGFjMWQy ODE4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVy ZW5jZXMuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVu Y2VzLmNwcApAQCAtMTEyLDkgKzExMiwxMCBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjpyZXNldCgp CiAgICAgY29tcG9zaXRlVG9UZXh0dXJlID0gZmFsc2U7CiAgICAgYWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQgPSBmYWxzZTsKICAgICBsZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCA9 IGZhbHNlOwotICAgIGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQgPSBmYWxzZTsKKyAgICBhY2Nl bGVyYXRlZFBhaW50aW5nRW5hYmxlZCA9IGZhbHNlOwogICAgIGZvcmNlQ29tcG9zaXRpbmdNb2Rl ID0gZmFsc2U7CiAgICAgaGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCA9IHRydWU7Cisg ICAgcGVyVGlsZVBhaW50aW5nRW5hYmxlZCA9IGZhbHNlOwogfQogCiBzdGF0aWMgdm9pZCBzZXRT dGFuZGFyZEZvbnRGYW1pbHlXcmFwcGVyKFdlYlNldHRpbmdzKiBzZXR0aW5ncywgY29uc3QgV2Vi S2l0OjpXZWJTdHJpbmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkKQEAgLTIxNiw4ICsyMTcs OSBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjphcHBseVRvKFdlYlZpZXcqIHdlYlZpZXcpCiAgICAg c2V0dGluZ3MtPnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKGZvcmNlQ29tcG9zaXRpbmdNb2RlKTsK ICAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoYWNjZWxlcmF0ZWQy ZENhbnZhc0VuYWJsZWQpOwogICAgIHNldHRpbmdzLT5zZXRMZWdhY3lBY2NlbGVyYXRlZDJkQ2Fu dmFzRW5hYmxlZChsZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCk7Ci0gICAgc2V0dGlu Z3MtPnNldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxl ZCk7CisgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkUGFpbnRpbmdFbmFibGVkKGFjY2VsZXJh dGVkUGFpbnRpbmdFbmFibGVkKTsKICAgICBzZXR0aW5ncy0+c2V0SGl4aWU3NldlYlNvY2tldFBy b3RvY29sRW5hYmxlZChoaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKTsKKyAgICBzZXR0 aW5ncy0+c2V0UGVyVGlsZVBhaW50aW5nRW5hYmxlZChwZXJUaWxlUGFpbnRpbmdFbmFibGVkKTsK IAogICAgIC8vIEZpeGVkIHZhbHVlcy4KICAgICBzZXR0aW5ncy0+c2V0VGV4dERpcmVjdGlvblN1 Ym1lbnVJbmNsdXNpb25CZWhhdmlvck5ldmVySW5jbHVkZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmggYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5oCmluZGV4IGQ2YWU4OWFkNmVhNjg3YjUx MTgzMTgzMmUyOGNlNjc3YWRjMTMzNzkuLmViMDk0MzY2NmMzOWMzNDdhMzY1OGYzYTY3ZDA4NDli MGYxMTYwNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlBy ZWZlcmVuY2VzLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVy ZW5jZXMuaApAQCAtMTA2LDggKzEwNiw5IEBAIHN0cnVjdCBXZWJQcmVmZXJlbmNlcyB7CiAgICAg Ym9vbCBmb3JjZUNvbXBvc2l0aW5nTW9kZTsKICAgICBib29sIGFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkOwogICAgIGJvb2wgbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQ7Ci0gICAg Ym9vbCBhY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkOworICAgIGJvb2wgYWNjZWxlcmF0ZWRQYWlu dGluZ0VuYWJsZWQ7CiAgICAgYm9vbCBoaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkOwor ICAgIGJvb2wgcGVyVGlsZVBhaW50aW5nRW5hYmxlZDsKIAogICAgIFdlYlByZWZlcmVuY2VzKCkg eyByZXNldCgpOyB9CiAgICAgdm9pZCByZXNldCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggN2Q5YTUzZWE2MmE5 NmYwYjg3NmZhYWFmYzFjZjY2YjViNWYzNjBkNi4uMDhkNjAxMGNiZjNhNWFiMDhlZjcyYmQ0MTUw NmU3MDE4ZGJlZGQ1NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC00MjQsOSArNDI0LDEwIEBAIGNsYXNzIENocm9t aXVtRHJpdmVyKERyaXZlcik6CiAgICAgICAgICAgICAnc3RyZXNzX2Rlb3B0JzogJy0tc3RyZXNz LWRlb3B0JywKICAgICAgICAgICAgICd0aHJlYWRlZF9jb21wb3NpdGluZyc6ICctLWVuYWJsZS10 aHJlYWRlZC1jb21wb3NpdGluZycsCiAgICAgICAgICAgICAnYWNjZWxlcmF0ZWRfMmRfY2FudmFz JzogJy0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcycsCi0gICAgICAgICAgICAnYWNjZWxl cmF0ZWRfZHJhd2luZyc6ICctLWVuYWJsZS1hY2NlbGVyYXRlZC1kcmF3aW5nJywKKyAgICAgICAg ICAgICdhY2NlbGVyYXRlZF9wYWludGluZyc6ICctLWVuYWJsZS1hY2NlbGVyYXRlZC1wYWludGlu ZycsCiAgICAgICAgICAgICAnYWNjZWxlcmF0ZWRfdmlkZW8nOiAnLS1lbmFibGUtYWNjZWxlcmF0 ZWQtdmlkZW8nLAogICAgICAgICAgICAgJ2VuYWJsZV9oYXJkd2FyZV9ncHUnOiAnLS1lbmFibGUt aGFyZHdhcmUtZ3B1JywKKyAgICAgICAgICAgICdwZXJfdGlsZV9wYWludGluZyc6ICctLWVuYWJs ZS1wZXItdGlsZS1wYWludGluZycsCiAgICAgICAgIH0KICAgICAgICAgZm9yIG5yd3Rfb3B0aW9u LCBkcnRfb3B0aW9uIGluIG9wdGlvbl9tYXBwaW5ncy5pdGVtcygpOgogICAgICAgICAgICAgaWYg c2VsZi5fcG9ydC5nZXRfb3B0aW9uKG5yd3Rfb3B0aW9uKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGQx MGIwYzE3ZmE5ZDcyZDI3M2VhYmJmMjgxMjVhN2UwMTFlNDM0NmQuLjdlNjlmNTFiYTU4ZWM0NjI0 YjUwNWYzMTlhMWQ4MjE5N2RiNTgxNjcgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjEyLDE0ICsyMTIs MTcgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAgICAgICAgICAgIGFjdGlvbj0ic3Rv cmVfZmFsc2UiLAogICAgICAgICAgICAgZGVzdD0iYWNjZWxlcmF0ZWRfMmRfY2FudmFzIiwKICAg ICAgICAgICAgIGhlbHA9IkRvbid0IHVzZSBoYXJkd2FyZS1hY2NlbGVyYXRlZCAyRCBDYW52YXMg Y2FsbHMiKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tYWNjZWxlcmF0ZWQtZHJh d2luZyIsCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWFjY2VsZXJhdGVkLXBhaW50 aW5nIiwKICAgICAgICAgICAgIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICBkZWZh dWx0PUZhbHNlLAotICAgICAgICAgICAgaGVscD0iVXNlIGhhcmR3YXJlIGFjY2VsZXJhdGVkIGRy YXdpbmcgb2YgY29tcG9zaXRlZCBwYWdlcyIpLAorICAgICAgICAgICAgaGVscD0iVXNlIGhhcmR3 YXJlIGFjY2VsZXJhdGVkIHBhaW50aW5nIG9mIGNvbXBvc2l0ZWQgcGFnZXMiKSwKICAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oIi0tZW5hYmxlLWhhcmR3YXJlLWdwdSIsCiAgICAgICAgICAg ICBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwKICAgICAg ICAgICAgIGhlbHA9IlJ1biBncmFwaGljcyB0ZXN0cyBvbiByZWFsIEdQVSBoYXJkd2FyZSB2cyBz b2Z0d2FyZSIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1wZXItdGlsZS1wYWlu dGluZyIsCisgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAorICAgICAgICAgICAgaGVs cD0iVXNlIHBlci10aWxlIHBhaW50aW5nIG9mIGNvbXBvc2l0ZWQgcGFnZXMiKSwKICAgICBdCiAK ICAgICB3ZWJraXRfb3B0aW9ucyA9IFsK