65555 2011-08-02 11:55:07 -0700 Chromium: Update forked ScrollbarThemeChromiumMac.mm 2011-08-18 15:14:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sail sail jamesr thakis webkit.review.bot zmo oldest_to_newest 445388 0 sail 2011-08-02 11:55:07 -0700 Chromium: Update forked ScrollbarThemeChromiumMac.mm 445391 1 102671 sail 2011-08-02 11:56:53 -0700 Created attachment 102671 Patch 445507 2 102671 jamesr 2011-08-02 14:02:27 -0700 Comment on attachment 102671 Patch OK. What's the plan for unforking? 445509 3 sail 2011-08-02 14:04:12 -0700 (In reply to comment #2) > (From update of attachment 102671 [details]) > OK. What's the plan for unforking? It looks like people has started working on adding smooth scrolling to Chromium Mac. Once that lands I'll delete the forked files and start using the original versions. 445560 4 102671 webkit.review.bot 2011-08-02 15:11:43 -0700 Comment on attachment 102671 Patch Clearing flags on attachment: 102671 Committed r92238: <http://trac.webkit.org/changeset/92238> 445561 5 webkit.review.bot 2011-08-02 15:11:47 -0700 All reviewed patches have been landed. Closing bug. 445623 6 zmo 2011-08-02 17:07:08 -0700 Your patch is rolled out in r92248 due to fast/events/scrollbar-double-click.html failing on Mac. Reopen this bug. Below is the test result diff from our Mac bots: --- /b/build/slave/Webkit_Mac10_5/build/layout-test-results/fast/events/scrollbar-double-click-expected.txt +++ /b/build/slave/Webkit_Mac10_5/build/layout-test-results/fast/events/scrollbar-double-click-actual.txt @@ -1,1 +1,1 @@ -Scroll offset is 700 +Scroll offset is 720 445657 7 sail 2011-08-02 18:17:41 -0700 Sorry about that Zhenyao. This is probably due to the addition of maxOverlapBetweenPages(). Looking into it. 445706 8 thakis 2011-08-02 21:18:53 -0700 Might be the test just needs to be rebased. What does the webkit/mac expectations file say? Does it still match ours? 445957 9 102795 sail 2011-08-03 11:13:15 -0700 Created attachment 102795 Patch 445958 10 sail 2011-08-03 11:14:08 -0700 Updated the expectation file to match the one in platform/mac Please take another look. Thanks 449335 11 102795 jamesr 2011-08-10 13:02:55 -0700 Comment on attachment 102795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102795&action=review > LayoutTests/platform/chromium-mac/fast/events/scrollbar-double-click-expected.txt:1 > +Scroll offset is 720 this matches LayoutTests/platform/mac/fast/events/scrollbar-double-click-expected.txt, so you can just delete this file completely instead of making it match. 452092 12 sail 2011-08-16 20:28:29 -0700 change looks on on try bots: - http://build.chromium.org/p/tryserver.chromium/builders/mac_layout_rel/builds/274 - http://build.chromium.org/p/tryserver.chromium/builders/win_layout_rel/builds/437 - http://build.chromium.org/p/tryserver.chromium/builders/linux_layout/builds/1150 452099 13 thakis 2011-08-16 21:03:21 -0700 sail: Update the patch locally to delete the expectations file like jamesr recommends, then upload it with "webkit-patch land-safely". I will set cq+, you don't need another r+ in that case. 452133 14 104151 sail 2011-08-16 22:38:33 -0700 Created attachment 104151 Patch for landing 452135 15 104151 webkit.review.bot 2011-08-16 22:39:20 -0700 Comment on attachment 104151 Patch for landing Rejecting attachment 104151 from commit-queue. sail@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 452196 16 104151 webkit.review.bot 2011-08-17 03:54:34 -0700 Comment on attachment 104151 Patch for landing Rejecting attachment 104151 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: form/chromium/ScrollbarThemeChromiumMac.mm Hunk #1 succeeded at 172 (offset 9 lines). Hunk #2 succeeded at 184 (offset 9 lines). Hunk #3 succeeded at 248 (offset 24 lines). Hunk #4 FAILED at 447. Hunk #5 succeeded at 495 (offset 25 lines). Hunk #6 succeeded at 532 (offset 25 lines). 1 out of 6 hunks FAILED -- saving rejects to file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9403854 453326 17 104391 sail 2011-08-18 13:52:12 -0700 Created attachment 104391 Patch for landing 453327 18 104391 webkit.review.bot 2011-08-18 13:52:54 -0700 Comment on attachment 104391 Patch for landing Rejecting attachment 104391 from commit-queue. sail@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 453328 19 104392 sail 2011-08-18 13:53:48 -0700 Created attachment 104392 Patch for landing 453329 20 104392 webkit.review.bot 2011-08-18 13:54:11 -0700 Comment on attachment 104392 Patch for landing Rejecting attachment 104392 from commit-queue. sail@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 453333 21 104392 webkit.review.bot 2011-08-18 13:57:31 -0700 Comment on attachment 104392 Patch for landing Rejecting attachment 104392 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: g file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h patching file Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm Hunk #1 succeeded at 173 (offset 1 line). Hunk #2 succeeded at 185 (offset 1 line). Hunk #3 succeeded at 254 (offset 6 lines). Hunk #4 succeeded at 477 (offset 6 lines). Hunk #5 succeeded at 489 (offset 6 lines). Hunk #6 succeeded at 526 (offset 6 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9419886 453352 22 104398 sail 2011-08-18 14:29:50 -0700 Created attachment 104398 Patch for landing 453353 23 104398 webkit.review.bot 2011-08-18 14:30:23 -0700 Comment on attachment 104398 Patch for landing Rejecting attachment 104398 from commit-queue. sail@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 453356 24 jamesr 2011-08-18 14:32:05 -0700 Sail, you aren't a WebKit committer so you can't mark patches commit-queue+. Mark it commit-queue? and any committer (like Nico) can set it to commit-queue+. 453360 25 104398 thakis 2011-08-18 14:35:40 -0700 Comment on attachment 104398 Patch for landing (my bad, i told him to use land-safely 'cause i thought that fills in the reviewer. but upload --reviewer should do that, too) 453361 26 sail 2011-08-18 14:36:23 -0700 (In reply to comment #25) > (From update of attachment 104398 [details]) > (my bad, i told him to use land-safely 'cause i thought that fills in the reviewer. but upload --reviewer should do that, too) Ahh, will try that next time. 453394 27 104398 webkit.review.bot 2011-08-18 15:14:36 -0700 Comment on attachment 104398 Patch for landing Clearing flags on attachment: 104398 Committed r93356: <http://trac.webkit.org/changeset/93356> 453395 28 webkit.review.bot 2011-08-18 15:14:41 -0700 All reviewed patches have been landed. Closing bug. 102671 2011-08-02 11:56:53 -0700 2011-08-03 11:13:11 -0700 Patch bug-65555-20110802115652.patch text/plain 8365 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTIxOTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MDBlYzZjMGNhZWVhNzVh OWMwZjM4MTM1ZDYyZjdkOTFmM2UxMjJkLi5hNTI0ZWNmNDc2NDMzYjU4Y2UyMTUwNTZiOTAyOGUy MGFjMmMxZjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDgtMDIgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRh dGUgZm9ya2VkIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgTWVyZ2UgcmVj ZW50IGNoYW5nZXMgdG8gU2Nyb2xsYmFyVGhlbWVNYWMubW0gdG8gU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1 bU1hYy5oOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGls aXRpZXNDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJs ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1N YWMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6Om1heE92 ZXJsYXBCZXR3ZWVuUGFnZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJh clRoZW1lQ2hyb21pdW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNo cm9taXVtTWFjOjpyZWdpc3RlclNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjOjpzZXROZXdQYWludGVyRm9yU2Nyb2xsYmFyKToKKyAgICAgICAg KFdlYkNvcmU6OnRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZSk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlRW5h YmxlZFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6 OnBhaW50KToKKwogMjAxMS0wOC0wMiAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgW1F0XSBTaW1wbGlmeSBQYXRoOjp0cmFuc2xhdGUoKSBpbXBsZW1lbnRhdGlv bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJh ck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKaW5kZXggYjE4 YTA0OGJkMzllZTY3MGNkMGJjM2NmMzM1ODQ4OTQyYjhlMDBmMS4uYjc1YzIyMWFlZGVhYTZmZDU0 Yzc3M2E0MzJhZTRjNTdlYmZjMzM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGll c0Nocm9taXVtTWFjLmgKQEAgLTYxLDYgKzYxLDcgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQ YWludFRyYWNrKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgYm9vbCBlbmFibGVkLCBkb3VibGUgdmEK IHZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZik7 CiBpbnQgd2tTY3JvbGxiYXJNaW5pbXVtVGh1bWJMZW5ndGgoV0tTY3JvbGxiYXJQYWludGVyUmVm KTsKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0RGVsZWdhdGUoV0tTY3JvbGxiYXJQYWludGVy UmVmLCBpZCBzY3JvbGxiYXJQYWludGVyRGVsZWdhdGUpOwordm9pZCB3a1Njcm9sbGJhclBhaW50 ZXJTZXRFbmFibGVkKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgYm9vbCBlbmFibGVkKTsKIENHRmxv YXQgd2tTY3JvbGxiYXJQYWludGVyVHJhY2tBbHBoYShXS1Njcm9sbGJhclBhaW50ZXJSZWYpOwog V0tTY3JvbGxiYXJQYWludGVyUmVmIHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoaW50IGNvbnRyb2xT aXplLCBib29sIGlzSG9yaXpvbnRhbCk7CiBpbnQgd2tTY3JvbGxiYXJUaGlja25lc3MoaW50IGNv bnRyb2xTaXplKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5t bQppbmRleCBhMDBhNjUyYTEzZWQ0NmQ4ODZhOTAzMjJkZjJjMmFhMTUyNjA1MzlkLi5mYTZmMjBl MzQ5NGNhNDA2Yjk2MzRmZDZjNWYwZWU2MGVkOGRjZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1N YWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3Zl cmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tCkBAIC0xODcsNiArMTg3LDExIEBAIHZvaWQgd2tT Y3JvbGxiYXJQYWludGVyU2V0RGVsZWdhdGUoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIs IGlkIHNjcm9sbGJhclBhCiAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6c2Nyb2xsYmFyUGFpbnRl ckRlbGVnYXRlXTsKIH0KIAordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKFdLU2Ny b2xsYmFyUGFpbnRlclJlZiBwYWludGVyLCBib29sIGVuYWJsZWQpCit7CisgICAgW3BhaW50ZXIg c2V0RW5hYmxlZDplbmFibGVkXTsKK30KKwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJUcmFj a0FscGhhKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyKQogewogICAgIHJldHVybiBbcGFp bnRlciB0cmFja0FscGhhXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAppbmRleCA2MzJlMzY5MjMz OTkxZGFlZDM0ZDczYjY0OTQxMDE3MWRlOGNkOGUyLi4yNTlmMGU1YThmZjA4NWJkZGI3Mjg1ZDZk MDQ1ZTIwZGZjODhiNWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCkBAIC00MCwxMiArNDAs MTUgQEAgcHVibGljOgogICAgIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMoKTsKICAgICB2aXJ0 dWFsIH5TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjKCk7CiAKKyAgICB2aXJ0dWFsIHZvaWQgdXBk YXRlRW5hYmxlZFN0YXRlKFNjcm9sbGJhciopOworCiAgICAgdmlydHVhbCBib29sIHBhaW50KFNj cm9sbGJhciosIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdl UmVjdCk7CiAKICAgICB2aXJ0dWFsIGludCBzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29u dHJvbFNpemUgPSBSZWd1bGFyU2Nyb2xsYmFyKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0 c0NvbnRyb2xUaW50cygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGJvb2wg dXNlc092ZXJsYXlTY3JvbGxiYXJzKCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVNj cm9sbGJhck92ZXJsYXlTdHlsZShTY3JvbGxiYXIqKTsKIAogICAgIHZpcnR1YWwgZG91YmxlIGlu aXRpYWxBdXRvc2Nyb2xsVGltZXJEZWxheSgpOwogICAgIHZpcnR1YWwgZG91YmxlIGF1dG9zY3Jv bGxUaW1lckRlbGF5KCk7CkBAIC02Niw2ICs2OSw4IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFs IEludFJlY3QgZm9yd2FyZEJ1dHRvblJlY3QoU2Nyb2xsYmFyKiwgU2Nyb2xsYmFyUGFydCwgYm9v bCBwYWludGluZyA9IGZhbHNlKTsKICAgICB2aXJ0dWFsIEludFJlY3QgdHJhY2tSZWN0KFNjcm9s bGJhciosIGJvb2wgcGFpbnRpbmcgPSBmYWxzZSk7CiAKKyAgICB2aXJ0dWFsIGludCBtYXhPdmVy bGFwQmV0d2VlblBhZ2VzKCkgeyByZXR1cm4gNDA7IH0KKwogICAgIHZpcnR1YWwgaW50IG1pbmlt dW1UaHVtYkxlbmd0aChTY3JvbGxiYXIqKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50 ZXJPblRodW1iKFNjcm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRo ZW1lQ2hyb21pdW1NYWMubW0KaW5kZXggNmZiODg3YzcxMTVlNjU2OTQ2MmYzNmQ5OGMxM2M1YTNj NzBlOTZmNi4uNjQyMzc1NmFhNzRmMGY3MzAwODU5MjI5NDNhYWUxMGZkNmM4YmNlYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjLm1tCkBAIC0xNjMsNiArMTYzLDggQEAgdm9pZCBTY3JvbGxiYXJU aGVtZUNocm9taXVtTWFjOjpyZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikK ICAgICBib29sIGlzSG9yaXpvbnRhbCA9IHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jp em9udGFsU2Nyb2xsYmFyOwogICAgIFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBzY3JvbGxiYXJQYWlu dGVyID0gd2tNYWtlU2Nyb2xsYmFyUGFpbnRlcihzY3JvbGxiYXItPmNvbnRyb2xTaXplKCksIGlz SG9yaXpvbnRhbCk7CiAgICAgc2Nyb2xsYmFyTWFwKCktPmFkZChzY3JvbGxiYXIsIHNjcm9sbGJh clBhaW50ZXIpOworICAgIHVwZGF0ZUVuYWJsZWRTdGF0ZShzY3JvbGxiYXIpOworICAgIHVwZGF0 ZVNjcm9sbGJhck92ZXJsYXlTdHlsZShzY3JvbGxiYXIpOwogfQogCiB2b2lkIFNjcm9sbGJhclRo ZW1lQ2hyb21pdW1NYWM6OnVucmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIp CkBAIC0xNzMsNiArMTc1LDggQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1bnJl Z2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogdm9pZCBTY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjOjpzZXROZXdQYWludGVyRm9yU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyLCBXS1Njcm9sbGJhclBhaW50ZXJSZWYgbmV3UGFpbnRlcikKIHsKICAgICBzY3JvbGxiYXJN YXAoKS0+c2V0KHNjcm9sbGJhciwgbmV3UGFpbnRlcik7CisgICAgdXBkYXRlRW5hYmxlZFN0YXRl KHNjcm9sbGJhcik7CisgICAgdXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhcik7 CiB9CiAKIFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpw YWludGVyRm9yU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQpAQCAtMjIwLDYgKzIyNCwy NSBAQCBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVzZXNPdmVybGF5U2Nyb2xsYmFy cygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGlubGluZSB3a1Nj cm9sbGVyS25vYlN0eWxlIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShTY3JvbGxiYXJPdmVy bGF5U3R5bGUgc3R5bGUpCit7CisgICAgc3dpdGNoIChzdHlsZSkgeworICAgIGNhc2UgU2Nyb2xs YmFyT3ZlcmxheVN0eWxlRGFyazoKKyAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVE YXJrOworICAgIGNhc2UgU2Nyb2xsYmFyT3ZlcmxheVN0eWxlTGlnaHQ6CisgICAgICAgIHJldHVy biB3a1Njcm9sbGVyS25vYlN0eWxlTGlnaHQ7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJu IHdrU2Nyb2xsZXJLbm9iU3R5bGVEZWZhdWx0OworICAgIH0KK30KKwordm9pZCBTY3JvbGxiYXJU aGVtZUNocm9taXVtTWFjOjp1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyKiBz Y3JvbGxiYXIpCit7CisgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2YWlsYWJsZSgpKSB7 CisgICAgICAgIHdrU2V0U2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShwYWludGVyRm9yU2Nyb2xs YmFyKHNjcm9sbGJhciksIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShzY3JvbGxiYXItPnNj cm9sbGFibGVBcmVhKCktPnNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKSk7CisgICAgfQorfQorCiBk b3VibGUgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6aW5pdGlhbEF1dG9zY3JvbGxUaW1lckRl bGF5KCkKIHsKICAgICByZXR1cm4gZ0luaXRpYWxCdXR0b25EZWxheTsKQEAgLTQyNCwxOCArNDQ3 LDYgQEAgc3RhdGljIGludCBzY3JvbGxiYXJQYXJ0VG9ISVByZXNzZWRTdGF0ZShTY3JvbGxiYXJQ YXJ0IHBhcnQpCiAgICAgfQogfQogCi1zdGF0aWMgaW5saW5lIHdrU2Nyb2xsZXJLbm9iU3R5bGUg dG9TY3JvbGxiYXJQYWludGVyS25vYlN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZSBzdHlsZSkK LXsKLSAgICBzd2l0Y2ggKHN0eWxlKSB7Ci0gICAgY2FzZSBTY3JvbGxiYXJPdmVybGF5U3R5bGVE YXJrOgotICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZURhcms7Ci0gICAgY2FzZSBT Y3JvbGxiYXJPdmVybGF5U3R5bGVMaWdodDoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9i U3R5bGVMaWdodDsKLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JT dHlsZURlZmF1bHQ7Ci0gICAgfQotfQotCiBzdGF0aWMgUGxhdGZvcm1CcmlkZ2U6OlRoZW1lUGFp bnRTdGF0ZSBzY3JvbGxiYXJTdGF0ZVRvVGhlbWVTdGF0ZShTY3JvbGxiYXIqIHNjcm9sbGJhcikg ewogICAgIGlmICghc2Nyb2xsYmFyLT5lbmFibGVkKCkpCiAgICAgICAgIHJldHVybiBQbGF0Zm9y bUJyaWRnZTo6U3RhdGVEaXNhYmxlZDsKQEAgLTQ0Nyw2ICs0NTgsMTMgQEAgc3RhdGljIFBsYXRm b3JtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Ny b2xsYmFyKiBzY3IKICAgICByZXR1cm4gUGxhdGZvcm1CcmlkZ2U6OlN0YXRlQWN0aXZlOwogfQog Cit2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZShTY3Jv bGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBpZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxh YmxlKCkpIHsKKyAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyU2V0RW5hYmxlZChzY3JvbGxiYXJN YXAoKS0+Z2V0KHNjcm9sbGJhcikuZ2V0KCksIHNjcm9sbGJhci0+ZW5hYmxlZCgpKTsKKyAgICB9 Cit9CisKIGJvb2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBz Y3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdl UmVjdCkKIHsKICAgICBpZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKQEAg LTQ3Nyw4ICs0OTUsNiBAQCBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNj cm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbgogICAgICAgICBzY3JvbGxB bmltYXRvci0+c2V0SXNEcmF3aW5nSW50b0xheWVyKGZhbHNlKTsKICNlbmRpZgogCi0gICAgICAg IHdrU2V0U2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShwYWludGVyRm9yU2Nyb2xsYmFyKHNjcm9s bGJhciksIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShzY3JvbGxiYXItPnNjcm9sbGFibGVB cmVhKCktPnNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKSk7Ci0KICAgICAgICAgR3JhcGhpY3NDb250 ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKICAgICAgICAgY29udGV4dC0+Y2xp cChkYW1hZ2VSZWN0KTsKICAgICAgICAgY29udGV4dC0+dHJhbnNsYXRlKHNjcm9sbGJhci0+ZnJh bWVSZWN0KCkueCgpLCBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLnkoKSk7Cg== 102795 2011-08-03 11:13:15 -0700 2011-08-16 22:38:30 -0700 Patch bug-65555-20110803111314.patch text/plain 8872 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTIxOTcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91YmxlLWNsaWNrLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2ZW50cy9z Y3JvbGxiYXItZG91YmxlLWNsaWNrLWV4cGVjdGVkLnR4dAppbmRleCA1MWUwYWNhZGVkYWNkZGYz ODQxNjY2ZGEzYTMyM2JkNTk1MzQ5MDNmLi43YTFhYzVhNmZhZTM2N2JjMzYwMmZiYWZmOWI2YWM4 Yjk3ZGQ4MjIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1tYWMv ZmFzdC9ldmVudHMvc2Nyb2xsYmFyLWRvdWJsZS1jbGljay1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0CkBAIC0xICsxIEBACi1TY3JvbGwgb2Zmc2V0IGlzIDcwMAor U2Nyb2xsIG9mZnNldCBpcyA3MjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MDBlYzZjMGNhZWVhNzVhOWMwZjM4 MTM1ZDYyZjdkOTFmM2UxMjJkLi5hNTI0ZWNmNDc2NDMzYjU4Y2UyMTUwNTZiOTAyOGUyMGFjMmMx ZjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDgtMDIgIFNhaWxlc2ggQWdy YXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRhdGUgZm9y a2VkIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgTWVyZ2UgcmVjZW50IGNo YW5nZXMgdG8gU2Nyb2xsYmFyVGhlbWVNYWMubW0gdG8gU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1h Yy5tbS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5o OgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXND aHJvbWl1bU1hYy5tbToKKyAgICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJsZWQpOgor ICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaDoK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6Om1heE92ZXJsYXBC ZXR3ZWVuUGFnZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVt TWFjOjpyZWdpc3RlclNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjOjpzZXROZXdQYWludGVyRm9yU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNv cmU6OnRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxiYXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUpOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlRW5hYmxlZFN0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50 KToKKwogMjAxMS0wOC0wMiAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW1F0XSBTaW1wbGlmeSBQYXRoOjp0cmFuc2xhdGUoKSBpbXBsZW1lbnRhdGlvbi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJs YXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKaW5kZXggYjE4YTA0OGJk MzllZTY3MGNkMGJjM2NmMzM1ODQ4OTQyYjhlMDBmMS4uYjc1YzIyMWFlZGVhYTZmZDU0Yzc3M2E0 MzJhZTRjNTdlYmZjMzM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9t aXVtTWFjLmgKQEAgLTYxLDYgKzYxLDcgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludFRy YWNrKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgYm9vbCBlbmFibGVkLCBkb3VibGUgdmEKIHZvaWQg d2tTY3JvbGxiYXJQYWludGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZik7CiBpbnQg d2tTY3JvbGxiYXJNaW5pbXVtVGh1bWJMZW5ndGgoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKIHZv aWQgd2tTY3JvbGxiYXJQYWludGVyU2V0RGVsZWdhdGUoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBp ZCBzY3JvbGxiYXJQYWludGVyRGVsZWdhdGUpOwordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXRF bmFibGVkKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgYm9vbCBlbmFibGVkKTsKIENHRmxvYXQgd2tT Y3JvbGxiYXJQYWludGVyVHJhY2tBbHBoYShXS1Njcm9sbGJhclBhaW50ZXJSZWYpOwogV0tTY3Jv bGxiYXJQYWludGVyUmVmIHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoaW50IGNvbnRyb2xTaXplLCBi b29sIGlzSG9yaXpvbnRhbCk7CiBpbnQgd2tTY3JvbGxiYXJUaGlja25lc3MoaW50IGNvbnRyb2xT aXplKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9s bGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQppbmRl eCBhMDBhNjUyYTEzZWQ0NmQ4ODZhOTAzMjJkZjJjMmFhMTUyNjA1MzlkLi5mYTZmMjBlMzQ5NGNh NDA2Yjk2MzRmZDZjNWYwZWU2MGVkOGRjZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0 aWxpdGllc0Nocm9taXVtTWFjLm1tCkBAIC0xODcsNiArMTg3LDExIEBAIHZvaWQgd2tTY3JvbGxi YXJQYWludGVyU2V0RGVsZWdhdGUoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIsIGlkIHNj cm9sbGJhclBhCiAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6c2Nyb2xsYmFyUGFpbnRlckRlbGVn YXRlXTsKIH0KIAordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKFdLU2Nyb2xsYmFy UGFpbnRlclJlZiBwYWludGVyLCBib29sIGVuYWJsZWQpCit7CisgICAgW3BhaW50ZXIgc2V0RW5h YmxlZDplbmFibGVkXTsKK30KKwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJUcmFja0FscGhh KFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyKQogewogICAgIHJldHVybiBbcGFpbnRlciB0 cmFja0FscGhhXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAppbmRleCA2MzJlMzY5MjMzOTkxZGFl ZDM0ZDczYjY0OTQxMDE3MWRlOGNkOGUyLi4yNTlmMGU1YThmZjA4NWJkZGI3Mjg1ZDZkMDQ1ZTIw ZGZjODhiNWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9T Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCkBAIC00MCwxMiArNDAsMTUgQEAg cHVibGljOgogICAgIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMoKTsKICAgICB2aXJ0dWFsIH5T Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjKCk7CiAKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRW5h YmxlZFN0YXRlKFNjcm9sbGJhciopOworCiAgICAgdmlydHVhbCBib29sIHBhaW50KFNjcm9sbGJh ciosIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCk7 CiAKICAgICB2aXJ0dWFsIGludCBzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNp emUgPSBSZWd1bGFyU2Nyb2xsYmFyKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0NvbnRy b2xUaW50cygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGJvb2wgdXNlc092 ZXJsYXlTY3JvbGxiYXJzKCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVNjcm9sbGJh ck92ZXJsYXlTdHlsZShTY3JvbGxiYXIqKTsKIAogICAgIHZpcnR1YWwgZG91YmxlIGluaXRpYWxB dXRvc2Nyb2xsVGltZXJEZWxheSgpOwogICAgIHZpcnR1YWwgZG91YmxlIGF1dG9zY3JvbGxUaW1l ckRlbGF5KCk7CkBAIC02Niw2ICs2OSw4IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIEludFJl Y3QgZm9yd2FyZEJ1dHRvblJlY3QoU2Nyb2xsYmFyKiwgU2Nyb2xsYmFyUGFydCwgYm9vbCBwYWlu dGluZyA9IGZhbHNlKTsKICAgICB2aXJ0dWFsIEludFJlY3QgdHJhY2tSZWN0KFNjcm9sbGJhcios IGJvb2wgcGFpbnRpbmcgPSBmYWxzZSk7CiAKKyAgICB2aXJ0dWFsIGludCBtYXhPdmVybGFwQmV0 d2VlblBhZ2VzKCkgeyByZXR1cm4gNDA7IH0KKwogICAgIHZpcnR1YWwgaW50IG1pbmltdW1UaHVt Ykxlbmd0aChTY3JvbGxiYXIqKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJPblRo dW1iKFNjcm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hy b21pdW1NYWMubW0KaW5kZXggNmZiODg3YzcxMTVlNjU2OTQ2MmYzNmQ5OGMxM2M1YTNjNzBlOTZm Ni4uNjQyMzc1NmFhNzRmMGY3MzAwODU5MjI5NDNhYWUxMGZkNmM4YmNlYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjLm1tCkBAIC0xNjMsNiArMTYzLDggQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNo cm9taXVtTWFjOjpyZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKICAgICBi b29sIGlzSG9yaXpvbnRhbCA9IHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFs U2Nyb2xsYmFyOwogICAgIFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBzY3JvbGxiYXJQYWludGVyID0g d2tNYWtlU2Nyb2xsYmFyUGFpbnRlcihzY3JvbGxiYXItPmNvbnRyb2xTaXplKCksIGlzSG9yaXpv bnRhbCk7CiAgICAgc2Nyb2xsYmFyTWFwKCktPmFkZChzY3JvbGxiYXIsIHNjcm9sbGJhclBhaW50 ZXIpOworICAgIHVwZGF0ZUVuYWJsZWRTdGF0ZShzY3JvbGxiYXIpOworICAgIHVwZGF0ZVNjcm9s bGJhck92ZXJsYXlTdHlsZShzY3JvbGxiYXIpOwogfQogCiB2b2lkIFNjcm9sbGJhclRoZW1lQ2hy b21pdW1NYWM6OnVucmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCkBAIC0x NzMsNiArMTc1LDggQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1bnJlZ2lzdGVy U2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9t aXVtTWFjOjpzZXROZXdQYWludGVyRm9yU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyLCBX S1Njcm9sbGJhclBhaW50ZXJSZWYgbmV3UGFpbnRlcikKIHsKICAgICBzY3JvbGxiYXJNYXAoKS0+ c2V0KHNjcm9sbGJhciwgbmV3UGFpbnRlcik7CisgICAgdXBkYXRlRW5hYmxlZFN0YXRlKHNjcm9s bGJhcik7CisgICAgdXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhcik7CiB9CiAK IFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludGVy Rm9yU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQpAQCAtMjIwLDYgKzIyNCwyNSBAQCBi b29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVzZXNPdmVybGF5U2Nyb2xsYmFycygpIGNv bnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGlubGluZSB3a1Njcm9sbGVy S25vYlN0eWxlIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShTY3JvbGxiYXJPdmVybGF5U3R5 bGUgc3R5bGUpCit7CisgICAgc3dpdGNoIChzdHlsZSkgeworICAgIGNhc2UgU2Nyb2xsYmFyT3Zl cmxheVN0eWxlRGFyazoKKyAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVEYXJrOwor ICAgIGNhc2UgU2Nyb2xsYmFyT3ZlcmxheVN0eWxlTGlnaHQ6CisgICAgICAgIHJldHVybiB3a1Nj cm9sbGVyS25vYlN0eWxlTGlnaHQ7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIHdrU2Ny b2xsZXJLbm9iU3R5bGVEZWZhdWx0OworICAgIH0KK30KKwordm9pZCBTY3JvbGxiYXJUaGVtZUNo cm9taXVtTWFjOjp1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyKiBzY3JvbGxi YXIpCit7CisgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2YWlsYWJsZSgpKSB7CisgICAg ICAgIHdrU2V0U2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShwYWludGVyRm9yU2Nyb2xsYmFyKHNj cm9sbGJhciksIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShzY3JvbGxiYXItPnNjcm9sbGFi bGVBcmVhKCktPnNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKSk7CisgICAgfQorfQorCiBkb3VibGUg U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6aW5pdGlhbEF1dG9zY3JvbGxUaW1lckRlbGF5KCkK IHsKICAgICByZXR1cm4gZ0luaXRpYWxCdXR0b25EZWxheTsKQEAgLTQyNCwxOCArNDQ3LDYgQEAg c3RhdGljIGludCBzY3JvbGxiYXJQYXJ0VG9ISVByZXNzZWRTdGF0ZShTY3JvbGxiYXJQYXJ0IHBh cnQpCiAgICAgfQogfQogCi1zdGF0aWMgaW5saW5lIHdrU2Nyb2xsZXJLbm9iU3R5bGUgdG9TY3Jv bGxiYXJQYWludGVyS25vYlN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZSBzdHlsZSkKLXsKLSAg ICBzd2l0Y2ggKHN0eWxlKSB7Ci0gICAgY2FzZSBTY3JvbGxiYXJPdmVybGF5U3R5bGVEYXJrOgot ICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZURhcms7Ci0gICAgY2FzZSBTY3JvbGxi YXJPdmVybGF5U3R5bGVMaWdodDoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVM aWdodDsKLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZURl ZmF1bHQ7Ci0gICAgfQotfQotCiBzdGF0aWMgUGxhdGZvcm1CcmlkZ2U6OlRoZW1lUGFpbnRTdGF0 ZSBzY3JvbGxiYXJTdGF0ZVRvVGhlbWVTdGF0ZShTY3JvbGxiYXIqIHNjcm9sbGJhcikgewogICAg IGlmICghc2Nyb2xsYmFyLT5lbmFibGVkKCkpCiAgICAgICAgIHJldHVybiBQbGF0Zm9ybUJyaWRn ZTo6U3RhdGVEaXNhYmxlZDsKQEAgLTQ0Nyw2ICs0NTgsMTMgQEAgc3RhdGljIFBsYXRmb3JtQnJp ZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Nyb2xsYmFy KiBzY3IKICAgICByZXR1cm4gUGxhdGZvcm1CcmlkZ2U6OlN0YXRlQWN0aXZlOwogfQogCit2b2lk IFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIq IHNjcm9sbGJhcikKK3sKKyAgICBpZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkp IHsKKyAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyU2V0RW5hYmxlZChzY3JvbGxiYXJNYXAoKS0+ Z2V0KHNjcm9sbGJhcikuZ2V0KCksIHNjcm9sbGJhci0+ZW5hYmxlZCgpKTsKKyAgICB9Cit9CisK IGJvb2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxi YXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkK IHsKICAgICBpZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKQEAgLTQ3Nyw4 ICs0OTUsNiBAQCBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJh ciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbgogICAgICAgICBzY3JvbGxBbmltYXRv ci0+c2V0SXNEcmF3aW5nSW50b0xheWVyKGZhbHNlKTsKICNlbmRpZgogCi0gICAgICAgIHdrU2V0 U2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShwYWludGVyRm9yU2Nyb2xsYmFyKHNjcm9sbGJhciks IHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShzY3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCkt PnNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKSk7Ci0KICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3Rh dGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKICAgICAgICAgY29udGV4dC0+Y2xpcChkYW1h Z2VSZWN0KTsKICAgICAgICAgY29udGV4dC0+dHJhbnNsYXRlKHNjcm9sbGJhci0+ZnJhbWVSZWN0 KCkueCgpLCBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLnkoKSk7Cg== 104151 2011-08-16 22:38:33 -0700 2011-08-18 13:52:08 -0700 Patch for landing bug-65555-20110816223832.patch text/plain 9560 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTMwODEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNzlhNjBkYjk2YzY1YzM2YjNkZGM3 NmQzNzEzYzAxZDVhOWUyOWI3Li40N2RjM2EyNGY5MjVkNDBhZDRkZmRkZTMxZGY2N2Q1YmVkM2Zh ZmYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTYgIFNhaWxlc2ggQWdyYXdhbCAg PHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRhdGUgZm9ya2VkIFNj cm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9i aW5zb24uCisKKyAgICAgICAgUmVtb3ZpbmcgdGhlIGNocm9taXVtLW1hYyB2ZXJzaW9uIG9mIHRo ZSBleHBlY3RhdGlvbiBmaWxlIHNpbmNlIGl0IG5vdyBtYXRjaGVzIHRoZSBtYWMgb25lLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorCiAyMDExLTA4LTE1ICBHYXZpbiBCYXJy YWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYyNjMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91YmxlLWNsaWNr LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2 ZW50cy9zY3JvbGxiYXItZG91YmxlLWNsaWNrLWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggNTFlMGFjYWRlZGFjZGRmMzg0MTY2NmRhM2EzMjNiZDU5NTM0OTAzZi4u MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS1tYWMvZmFzdC9ldmVudHMvc2Nyb2xsYmFyLWRvdWJsZS1jbGlj ay1leHBlY3RlZC50eHQKKysrIC9kZXYvbnVsbApAQCAtMSArMCwwIEBACi1TY3JvbGwgb2Zmc2V0 IGlzIDcwMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDYwZThmYzUzMTM5OGIyY2RiNmMwOThiZjk2MGFhNzM3OWE4 OGJiZWEuLjY1MDVmNTRjYjBiNTE2Mzc0YzJiMGZhN2M3YTZiOGNjMWQ1NTU2NDIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wOC0xNiAgU2FpbGVzaCBBZ3Jhd2FsICA8c2FpbEBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ2hyb21pdW06IFVwZGF0ZSBmb3JrZWQgU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYy5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjU1NTUKKworICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4K KworICAgICAgICBNZXJnZSByZWNlbnQgY2hhbmdlcyB0byBTY3JvbGxiYXJUaGVtZU1hYy5tbSB0 byBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tLgorCisgICAgICAgICogcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmg6CisgICAgICAgICog cGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1t OgorICAgICAgICAod2tTY3JvbGxiYXJQYWludGVyU2V0RW5hYmxlZCk6CisgICAgICAgICogcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6bWF4T3ZlcmxhcEJldHdlZW5QYWdlcyk6 CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnJlZ2lzdGVy U2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6 OnNldE5ld1BhaW50ZXJGb3JTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6dG9TY3JvbGxi YXJQYWludGVyS25vYlN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hy b21pdW1NYWM6OnVwZGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZSk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVFbmFibGVkU3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQpOgorCiAyMDExLTA4 LTE1ICBKZWZmcmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CiAKICAgICAgICAgTmV3IFhNTCBw YXJzZXI6IGFkZCB4bWwgbmFtZXNwYWNlIHRvIHRoZSBkZWZhdWx0IG1hcCBvZiBuYW1lc3BhY2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJP dmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oCmluZGV4IDliY2Iz MGExZjA3MTgxNWY0NTM0MGE4MWE2ZWIzYmE2MzdiNzA3MWUuLjRjN2YyNmE4NDQ1ZmQ2OTI1Yjgw YjAxNmQxODAzOTFlZTY0MWQ3ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXND aHJvbWl1bU1hYy5oCkBAIC02Niw2ICs2Niw3IEBAIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFp bnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJSZWYsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhCiB2 b2lkIHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50S25vYihXS1Njcm9sbGJhclBhaW50ZXJSZWYpOwog aW50IHdrU2Nyb2xsYmFyTWluaW11bVRodW1iTGVuZ3RoKFdLU2Nyb2xsYmFyUGFpbnRlclJlZik7 CiB2b2lkIHdrU2Nyb2xsYmFyUGFpbnRlclNldERlbGVnYXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJl ZiwgaWQgc2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlKTsKK3ZvaWQgd2tTY3JvbGxiYXJQYWludGVy U2V0RW5hYmxlZChXS1Njcm9sbGJhclBhaW50ZXJSZWYsIGJvb2wgZW5hYmxlZCk7CiBDR0Zsb2F0 IHdrU2Nyb2xsYmFyUGFpbnRlclRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKIFdL U2Nyb2xsYmFyUGFpbnRlclJlZiB3a01ha2VTY3JvbGxiYXJQYWludGVyKGludCBjb250cm9sU2l6 ZSwgYm9vbCBpc0hvcml6b250YWwpOwogaW50IHdrU2Nyb2xsYmFyVGhpY2tuZXNzKGludCBjb250 cm9sU2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9T Y3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0K aW5kZXggNjQwM2YwNzcyODFiY2MxODM5M2VjMWZmMWFkYzY4YTM5MTBlZGIwNy4uYmYwZjkyMGUx YjAxNGNlNzU4YmQ1MjFjODNmMDA2NjZiOWY2ZjU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJs YXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQpAQCAtMTg3LDYgKzE4NywxMSBAQCB2b2lkIHdrU2Ny b2xsYmFyUGFpbnRlclNldERlbGVnYXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyLCBp ZCBzY3JvbGxiYXJQYQogICAgIFtwYWludGVyIHNldERlbGVnYXRlOnNjcm9sbGJhclBhaW50ZXJE ZWxlZ2F0ZV07CiB9CiAKK3ZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0RW5hYmxlZChXS1Njcm9s bGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVkKQoreworICAgIFtwYWludGVyIHNl dEVuYWJsZWQ6ZW5hYmxlZF07Cit9CisKIENHRmxvYXQgd2tTY3JvbGxiYXJQYWludGVyVHJhY2tB bHBoYShXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlcikKIHsKICAgICByZXR1cm4gW3BhaW50 ZXIgdHJhY2tBbHBoYV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKaW5kZXggNjMyZTM2OTIzMzk5 MWRhZWQzNGQ3M2I2NDk0MTAxNzFkZThjZDhlMi4uMjU5ZjBlNWE4ZmYwODViZGRiNzI4NWQ2ZDA0 NWUyMGRmYzg4YjVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaApAQCAtNDAsMTIgKzQwLDE1 IEBAIHB1YmxpYzoKICAgICBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjKCk7CiAgICAgdmlydHVh bCB+U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYygpOwogCisgICAgdmlydHVhbCB2b2lkIHVwZGF0 ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIqKTsKKwogICAgIHZpcnR1YWwgYm9vbCBwYWludChTY3Jv bGxiYXIqLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJl Y3QpOwogCiAgICAgdmlydHVhbCBpbnQgc2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJhckNvbnRy b2xTaXplID0gUmVndWxhclNjcm9sbGJhcik7CiAKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHND b250cm9sVGludHMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIHVz ZXNPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTY3Jv bGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyKik7CiAKICAgICB2aXJ0dWFsIGRvdWJsZSBpbml0 aWFsQXV0b3Njcm9sbFRpbWVyRGVsYXkoKTsKICAgICB2aXJ0dWFsIGRvdWJsZSBhdXRvc2Nyb2xs VGltZXJEZWxheSgpOwpAQCAtNjYsNiArNjksOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBJ bnRSZWN0IGZvcndhcmRCdXR0b25SZWN0KFNjcm9sbGJhciosIFNjcm9sbGJhclBhcnQsIGJvb2wg cGFpbnRpbmcgPSBmYWxzZSk7CiAgICAgdmlydHVhbCBJbnRSZWN0IHRyYWNrUmVjdChTY3JvbGxi YXIqLCBib29sIHBhaW50aW5nID0gZmFsc2UpOwogCisgICAgdmlydHVhbCBpbnQgbWF4T3Zlcmxh cEJldHdlZW5QYWdlcygpIHsgcmV0dXJuIDQwOyB9CisKICAgICB2aXJ0dWFsIGludCBtaW5pbXVt VGh1bWJMZW5ndGgoU2Nyb2xsYmFyKik7CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkQ2VudGVy T25UaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21p dW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjLm1tCmluZGV4IDMxYWQwYTg4MTllOWMyMGExMzJiZjA5MmU3MmQyMzk3Mjk2 OGUyZTkuLjlmYWM3NDc3Y2U4YWI1ODk1NDAzZDJlYzZjOWM3ZGI0YWQ1M2M4NDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21p dW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAtMTYzLDYgKzE2Myw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYzo6cmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiAg ICAgYm9vbCBpc0hvcml6b250YWwgPSBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpv bnRhbFNjcm9sbGJhcjsKICAgICBXS1Njcm9sbGJhclBhaW50ZXJSZWYgc2Nyb2xsYmFyUGFpbnRl ciA9IHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoc2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpLCBpc0hv cml6b250YWwpOwogICAgIHNjcm9sbGJhck1hcCgpLT5hZGQoc2Nyb2xsYmFyLCBzY3JvbGxiYXJQ YWludGVyKTsKKyAgICB1cGRhdGVFbmFibGVkU3RhdGUoc2Nyb2xsYmFyKTsKKyAgICB1cGRhdGVT Y3JvbGxiYXJPdmVybGF5U3R5bGUoc2Nyb2xsYmFyKTsKIH0KIAogdm9pZCBTY3JvbGxiYXJUaGVt ZUNocm9taXVtTWFjOjp1bnJlZ2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQpA QCAtMTczLDYgKzE3NSw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dW5yZWdp c3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKIHZvaWQgU2Nyb2xsYmFyVGhlbWVD aHJvbWl1bU1hYzo6c2V0TmV3UGFpbnRlckZvclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJh ciwgV0tTY3JvbGxiYXJQYWludGVyUmVmIG5ld1BhaW50ZXIpCiB7CiAgICAgc2Nyb2xsYmFyTWFw KCktPnNldChzY3JvbGxiYXIsIG5ld1BhaW50ZXIpOworICAgIHVwZGF0ZUVuYWJsZWRTdGF0ZShz Y3JvbGxiYXIpOworICAgIHVwZGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZShzY3JvbGxiYXIpOwog fQogCiBXS1Njcm9sbGJhclBhaW50ZXJSZWYgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFp bnRlckZvclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKQEAgLTIyMCw2ICsyMjQsMjUg QEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMo KSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK3N0YXRpYyBpbmxpbmUgd2tTY3Jv bGxlcktub2JTdHlsZSB0b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUoU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlIHN0eWxlKQoreworICAgIHN3aXRjaCAoc3R5bGUpIHsKKyAgICBjYXNlIFNjcm9sbGJh ck92ZXJsYXlTdHlsZURhcms6CisgICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0eWxlRGFy azsKKyAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZUxpZ2h0OgorICAgICAgICByZXR1cm4g d2tTY3JvbGxlcktub2JTdHlsZUxpZ2h0OworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiB3 a1Njcm9sbGVyS25vYlN0eWxlRGVmYXVsdDsKKyAgICB9Cit9CisKK3ZvaWQgU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYzo6dXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9sbGJhciogc2Ny b2xsYmFyKQoreworICAgIGlmIChpc1Njcm9sbGJhck92ZXJsYXlBUElBdmFpbGFibGUoKSkgewor ICAgICAgICB3a1NldFNjcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUocGFpbnRlckZvclNjcm9sbGJh cihzY3JvbGxiYXIpLCB0b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUoc2Nyb2xsYmFyLT5zY3Jv bGxhYmxlQXJlYSgpLT5zY3JvbGxiYXJPdmVybGF5U3R5bGUoKSkpOworICAgIH0KK30KKwogZG91 YmxlIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OmluaXRpYWxBdXRvc2Nyb2xsVGltZXJEZWxh eSgpCiB7CiAgICAgcmV0dXJuIGdJbml0aWFsQnV0dG9uRGVsYXk7CkBAIC00MjQsMTggKzQ0Nyw2 IEBAIHN0YXRpYyBpbnQgc2Nyb2xsYmFyUGFydFRvSElQcmVzc2VkU3RhdGUoU2Nyb2xsYmFyUGFy dCBwYXJ0KQogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSB3a1Njcm9sbGVyS25vYlN0eWxlIHRv U2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShTY3JvbGxiYXJPdmVybGF5U3R5bGUgc3R5bGUpCi17 Ci0gICAgc3dpdGNoIChzdHlsZSkgewotICAgIGNhc2UgU2Nyb2xsYmFyT3ZlcmxheVN0eWxlRGFy azoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVEYXJrOwotICAgIGNhc2UgU2Ny b2xsYmFyT3ZlcmxheVN0eWxlTGlnaHQ6Ci0gICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0 eWxlTGlnaHQ7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5 bGVEZWZhdWx0OwotICAgIH0KLX0KLQogc3RhdGljIFBsYXRmb3JtQnJpZGdlOjpUaGVtZVBhaW50 U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpIHsK ICAgICBpZiAoIXNjcm9sbGJhci0+ZW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gUGxhdGZvcm1C cmlkZ2U6OlN0YXRlRGlzYWJsZWQ7CkBAIC00NDcsNiArNDU4LDEzIEBAIHN0YXRpYyBQbGF0Zm9y bUJyaWRnZTo6VGhlbWVQYWludFN0YXRlIHNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRlKFNjcm9s bGJhciogc2NyCiAgICAgcmV0dXJuIFBsYXRmb3JtQnJpZGdlOjpTdGF0ZUFjdGl2ZTsKIH0KIAor dm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVFbmFibGVkU3RhdGUoU2Nyb2xs YmFyKiBzY3JvbGxiYXIpCit7CisgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2YWlsYWJs ZSgpKSB7CisgICAgICAgIHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJsZWQoc2Nyb2xsYmFyTWFw KCktPmdldChzY3JvbGxiYXIpLmdldCgpLCBzY3JvbGxiYXItPmVuYWJsZWQoKSk7CisgICAgfQor fQorCiBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Ny b2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJl Y3QpCiB7CiAgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2YWlsYWJsZSgpKSB7CkBAIC00 NzcsOCArNDk1LDYgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludChTY3Jv bGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb24KICAgICAgICAgc2Nyb2xsQW5p bWF0b3ItPnNldElzRHJhd2luZ0ludG9MYXllcihmYWxzZSk7CiAjZW5kaWYKIAotICAgICAgICB3 a1NldFNjcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUocGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxi YXIpLCB0b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUoc2Nyb2xsYmFyLT5zY3JvbGxhYmxlQXJl YSgpLT5zY3JvbGxiYXJPdmVybGF5U3R5bGUoKSkpOwotCiAgICAgICAgIEdyYXBoaWNzQ29udGV4 dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqY29udGV4dCk7CiAgICAgICAgIGNvbnRleHQtPmNsaXAo ZGFtYWdlUmVjdCk7CiAgICAgICAgIGNvbnRleHQtPnRyYW5zbGF0ZShzY3JvbGxiYXItPmZyYW1l UmVjdCgpLngoKSwgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKS55KCkpOwo= 104391 2011-08-18 13:52:12 -0700 2011-08-18 13:53:45 -0700 Patch for landing bug-65555-20110818135211.patch text/plain 9478 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTMxNjYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2N2EwOTRjZWU5YzBiZmU1ZWFkMDBj YzAxZmRiOGY2Y2ZiZDdlM2EzLi5mODJmMjJlMmQwZDdkMWI5NGJhYWM3NjQyNmY2N2U0ZmIzYWNi MDcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTggIFNhaWxlc2ggQWdyYXdhbCAg PHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRhdGUgZm9ya2VkIFNj cm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZpbmcgdGhlIGNocm9taXVtLW1hYyB2ZXJzaW9uIG9mIHRo ZSBleHBlY3RhdGlvbiBmaWxlIHNpbmNlIGl0IG5vdyBtYXRjaGVzIHRoZSBtYWMgb25lLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorCiAyMDExLTA4LTE2ICBUb255IENoYW5n ICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBmYXN0L2Nzcy9jdXN0 b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgYXNzZXJ0aW5nIG9uIGFsbApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFj L2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3VibGUtY2xpY2stZXhwZWN0ZWQudHh0CmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA1MWUwYWNhZGVkYWNkZGYzODQxNjY2ZGEzYTMyM2JkNTk1 MzQ5MDNmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91 YmxlLWNsaWNrLWV4cGVjdGVkLnR4dAorKysgL2Rldi9udWxsCkBAIC0xICswLDAgQEAKLVNjcm9s bCBvZmZzZXQgaXMgNzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgyOGNlYzAwMzIzMTc0NzFhN2E4YjE4NzFl NTNiZTFjNWZiMTYzZi4uNDA2N2MzY2FkMmJjM2YzY2MzOGRlMjA5NTZlNmFhNmEzY2EyNDFmMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTA4LTE4ICBTYWlsZXNoIEFncmF3YWwg IDxzYWlsQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaHJvbWl1bTogVXBkYXRlIGZvcmtlZCBT Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NTU1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1lcmdlIHJlY2VudCBjaGFuZ2VzIHRvIFNjcm9sbGJhclRoZW1l TWFjLm1tIHRvIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0uCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21p dW1NYWMubW06CisgICAgICAgICh3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmg6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjptYXhPdmVybGFwQmV0d2Vl blBhZ2VzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9t aXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6 cmVnaXN0ZXJTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYzo6c2V0TmV3UGFpbnRlckZvclNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjp0 b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludCk6CisK IDIwMTEtMDgtMTYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkIENocm9taXVtIFdpbmRvd3MgYnVpbGQgZml4IGFmdGVyIHI5MzE0MC4g VGFrZSA0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Ny b2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAppbmRl eCA5YmNiMzBhMWYwNzE4MTVmNDUzNDBhODFhNmViM2JhNjM3YjcwNzFlLi40YzdmMjZhODQ0NWZk NjkyNWI4MGIwMTZkMTgwMzkxZWU2NDFkN2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRp bGl0aWVzQ2hyb21pdW1NYWMuaApAQCAtNjYsNiArNjYsNyBAQCB2b2lkIHdrU2Nyb2xsYmFyUGFp bnRlclBhaW50VHJhY2soV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVuYWJsZWQsIGRvdWJs ZSB2YQogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2IoV0tTY3JvbGxiYXJQYWludGVy UmVmKTsKIGludCB3a1Njcm9sbGJhck1pbmltdW1UaHVtYkxlbmd0aChXS1Njcm9sbGJhclBhaW50 ZXJSZWYpOwogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Njcm9sbGJhclBh aW50ZXJSZWYsIGlkIHNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSk7Cit2b2lkIHdrU2Nyb2xsYmFy UGFpbnRlclNldEVuYWJsZWQoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVuYWJsZWQpOwog Q0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJUcmFja0FscGhhKFdLU2Nyb2xsYmFyUGFpbnRlclJl Zik7CiBXS1Njcm9sbGJhclBhaW50ZXJSZWYgd2tNYWtlU2Nyb2xsYmFyUGFpbnRlcihpbnQgY29u dHJvbFNpemUsIGJvb2wgaXNIb3Jpem9udGFsKTsKIGludCB3a1Njcm9sbGJhclRoaWNrbmVzcyhp bnQgY29udHJvbFNpemUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVt TWFjLm1tCmluZGV4IDY0MDNmMDc3MjgxYmNjMTgzOTNlYzFmZjFhZGM2OGEzOTEwZWRiMDcuLmJm MGY5MjBlMWIwMTRjZTc1OGJkNTIxYzgzZjAwNjY2YjlmNmY1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJv bWl1bU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KQEAgLTE4Nyw2ICsxODcsMTEgQEAgdm9p ZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFp bnRlciwgaWQgc2Nyb2xsYmFyUGEKICAgICBbcGFpbnRlciBzZXREZWxlZ2F0ZTpzY3JvbGxiYXJQ YWludGVyRGVsZWdhdGVdOwogfQogCit2b2lkIHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJsZWQo V0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICBbcGFp bnRlciBzZXRFbmFibGVkOmVuYWJsZWRdOworfQorCiBDR0Zsb2F0IHdrU2Nyb2xsYmFyUGFpbnRl clRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIpCiB7CiAgICAgcmV0dXJu IFtwYWludGVyIHRyYWNrQWxwaGFdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IGJlMjE2 ZDBlYzlmODVmYjNiNmM1OTU1ZjlkZTYwZDBhMzMwZWUyZTcuLjA3ODk4NWE5MzA5OWNiOTZiNmUw MTM0NTJiMWYzYWY4ZGE1ZjQ1ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTQyLDEy ICs0MiwxNSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHByZWZlcmVuY2VzQ2hhbmdlZCgpOwogCisg ICAgdmlydHVhbCB2b2lkIHVwZGF0ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIqKTsKKwogICAgIHZp cnR1YWwgYm9vbCBwYWludChTY3JvbGxiYXIqLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwogCiAgICAgdmlydHVhbCBpbnQgc2Nyb2xsYmFyVGhp Y2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXplID0gUmVndWxhclNjcm9sbGJhcik7CiAKICAgICB2 aXJ0dWFsIGJvb2wgc3VwcG9ydHNDb250cm9sVGludHMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9 CiAgICAgdmlydHVhbCBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0OworICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyKik7CiAKICAg ICB2aXJ0dWFsIGRvdWJsZSBpbml0aWFsQXV0b3Njcm9sbFRpbWVyRGVsYXkoKTsKICAgICB2aXJ0 dWFsIGRvdWJsZSBhdXRvc2Nyb2xsVGltZXJEZWxheSgpOwpAQCAtNzAsNiArNzMsOCBAQCBwcm90 ZWN0ZWQ6CiAgICAgdmlydHVhbCBJbnRSZWN0IGZvcndhcmRCdXR0b25SZWN0KFNjcm9sbGJhcios IFNjcm9sbGJhclBhcnQsIGJvb2wgcGFpbnRpbmcgPSBmYWxzZSk7CiAgICAgdmlydHVhbCBJbnRS ZWN0IHRyYWNrUmVjdChTY3JvbGxiYXIqLCBib29sIHBhaW50aW5nID0gZmFsc2UpOwogCisgICAg dmlydHVhbCBpbnQgbWF4T3ZlcmxhcEJldHdlZW5QYWdlcygpIHsgcmV0dXJuIDQwOyB9CisKICAg ICB2aXJ0dWFsIGludCBtaW5pbXVtVGh1bWJMZW5ndGgoU2Nyb2xsYmFyKik7CiAKICAgICB2aXJ0 dWFsIGJvb2wgc2hvdWxkQ2VudGVyT25UaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9ybU1v dXNlRXZlbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCmluZGV4IDM1OGYxMDUyNzc0MzIy MTE1YzdhZmMzNDQzNGM5OWM4ZjA1MGFmNDAuLmYyM2VjNzU5ZDRmOGZlODAzZDkzMjM0YzI1ODY4 OTg1ZDZlNjBjMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAtMTcyLDYgKzE3Miw4 IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cmVnaXN0ZXJTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCiAgICAgYm9vbCBpc0hvcml6b250YWwgPSBzY3JvbGxiYXItPm9y aWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKICAgICBXS1Njcm9sbGJhclBhaW50 ZXJSZWYgc2Nyb2xsYmFyUGFpbnRlciA9IHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoc2Nyb2xsYmFy LT5jb250cm9sU2l6ZSgpLCBpc0hvcml6b250YWwpOwogICAgIHNjcm9sbGJhck1hcCgpLT5hZGQo c2Nyb2xsYmFyLCBzY3JvbGxiYXJQYWludGVyKTsKKyAgICB1cGRhdGVFbmFibGVkU3RhdGUoc2Ny b2xsYmFyKTsKKyAgICB1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoc2Nyb2xsYmFyKTsKIH0K IAogdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1bnJlZ2lzdGVyU2Nyb2xsYmFyKFNj cm9sbGJhciogc2Nyb2xsYmFyKQpAQCAtMTgyLDYgKzE4NCw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYzo6dW5yZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikK IHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6c2V0TmV3UGFpbnRlckZvclNjcm9sbGJh cihTY3JvbGxiYXIqIHNjcm9sbGJhciwgV0tTY3JvbGxiYXJQYWludGVyUmVmIG5ld1BhaW50ZXIp CiB7CiAgICAgc2Nyb2xsYmFyTWFwKCktPnNldChzY3JvbGxiYXIsIG5ld1BhaW50ZXIpOworICAg IHVwZGF0ZUVuYWJsZWRTdGF0ZShzY3JvbGxiYXIpOworICAgIHVwZGF0ZVNjcm9sbGJhck92ZXJs YXlTdHlsZShzY3JvbGxiYXIpOwogfQogCiBXS1Njcm9sbGJhclBhaW50ZXJSZWYgU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRlckZvclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJh cikKQEAgLTI0NCw2ICsyNDgsMjUgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1 c2VzT3ZlcmxheVNjcm9sbGJhcnMoKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiB9CiAK K3N0YXRpYyBpbmxpbmUgd2tTY3JvbGxlcktub2JTdHlsZSB0b1Njcm9sbGJhclBhaW50ZXJLbm9i U3R5bGUoU2Nyb2xsYmFyT3ZlcmxheVN0eWxlIHN0eWxlKQoreworICAgIHN3aXRjaCAoc3R5bGUp IHsKKyAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZURhcms6CisgICAgICAgIHJldHVybiB3 a1Njcm9sbGVyS25vYlN0eWxlRGFyazsKKyAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZUxp Z2h0OgorICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZUxpZ2h0OworICAgIGRlZmF1 bHQ6CisgICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0eWxlRGVmYXVsdDsKKyAgICB9Cit9 CisKK3ZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIGlmIChpc1Njcm9sbGJhck92ZXJs YXlBUElBdmFpbGFibGUoKSkgeworICAgICAgICB3a1NldFNjcm9sbGJhclBhaW50ZXJLbm9iU3R5 bGUocGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIpLCB0b1Njcm9sbGJhclBhaW50ZXJLbm9i U3R5bGUoc2Nyb2xsYmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxiYXJPdmVybGF5U3R5bGUo KSkpOworICAgIH0KK30KKwogZG91YmxlIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OmluaXRp YWxBdXRvc2Nyb2xsVGltZXJEZWxheSgpCiB7CiAgICAgcmV0dXJuIGdJbml0aWFsQnV0dG9uRGVs YXk7CkBAIC00NDgsMTggKzQ3MSw2IEBAIHN0YXRpYyBpbnQgc2Nyb2xsYmFyUGFydFRvSElQcmVz c2VkU3RhdGUoU2Nyb2xsYmFyUGFydCBwYXJ0KQogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSB3 a1Njcm9sbGVyS25vYlN0eWxlIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShTY3JvbGxiYXJP dmVybGF5U3R5bGUgc3R5bGUpCi17Ci0gICAgc3dpdGNoIChzdHlsZSkgewotICAgIGNhc2UgU2Ny b2xsYmFyT3ZlcmxheVN0eWxlRGFyazoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5 bGVEYXJrOwotICAgIGNhc2UgU2Nyb2xsYmFyT3ZlcmxheVN0eWxlTGlnaHQ6Ci0gICAgICAgIHJl dHVybiB3a1Njcm9sbGVyS25vYlN0eWxlTGlnaHQ7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0 dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVEZWZhdWx0OwotICAgIH0KLX0KLQogc3RhdGljIFBsYXRm b3JtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCiB7CiAgICAgaWYgKCFzY3JvbGxiYXItPmVuYWJsZWQoKSkKQEAg LTQ3Miw2ICs0ODMsMTMgQEAgc3RhdGljIFBsYXRmb3JtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUg c2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Nyb2xsYmFyKiBzY3IKICAgICByZXR1cm4gUGxh dGZvcm1CcmlkZ2U6OlN0YXRlQWN0aXZlOwogfQogCit2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21p dW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBp ZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKKyAgICAgICAgd2tTY3JvbGxi YXJQYWludGVyU2V0RW5hYmxlZChzY3JvbGxiYXJNYXAoKS0+Z2V0KHNjcm9sbGJhcikuZ2V0KCks IHNjcm9sbGJhci0+ZW5hYmxlZCgpKTsKKyAgICB9Cit9CisKIGJvb2wgU2Nyb2xsYmFyVGhlbWVD aHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKIHsKICAgICBpZiAoaXNTY3JvbGxi YXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKQEAgLTUwMiw4ICs1MjAsNiBAQCBib29sIFNjcm9s bGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGlj c0NvbnRleHQqIGNvbgogICAgICAgICBzY3JvbGxBbmltYXRvci0+c2V0SXNEcmF3aW5nSW50b0xh eWVyKGZhbHNlKTsKICNlbmRpZgogCi0gICAgICAgIHdrU2V0U2Nyb2xsYmFyUGFpbnRlcktub2JT dHlsZShwYWludGVyRm9yU2Nyb2xsYmFyKHNjcm9sbGJhciksIHRvU2Nyb2xsYmFyUGFpbnRlcktu b2JTdHlsZShzY3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbGJhck92ZXJsYXlTdHls ZSgpKSk7Ci0KICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpj b250ZXh0KTsKICAgICAgICAgY29udGV4dC0+Y2xpcChkYW1hZ2VSZWN0KTsKICAgICAgICAgY29u dGV4dC0+dHJhbnNsYXRlKHNjcm9sbGJhci0+ZnJhbWVSZWN0KCkueCgpLCBzY3JvbGxiYXItPmZy YW1lUmVjdCgpLnkoKSk7Cg== 104392 2011-08-18 13:53:48 -0700 2011-08-18 14:29:47 -0700 Patch for landing bug-65555-20110818135347.patch text/plain 9478 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTMxNjYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2N2EwOTRjZWU5YzBiZmU1ZWFkMDBj YzAxZmRiOGY2Y2ZiZDdlM2EzLi44MTBmMjEzODBlNGJhOWM1MzQ2MDBjOGZkM2VhMmNlMzNmNGE3 YWUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTggIFNhaWxlc2ggQWdyYXdhbCAg PHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRhdGUgZm9ya2VkIFNj cm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9i aW5zb24uCisKKyAgICAgICAgUmVtb3ZpbmcgdGhlIGNocm9taXVtLW1hYyB2ZXJzaW9uIG9mIHRo ZSBleHBlY3RhdGlvbiBmaWxlIHNpbmNlIGl0IG5vdyBtYXRjaGVzIHRoZSBtYWMgb25lLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorCiAyMDExLTA4LTE2ICBUb255IENoYW5n ICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBmYXN0L2Nzcy9jdXN0 b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgYXNzZXJ0aW5nIG9uIGFsbApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3Vi bGUtY2xpY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbWFj L2Zhc3QvZXZlbnRzL3Njcm9sbGJhci1kb3VibGUtY2xpY2stZXhwZWN0ZWQudHh0CmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA1MWUwYWNhZGVkYWNkZGYzODQxNjY2ZGEzYTMyM2JkNTk1 MzQ5MDNmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91 YmxlLWNsaWNrLWV4cGVjdGVkLnR4dAorKysgL2Rldi9udWxsCkBAIC0xICswLDAgQEAKLVNjcm9s bCBvZmZzZXQgaXMgNzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgyOGNlYzAwMzIzMTc0NzFhN2E4YjE4NzFl NTNiZTFjNWZiMTYzZi4uMGFmMjQ1YWY0MTQ3NTVkMThhYmU0ODkwYjVlMTBlZmFhOTJlNWE2NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTA4LTE4ICBTYWlsZXNoIEFncmF3YWwg IDxzYWlsQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaHJvbWl1bTogVXBkYXRlIGZvcmtlZCBT Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NTU1NQorCisgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJv Ymluc29uLgorCisgICAgICAgIE1lcmdlIHJlY2VudCBjaGFuZ2VzIHRvIFNjcm9sbGJhclRoZW1l TWFjLm1tIHRvIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0uCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21p dW1NYWMubW06CisgICAgICAgICh3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmg6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjptYXhPdmVybGFwQmV0d2Vl blBhZ2VzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9t aXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6 cmVnaXN0ZXJTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYzo6c2V0TmV3UGFpbnRlckZvclNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjp0 b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludCk6CisK IDIwMTEtMDgtMTYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkIENocm9taXVtIFdpbmRvd3MgYnVpbGQgZml4IGFmdGVyIHI5MzE0MC4g VGFrZSA0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Ny b2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAppbmRl eCA5YmNiMzBhMWYwNzE4MTVmNDUzNDBhODFhNmViM2JhNjM3YjcwNzFlLi40YzdmMjZhODQ0NWZk NjkyNWI4MGIwMTZkMTgwMzkxZWU2NDFkN2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRp bGl0aWVzQ2hyb21pdW1NYWMuaApAQCAtNjYsNiArNjYsNyBAQCB2b2lkIHdrU2Nyb2xsYmFyUGFp bnRlclBhaW50VHJhY2soV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVuYWJsZWQsIGRvdWJs ZSB2YQogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2IoV0tTY3JvbGxiYXJQYWludGVy UmVmKTsKIGludCB3a1Njcm9sbGJhck1pbmltdW1UaHVtYkxlbmd0aChXS1Njcm9sbGJhclBhaW50 ZXJSZWYpOwogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Njcm9sbGJhclBh aW50ZXJSZWYsIGlkIHNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSk7Cit2b2lkIHdrU2Nyb2xsYmFy UGFpbnRlclNldEVuYWJsZWQoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVuYWJsZWQpOwog Q0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJUcmFja0FscGhhKFdLU2Nyb2xsYmFyUGFpbnRlclJl Zik7CiBXS1Njcm9sbGJhclBhaW50ZXJSZWYgd2tNYWtlU2Nyb2xsYmFyUGFpbnRlcihpbnQgY29u dHJvbFNpemUsIGJvb2wgaXNIb3Jpem9udGFsKTsKIGludCB3a1Njcm9sbGJhclRoaWNrbmVzcyhp bnQgY29udHJvbFNpemUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVt TWFjLm1tCmluZGV4IDY0MDNmMDc3MjgxYmNjMTgzOTNlYzFmZjFhZGM2OGEzOTEwZWRiMDcuLmJm MGY5MjBlMWIwMTRjZTc1OGJkNTIxYzgzZjAwNjY2YjlmNmY1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJv bWl1bU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KQEAgLTE4Nyw2ICsxODcsMTEgQEAgdm9p ZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFp bnRlciwgaWQgc2Nyb2xsYmFyUGEKICAgICBbcGFpbnRlciBzZXREZWxlZ2F0ZTpzY3JvbGxiYXJQ YWludGVyRGVsZWdhdGVdOwogfQogCit2b2lkIHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJsZWQo V0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICBbcGFp bnRlciBzZXRFbmFibGVkOmVuYWJsZWRdOworfQorCiBDR0Zsb2F0IHdrU2Nyb2xsYmFyUGFpbnRl clRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIpCiB7CiAgICAgcmV0dXJu IFtwYWludGVyIHRyYWNrQWxwaGFdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IGJlMjE2 ZDBlYzlmODVmYjNiNmM1OTU1ZjlkZTYwZDBhMzMwZWUyZTcuLjA3ODk4NWE5MzA5OWNiOTZiNmUw MTM0NTJiMWYzYWY4ZGE1ZjQ1ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTQyLDEy ICs0MiwxNSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHByZWZlcmVuY2VzQ2hhbmdlZCgpOwogCisg ICAgdmlydHVhbCB2b2lkIHVwZGF0ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIqKTsKKwogICAgIHZp cnR1YWwgYm9vbCBwYWludChTY3JvbGxiYXIqLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwogCiAgICAgdmlydHVhbCBpbnQgc2Nyb2xsYmFyVGhp Y2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXplID0gUmVndWxhclNjcm9sbGJhcik7CiAKICAgICB2 aXJ0dWFsIGJvb2wgc3VwcG9ydHNDb250cm9sVGludHMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9 CiAgICAgdmlydHVhbCBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0OworICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyKik7CiAKICAg ICB2aXJ0dWFsIGRvdWJsZSBpbml0aWFsQXV0b3Njcm9sbFRpbWVyRGVsYXkoKTsKICAgICB2aXJ0 dWFsIGRvdWJsZSBhdXRvc2Nyb2xsVGltZXJEZWxheSgpOwpAQCAtNzAsNiArNzMsOCBAQCBwcm90 ZWN0ZWQ6CiAgICAgdmlydHVhbCBJbnRSZWN0IGZvcndhcmRCdXR0b25SZWN0KFNjcm9sbGJhcios IFNjcm9sbGJhclBhcnQsIGJvb2wgcGFpbnRpbmcgPSBmYWxzZSk7CiAgICAgdmlydHVhbCBJbnRS ZWN0IHRyYWNrUmVjdChTY3JvbGxiYXIqLCBib29sIHBhaW50aW5nID0gZmFsc2UpOwogCisgICAg dmlydHVhbCBpbnQgbWF4T3ZlcmxhcEJldHdlZW5QYWdlcygpIHsgcmV0dXJuIDQwOyB9CisKICAg ICB2aXJ0dWFsIGludCBtaW5pbXVtVGh1bWJMZW5ndGgoU2Nyb2xsYmFyKik7CiAKICAgICB2aXJ0 dWFsIGJvb2wgc2hvdWxkQ2VudGVyT25UaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9ybU1v dXNlRXZlbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCmluZGV4IDM1OGYxMDUyNzc0MzIy MTE1YzdhZmMzNDQzNGM5OWM4ZjA1MGFmNDAuLmYyM2VjNzU5ZDRmOGZlODAzZDkzMjM0YzI1ODY4 OTg1ZDZlNjBjMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAtMTcyLDYgKzE3Miw4 IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cmVnaXN0ZXJTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCiAgICAgYm9vbCBpc0hvcml6b250YWwgPSBzY3JvbGxiYXItPm9y aWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKICAgICBXS1Njcm9sbGJhclBhaW50 ZXJSZWYgc2Nyb2xsYmFyUGFpbnRlciA9IHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoc2Nyb2xsYmFy LT5jb250cm9sU2l6ZSgpLCBpc0hvcml6b250YWwpOwogICAgIHNjcm9sbGJhck1hcCgpLT5hZGQo c2Nyb2xsYmFyLCBzY3JvbGxiYXJQYWludGVyKTsKKyAgICB1cGRhdGVFbmFibGVkU3RhdGUoc2Ny b2xsYmFyKTsKKyAgICB1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoc2Nyb2xsYmFyKTsKIH0K IAogdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1bnJlZ2lzdGVyU2Nyb2xsYmFyKFNj cm9sbGJhciogc2Nyb2xsYmFyKQpAQCAtMTgyLDYgKzE4NCw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYzo6dW5yZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikK IHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6c2V0TmV3UGFpbnRlckZvclNjcm9sbGJh cihTY3JvbGxiYXIqIHNjcm9sbGJhciwgV0tTY3JvbGxiYXJQYWludGVyUmVmIG5ld1BhaW50ZXIp CiB7CiAgICAgc2Nyb2xsYmFyTWFwKCktPnNldChzY3JvbGxiYXIsIG5ld1BhaW50ZXIpOworICAg IHVwZGF0ZUVuYWJsZWRTdGF0ZShzY3JvbGxiYXIpOworICAgIHVwZGF0ZVNjcm9sbGJhck92ZXJs YXlTdHlsZShzY3JvbGxiYXIpOwogfQogCiBXS1Njcm9sbGJhclBhaW50ZXJSZWYgU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRlckZvclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJh cikKQEAgLTI0NCw2ICsyNDgsMjUgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1 c2VzT3ZlcmxheVNjcm9sbGJhcnMoKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7CiB9CiAK K3N0YXRpYyBpbmxpbmUgd2tTY3JvbGxlcktub2JTdHlsZSB0b1Njcm9sbGJhclBhaW50ZXJLbm9i U3R5bGUoU2Nyb2xsYmFyT3ZlcmxheVN0eWxlIHN0eWxlKQoreworICAgIHN3aXRjaCAoc3R5bGUp IHsKKyAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZURhcms6CisgICAgICAgIHJldHVybiB3 a1Njcm9sbGVyS25vYlN0eWxlRGFyazsKKyAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZUxp Z2h0OgorICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZUxpZ2h0OworICAgIGRlZmF1 bHQ6CisgICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0eWxlRGVmYXVsdDsKKyAgICB9Cit9 CisKK3ZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dXBkYXRlU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIGlmIChpc1Njcm9sbGJhck92ZXJs YXlBUElBdmFpbGFibGUoKSkgeworICAgICAgICB3a1NldFNjcm9sbGJhclBhaW50ZXJLbm9iU3R5 bGUocGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIpLCB0b1Njcm9sbGJhclBhaW50ZXJLbm9i U3R5bGUoc2Nyb2xsYmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxiYXJPdmVybGF5U3R5bGUo KSkpOworICAgIH0KK30KKwogZG91YmxlIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OmluaXRp YWxBdXRvc2Nyb2xsVGltZXJEZWxheSgpCiB7CiAgICAgcmV0dXJuIGdJbml0aWFsQnV0dG9uRGVs YXk7CkBAIC00NDgsMTggKzQ3MSw2IEBAIHN0YXRpYyBpbnQgc2Nyb2xsYmFyUGFydFRvSElQcmVz c2VkU3RhdGUoU2Nyb2xsYmFyUGFydCBwYXJ0KQogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSB3 a1Njcm9sbGVyS25vYlN0eWxlIHRvU2Nyb2xsYmFyUGFpbnRlcktub2JTdHlsZShTY3JvbGxiYXJP dmVybGF5U3R5bGUgc3R5bGUpCi17Ci0gICAgc3dpdGNoIChzdHlsZSkgewotICAgIGNhc2UgU2Ny b2xsYmFyT3ZlcmxheVN0eWxlRGFyazoKLSAgICAgICAgcmV0dXJuIHdrU2Nyb2xsZXJLbm9iU3R5 bGVEYXJrOwotICAgIGNhc2UgU2Nyb2xsYmFyT3ZlcmxheVN0eWxlTGlnaHQ6Ci0gICAgICAgIHJl dHVybiB3a1Njcm9sbGVyS25vYlN0eWxlTGlnaHQ7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0 dXJuIHdrU2Nyb2xsZXJLbm9iU3R5bGVEZWZhdWx0OwotICAgIH0KLX0KLQogc3RhdGljIFBsYXRm b3JtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCiB7CiAgICAgaWYgKCFzY3JvbGxiYXItPmVuYWJsZWQoKSkKQEAg LTQ3Miw2ICs0ODMsMTMgQEAgc3RhdGljIFBsYXRmb3JtQnJpZGdlOjpUaGVtZVBhaW50U3RhdGUg c2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoU2Nyb2xsYmFyKiBzY3IKICAgICByZXR1cm4gUGxh dGZvcm1CcmlkZ2U6OlN0YXRlQWN0aXZlOwogfQogCit2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21p dW1NYWM6OnVwZGF0ZUVuYWJsZWRTdGF0ZShTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBp ZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKKyAgICAgICAgd2tTY3JvbGxi YXJQYWludGVyU2V0RW5hYmxlZChzY3JvbGxiYXJNYXAoKS0+Z2V0KHNjcm9sbGJhcikuZ2V0KCks IHNjcm9sbGJhci0+ZW5hYmxlZCgpKTsKKyAgICB9Cit9CisKIGJvb2wgU2Nyb2xsYmFyVGhlbWVD aHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKIHsKICAgICBpZiAoaXNTY3JvbGxi YXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKQEAgLTUwMiw4ICs1MjAsNiBAQCBib29sIFNjcm9s bGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGlj c0NvbnRleHQqIGNvbgogICAgICAgICBzY3JvbGxBbmltYXRvci0+c2V0SXNEcmF3aW5nSW50b0xh eWVyKGZhbHNlKTsKICNlbmRpZgogCi0gICAgICAgIHdrU2V0U2Nyb2xsYmFyUGFpbnRlcktub2JT dHlsZShwYWludGVyRm9yU2Nyb2xsYmFyKHNjcm9sbGJhciksIHRvU2Nyb2xsYmFyUGFpbnRlcktu b2JTdHlsZShzY3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbGJhck92ZXJsYXlTdHls ZSgpKSk7Ci0KICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpj b250ZXh0KTsKICAgICAgICAgY29udGV4dC0+Y2xpcChkYW1hZ2VSZWN0KTsKICAgICAgICAgY29u dGV4dC0+dHJhbnNsYXRlKHNjcm9sbGJhci0+ZnJhbWVSZWN0KCkueCgpLCBzY3JvbGxiYXItPmZy YW1lUmVjdCgpLnkoKSk7Cg== 104398 2011-08-18 14:29:50 -0700 2011-08-18 15:14:36 -0700 Patch for landing bug-65555-20110818142949.patch text/plain 9509 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTMzMjgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMGEzZjUzOGZjNzZiMjRmZDQ1ODE4 MmRiNjg1ZTIwMWEzNmExOGE4Li4yMTQxNDQ4OTMxNjFhYWIxNmY0YTMzMTA3OTg1ZTA3NzIwN2Uw YjNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTggIFNhaWxlc2ggQWdyYXdhbCAg PHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtOiBVcGRhdGUgZm9ya2VkIFNj cm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9i aW5zb24uCisKKyAgICAgICAgUmVtb3ZpbmcgdGhlIGNocm9taXVtLWNnLW1hYyB2ZXJzaW9uIG9m IHRoZSBleHBlY3RhdGlvbiBmaWxlIHNpbmNlIGl0IG5vdyBtYXRjaGVzIHRoZSBtYWMgb25lLgor CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tY2ctbWFjL2Zhc3QvZXZlbnRzL3Njcm9sbGJh ci1kb3VibGUtY2xpY2stZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorCiAyMDExLTA4LTE4ICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZhbGlkYXRl IGV4cGlyZWQgcmVzb3VyY2VzIGlmIHRoZXkncmUgcmVxdWVzdGVkIGFmdGVyIHRoZSBpbml0aWFs IGRvY3VtZW50IGxvYWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVt LWNnLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91YmxlLWNsaWNrLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWNnLW1hYy9mYXN0L2V2ZW50cy9zY3JvbGxi YXItZG91YmxlLWNsaWNrLWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggNTFlMGFjYWRlZGFjZGRmMzg0MTY2NmRhM2EzMjNiZDU5NTM0OTAzZi4uMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS1jZy1tYWMvZmFzdC9ldmVudHMvc2Nyb2xsYmFyLWRvdWJsZS1jbGljay1leHBlY3Rl ZC50eHQKKysrIC9kZXYvbnVsbApAQCAtMSArMCwwIEBACi1TY3JvbGwgb2Zmc2V0IGlzIDcwMApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGIzMWRlZjU2MzY1YzY3NzUwOThkYmM1MmIzNjcwYmQ4YjRiZjNlMWQuLjNk NzUzZWIxNzNhNzU1MDUyZjRlNjFhZDJmMzZmMjFjMGJkNDc3OWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxMS0wOC0xOCAgU2FpbGVzaCBBZ3Jhd2FsICA8c2FpbEBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgQ2hyb21pdW06IFVwZGF0ZSBmb3JrZWQgU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjU1NTUKKworICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KKworICAgICAg ICBNZXJnZSByZWNlbnQgY2hhbmdlcyB0byBTY3JvbGxiYXJUaGVtZU1hYy5tbSB0byBTY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjLm1tLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Ny b2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tOgorICAgICAg ICAod2tTY3JvbGxiYXJQYWludGVyU2V0RW5hYmxlZCk6CisgICAgICAgICogcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6bWF4T3ZlcmxhcEJldHdlZW5QYWdlcyk6CisgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5tbToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnJlZ2lzdGVyU2Nyb2xsYmFy KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnNldE5ld1Bh aW50ZXJGb3JTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6dG9TY3JvbGxiYXJQYWludGVy S25vYlN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6 OnVwZGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVFbmFibGVkU3RhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQpOgorCiAyMDExLTA4LTE4ICBOaWNv IFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggIm1pc3NpbmcgcmV0 dXJuIiBnY2Mgd2FybmluZyBpbiBTY3JvbGxBbmltYXRvck5vbmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJv bWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3Zl cmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKaW5kZXggOWJjYjMwYTFmMDcxODE1ZjQ1MzQwYTgx YTZlYjNiYTYzN2I3MDcxZS4uNGM3ZjI2YTg0NDVmZDY5MjViODBiMDE2ZDE4MDM5MWVlNjQxZDdl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFy T3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLmgKQEAgLTY2 LDYgKzY2LDcgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludFRyYWNrKFdLU2Nyb2xsYmFy UGFpbnRlclJlZiwgYm9vbCBlbmFibGVkLCBkb3VibGUgdmEKIHZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZik7CiBpbnQgd2tTY3JvbGxiYXJNaW5p bXVtVGh1bWJMZW5ndGgoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKIHZvaWQgd2tTY3JvbGxiYXJQ YWludGVyU2V0RGVsZWdhdGUoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBpZCBzY3JvbGxiYXJQYWlu dGVyRGVsZWdhdGUpOwordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKFdLU2Nyb2xs YmFyUGFpbnRlclJlZiwgYm9vbCBlbmFibGVkKTsKIENHRmxvYXQgd2tTY3JvbGxiYXJQYWludGVy VHJhY2tBbHBoYShXS1Njcm9sbGJhclBhaW50ZXJSZWYpOwogV0tTY3JvbGxiYXJQYWludGVyUmVm IHdrTWFrZVNjcm9sbGJhclBhaW50ZXIoaW50IGNvbnRyb2xTaXplLCBib29sIGlzSG9yaXpvbnRh bCk7CiBpbnQgd2tTY3JvbGxiYXJUaGlja25lc3MoaW50IGNvbnRyb2xTaXplKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGls aXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Nj cm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQppbmRleCBmOWQ5ODlhZDI4Y2I2 MWE0MTdjNTVlZmNiZmEyYWJkYWNmMzg0NDI2Li5hOGIwMWQ0YWI1ZDU4MTdiNTk1ZmNiODgwNjIx NDQ2MzgxYzY0Y2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVt TWFjLm1tCkBAIC0xOTIsNiArMTkyLDExIEBAIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0RGVs ZWdhdGUoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBhaW50ZXIsIGlkIHNjcm9sbGJhclBhCiAgICAg W3BhaW50ZXIgc2V0RGVsZWdhdGU6c2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlXTsKIH0KIAordm9p ZCB3a1Njcm9sbGJhclBhaW50ZXJTZXRFbmFibGVkKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWlu dGVyLCBib29sIGVuYWJsZWQpCit7CisgICAgW3BhaW50ZXIgc2V0RW5hYmxlZDplbmFibGVkXTsK K30KKwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJUcmFja0FscGhhKFdLU2Nyb2xsYmFyUGFp bnRlclJlZiBwYWludGVyKQogewogICAgIHJldHVybiBbcGFpbnRlciB0cmFja0FscGhhXTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJh clRoZW1lQ2hyb21pdW1NYWMuaAppbmRleCBiZTIxNmQwZWM5Zjg1ZmIzYjZjNTk1NWY5ZGU2MGQw YTMzMGVlMmU3Li4wNzg5ODVhOTMwOTljYjk2YjZlMDEzNDUyYjFmM2FmOGRhNWY0NWU5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNo cm9taXVtTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bU1hYy5oCkBAIC00MiwxMiArNDIsMTUgQEAgcHVibGljOgogCiAgICAg dm9pZCBwcmVmZXJlbmNlc0NoYW5nZWQoKTsKIAorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVFbmFi bGVkU3RhdGUoU2Nyb2xsYmFyKik7CisKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnQoU2Nyb2xsYmFy KiwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0KTsK IAogICAgIHZpcnR1YWwgaW50IHNjcm9sbGJhclRoaWNrbmVzcyhTY3JvbGxiYXJDb250cm9sU2l6 ZSA9IFJlZ3VsYXJTY3JvbGxiYXIpOwogCiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzQ29udHJv bFRpbnRzKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCB1c2VzT3Zl cmxheVNjcm9sbGJhcnMoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Nyb2xsYmFy T3ZlcmxheVN0eWxlKFNjcm9sbGJhciopOwogCiAgICAgdmlydHVhbCBkb3VibGUgaW5pdGlhbEF1 dG9zY3JvbGxUaW1lckRlbGF5KCk7CiAgICAgdmlydHVhbCBkb3VibGUgYXV0b3Njcm9sbFRpbWVy RGVsYXkoKTsKQEAgLTcwLDYgKzczLDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgSW50UmVj dCBmb3J3YXJkQnV0dG9uUmVjdChTY3JvbGxiYXIqLCBTY3JvbGxiYXJQYXJ0LCBib29sIHBhaW50 aW5nID0gZmFsc2UpOwogICAgIHZpcnR1YWwgSW50UmVjdCB0cmFja1JlY3QoU2Nyb2xsYmFyKiwg Ym9vbCBwYWludGluZyA9IGZhbHNlKTsKIAorICAgIHZpcnR1YWwgaW50IG1heE92ZXJsYXBCZXR3 ZWVuUGFnZXMoKSB7IHJldHVybiA0MDsgfQorCiAgICAgdmlydHVhbCBpbnQgbWluaW11bVRodW1i TGVuZ3RoKFNjcm9sbGJhciopOwogCiAgICAgdmlydHVhbCBib29sIHNob3VsZENlbnRlck9uVGh1 bWIoU2Nyb2xsYmFyKiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbQppbmRleCAzNThmMTA1Mjc3NDMyMjExNWM3YWZjMzQ0MzRjOTljOGYwNTBhZjQw Li5mMjNlYzc1OWQ0ZjhmZTgwM2Q5MzIzNGMyNTg2ODk4NWQ2ZTYwYzBkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMubW0KQEAgLTE3Miw2ICsxNzIsOCBAQCB2b2lkIFNjcm9sbGJhclRoZW1lQ2hy b21pdW1NYWM6OnJlZ2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogICAgIGJv b2wgaXNIb3Jpem9udGFsID0gc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxT Y3JvbGxiYXI7CiAgICAgV0tTY3JvbGxiYXJQYWludGVyUmVmIHNjcm9sbGJhclBhaW50ZXIgPSB3 a01ha2VTY3JvbGxiYXJQYWludGVyKHNjcm9sbGJhci0+Y29udHJvbFNpemUoKSwgaXNIb3Jpem9u dGFsKTsKICAgICBzY3JvbGxiYXJNYXAoKS0+YWRkKHNjcm9sbGJhciwgc2Nyb2xsYmFyUGFpbnRl cik7CisgICAgdXBkYXRlRW5hYmxlZFN0YXRlKHNjcm9sbGJhcik7CisgICAgdXBkYXRlU2Nyb2xs YmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhcik7CiB9CiAKIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYzo6dW5yZWdpc3RlclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKQEAgLTE4 Miw2ICsxODQsOCBAQCB2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnVucmVnaXN0ZXJT Y3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiB2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21p dW1NYWM6OnNldE5ld1BhaW50ZXJGb3JTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIFdL U2Nyb2xsYmFyUGFpbnRlclJlZiBuZXdQYWludGVyKQogewogICAgIHNjcm9sbGJhck1hcCgpLT5z ZXQoc2Nyb2xsYmFyLCBuZXdQYWludGVyKTsKKyAgICB1cGRhdGVFbmFibGVkU3RhdGUoc2Nyb2xs YmFyKTsKKyAgICB1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoc2Nyb2xsYmFyKTsKIH0KIAog V0tTY3JvbGxiYXJQYWludGVyUmVmIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50ZXJG b3JTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCkBAIC0yNDQsNiArMjQ4LDI1IEBAIGJv b2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6dXNlc092ZXJsYXlTY3JvbGxiYXJzKCkgY29u c3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgaW5saW5lIHdrU2Nyb2xsZXJL bm9iU3R5bGUgdG9TY3JvbGxiYXJQYWludGVyS25vYlN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHls ZSBzdHlsZSkKK3sKKyAgICBzd2l0Y2ggKHN0eWxlKSB7CisgICAgY2FzZSBTY3JvbGxiYXJPdmVy bGF5U3R5bGVEYXJrOgorICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZURhcms7Cisg ICAgY2FzZSBTY3JvbGxiYXJPdmVybGF5U3R5bGVMaWdodDoKKyAgICAgICAgcmV0dXJuIHdrU2Ny b2xsZXJLbm9iU3R5bGVMaWdodDsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gd2tTY3Jv bGxlcktub2JTdHlsZURlZmF1bHQ7CisgICAgfQorfQorCit2b2lkIFNjcm9sbGJhclRoZW1lQ2hy b21pdW1NYWM6OnVwZGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZShTY3JvbGxiYXIqIHNjcm9sbGJh cikKK3sKKyAgICBpZiAoaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpIHsKKyAgICAg ICAgd2tTZXRTY3JvbGxiYXJQYWludGVyS25vYlN0eWxlKHBhaW50ZXJGb3JTY3JvbGxiYXIoc2Ny b2xsYmFyKSwgdG9TY3JvbGxiYXJQYWludGVyS25vYlN0eWxlKHNjcm9sbGJhci0+c2Nyb2xsYWJs ZUFyZWEoKS0+c2Nyb2xsYmFyT3ZlcmxheVN0eWxlKCkpKTsKKyAgICB9Cit9CisKIGRvdWJsZSBT Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjppbml0aWFsQXV0b3Njcm9sbFRpbWVyRGVsYXkoKQog ewogICAgIHJldHVybiBnSW5pdGlhbEJ1dHRvbkRlbGF5OwpAQCAtNDQ4LDE4ICs0NzEsNiBAQCBz dGF0aWMgaW50IHNjcm9sbGJhclBhcnRUb0hJUHJlc3NlZFN0YXRlKFNjcm9sbGJhclBhcnQgcGFy dCkKICAgICB9CiB9CiAKLXN0YXRpYyBpbmxpbmUgd2tTY3JvbGxlcktub2JTdHlsZSB0b1Njcm9s bGJhclBhaW50ZXJLbm9iU3R5bGUoU2Nyb2xsYmFyT3ZlcmxheVN0eWxlIHN0eWxlKQotewotICAg IHN3aXRjaCAoc3R5bGUpIHsKLSAgICBjYXNlIFNjcm9sbGJhck92ZXJsYXlTdHlsZURhcms6Ci0g ICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0eWxlRGFyazsKLSAgICBjYXNlIFNjcm9sbGJh ck92ZXJsYXlTdHlsZUxpZ2h0OgotICAgICAgICByZXR1cm4gd2tTY3JvbGxlcktub2JTdHlsZUxp Z2h0OwotICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybiB3a1Njcm9sbGVyS25vYlN0eWxlRGVm YXVsdDsKLSAgICB9Ci19Ci0KIHN0YXRpYyBQbGF0Zm9ybUJyaWRnZTo6VGhlbWVQYWludFN0YXRl IHNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRlKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogewogICAg IGlmICghc2Nyb2xsYmFyLT5lbmFibGVkKCkpCkBAIC00NzIsNiArNDgzLDEzIEBAIHN0YXRpYyBQ bGF0Zm9ybUJyaWRnZTo6VGhlbWVQYWludFN0YXRlIHNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRl KFNjcm9sbGJhciogc2NyCiAgICAgcmV0dXJuIFBsYXRmb3JtQnJpZGdlOjpTdGF0ZUFjdGl2ZTsK IH0KIAordm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjp1cGRhdGVFbmFibGVkU3RhdGUo U2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit7CisgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2 YWlsYWJsZSgpKSB7CisgICAgICAgIHdrU2Nyb2xsYmFyUGFpbnRlclNldEVuYWJsZWQoc2Nyb2xs YmFyTWFwKCktPmdldChzY3JvbGxiYXIpLmdldCgpLCBzY3JvbGxiYXItPmVuYWJsZWQoKSk7Cisg ICAgfQorfQorCiBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJh ciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRh bWFnZVJlY3QpCiB7CiAgICAgaWYgKGlzU2Nyb2xsYmFyT3ZlcmxheUFQSUF2YWlsYWJsZSgpKSB7 CkBAIC01MDIsOCArNTIwLDYgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWlu dChTY3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb24KICAgICAgICAgc2Ny b2xsQW5pbWF0b3ItPnNldElzRHJhd2luZ0ludG9MYXllcihmYWxzZSk7CiAjZW5kaWYKIAotICAg ICAgICB3a1NldFNjcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUocGFpbnRlckZvclNjcm9sbGJhcihz Y3JvbGxiYXIpLCB0b1Njcm9sbGJhclBhaW50ZXJLbm9iU3R5bGUoc2Nyb2xsYmFyLT5zY3JvbGxh YmxlQXJlYSgpLT5zY3JvbGxiYXJPdmVybGF5U3R5bGUoKSkpOwotCiAgICAgICAgIEdyYXBoaWNz Q29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqY29udGV4dCk7CiAgICAgICAgIGNvbnRleHQt PmNsaXAoZGFtYWdlUmVjdCk7CiAgICAgICAgIGNvbnRleHQtPnRyYW5zbGF0ZShzY3JvbGxiYXIt PmZyYW1lUmVjdCgpLngoKSwgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKS55KCkpOwo=