108314 2013-01-30 02:16:10 -0800 [BlackBerry] Enable non-video element enter/exit fullscreen. 2013-02-07 19:03:20 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mawu mawu mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 819977 0 mawu 2013-01-30 02:16:10 -0800 Webkit support non-video element (like div) to enter/exit fullscreen. We should pass this capability. 820015 1 185452 mawu 2013-01-30 02:51:53 -0800 Created attachment 185452 Patch 820207 2 185452 tonikitoo 2013-01-30 07:53:08 -0800 Comment on attachment 185452 Patch Why not removing the whole code path that is dead? 'm_fullscreenVideoNode' is this name (containing "video") still accurate? 826037 3 mawu 2013-02-05 20:03:10 -0800 (In reply to comment #2) > (From update of attachment 185452 [details]) Thanks for comments, Antonio. > Why not removing the whole code path that is dead? Will track it in separate PR. > > 'm_fullscreenVideoNode' is this name (containing "video") still accurate? hehe, yes, "Video" no more suitable here. 826042 4 186749 mawu 2013-02-05 20:10:40 -0800 Created attachment 186749 Patch 826207 5 mawu 2013-02-06 01:30:13 -0800 > > Why not removing the whole code path that is dead? BTW, which code path, could you give more info? thanks 826322 6 186749 tonikitoo 2013-02-06 04:23:15 -0800 Comment on attachment 186749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186749&action=review - we have now another inconsistency: fullscreen x fullScreen. We could address it as well in a follow up. > Source/WebKit/blackberry/Api/WebPage.cpp:5122 > + Element* element = static_cast<Element*>(d->m_fullscreenNode.get()); because you cast, please call 'm_fullscreenNode->isElement()) 826324 7 tonikitoo 2013-02-06 04:24:36 -0800 (In reply to comment #5) > > > Why not removing the whole code path that is dead? > > BTW, which code path, could you give more info? thanks the whole "enterFullscreenForNode" is not obsolete. IIRC it was playbook codepath. Not with FULLSCREEN_API, it got obsolete. Also WebSettings::videoCapable seems obsolete as well. 827060 8 mawu 2013-02-06 22:39:38 -0800 (In reply to comment #6) > (From update of attachment 186749 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186749&action=review > > - we have now another inconsistency: fullscreen x fullScreen. We could address it as well in a follow up. > I also noticed that, didn't touch it since not related to the bug :) should address it in follow up. > > Source/WebKit/blackberry/Api/WebPage.cpp:5122 > > + Element* element = static_cast<Element*>(d->m_fullscreenNode.get()); > > because you cast, please call 'm_fullscreenNode->isElement()) yes, will call toElement() 827061 9 mawu 2013-02-06 22:41:51 -0800 (In reply to comment #7) > (In reply to comment #5) > > > > Why not removing the whole code path that is dead? > > > > BTW, which code path, could you give more info? thanks > > the whole "enterFullscreenForNode" is not obsolete. IIRC it was playbook codepath. Not with FULLSCREEN_API, it got obsolete. > > Also WebSettings::videoCapable seems obsolete as well. I noticed that, Not sure if other app would use that part in future. Will consult Max. Thanks 827069 10 186995 mawu 2013-02-06 23:06:34 -0800 Created attachment 186995 Patch 827374 11 186995 webkit.review.bot 2013-02-07 05:39:15 -0800 Comment on attachment 186995 Patch Rejecting attachment 186995 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 186995, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: ceeded at 5787 (offset 35 lines). Hunk #8 succeeded at 5809 (offset 35 lines). Hunk #9 succeeded at 5846 (offset 40 lines). Hunk #10 succeeded at 5854 (offset 40 lines). Hunk #11 succeeded at 5873 (offset 40 lines). 2 out of 11 hunks FAILED -- saving rejects to file Source/WebKit/blackberry/Api/WebPage.cpp.rej patching file Source/WebKit/blackberry/Api/WebPage_p.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/16430148 827426 12 186995 webkit.review.bot 2013-02-07 06:17:20 -0800 Comment on attachment 186995 Patch Rejecting attachment 186995 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-04', 'apply-attachment', '--no-update', '--non-interactive', 186995, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: ceeded at 5787 (offset 35 lines). Hunk #8 succeeded at 5809 (offset 35 lines). Hunk #9 succeeded at 5846 (offset 40 lines). Hunk #10 succeeded at 5854 (offset 40 lines). Hunk #11 succeeded at 5873 (offset 40 lines). 2 out of 11 hunks FAILED -- saving rejects to file Source/WebKit/blackberry/Api/WebPage.cpp.rej patching file Source/WebKit/blackberry/Api/WebPage_p.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/16438151 828072 13 186995 mawu 2013-02-07 18:09:46 -0800 Comment on attachment 186995 Patch need to rebase to update code. 828080 14 187213 mawu 2013-02-07 18:25:01 -0800 Created attachment 187213 Patch 828100 15 187213 webkit.review.bot 2013-02-07 19:03:15 -0800 Comment on attachment 187213 Patch Clearing flags on attachment: 187213 Committed r142220: <http://trac.webkit.org/changeset/142220> 828101 16 webkit.review.bot 2013-02-07 19:03:20 -0800 All reviewed patches have been landed. Closing bug. 185452 2013-01-30 02:51:53 -0800 2013-02-05 20:10:34 -0800 Patch bug-108314-20130130184836.patch text/plain 4052 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBjNzlhMGU2M2M3NjA1NGM2NTkwOGM2YjliZjUzOTc1ZGM2NTZhNDU4Li42NjczOGNhZjNk NWRlMDE3YTZjZTI0OThlNWY5ZTg1NTI0ODYyZDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0zMCAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgbm9uLXZpZGVv IGVsZW1lbnQgZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2Via2l0IHN1cHBvcnQgbm9uLXZpZGVvIGVsZW1lbnQg KGxpa2UgZGl2KSB0byBlbnRlci9leGl0CisgICAgICAgIGZ1bGxzY3JlZW4uIFdlIHNob3VsZCBw YXNzIHRoaXMgY2FwYWJpbGl0eS4KKworICAgICAgICBSSU0gUFIgMjU2MzcwLCBpbnRlcm5hbGx5 IHJldmlld2VkIGJ5IE1heCBGZWlsLgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpub3RpZnlGdWxsU2NyZWVuVmlkZW9F eGl0ZWQpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50 KToKKwogMjAxMi0xMi0yMyAgSmFrb2IgUGV0c292aXRzICA8anBldHNvdml0c0ByaW0uY29tPgog CiAgICAgICAgIFtCbGFja0JlcnJ5XSBTcGVjaWZ5IHRpbGUgdXNhZ2UgZW51bSBmb3IgYmFja2lu Z3N0b3JlIHRpbGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5k ZXggY2VkMDQ5Mzg0MmVkZmMwZGQ1NTFlY2Y5YTBhN2ZlMThlNWEzZGM3YS4uZjQ5NzlhZmY0Njlk NWRkMDI0YjE0ZGVkZTkzZTYwMTQ3ODk3NzBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuY3BwCkBAIC01MTE5LDE1ICs1MTE5LDE1IEBAIHZvaWQgV2ViUGFnZTo6bm90 aWZ5RnVsbFNjcmVlblZpZGVvRXhpdGVkKGJvb2wgZG9uZSkKIHsKICAgICBVTlVTRURfUEFSQU0o ZG9uZSk7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIGlmIChkLT5tX3dlYlNldHRpbmdzLT5mdWxs U2NyZWVuVmlkZW9DYXBhYmxlKCkpIHsKLSAgICAgICAgaWYgKEhUTUxNZWRpYUVsZW1lbnQqIG1l ZGlhRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxNZWRpYUVsZW1lbnQqPihkLT5tX2Z1bGxzY3Jl ZW5WaWRlb05vZGUuZ2V0KCkpKQotICAgICAgICAgICAgbWVkaWFFbGVtZW50LT5leGl0RnVsbHNj cmVlbigpOwotICAgIH0gZWxzZSB7CisgICAgRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0 PEVsZW1lbnQqPihkLT5tX2Z1bGxzY3JlZW5WaWRlb05vZGUuZ2V0KCkpOworICAgIGlmICghZWxl bWVudCkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChkLT5tX3dlYlNldHRpbmdzLT5mdWxsU2Ny ZWVuVmlkZW9DYXBhYmxlKCkgJiYgZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVv VGFnKSkKKyAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KGVsZW1lbnQpLT5l eGl0RnVsbHNjcmVlbigpOwogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICAgICAgaWYg KEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oZC0+bV9mdWxsc2NyZWVu VmlkZW9Ob2RlLmdldCgpKSkKLSAgICAgICAgICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtp dENhbmNlbEZ1bGxTY3JlZW4oKTsKKyAgICBlbHNlCisgICAgICAgIGVsZW1lbnQtPmRvY3VtZW50 KCktPndlYmtpdENhbmNlbEZ1bGxTY3JlZW4oKTsKICNlbmRpZgotICAgIH0KICNlbmRpZgogfQog CkBAIC01Nzc0LDIzICs1Nzc0LDEyIEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmV4aXRGdWxsc2Ny ZWVuRm9yTm9kZShOb2RlKiBub2RlKQogfQogCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQot Ly8gVE9ETzogV2Ugc2hvdWxkIHJlbW92ZSB0aGlzIGhlbHBlciBjbGFzcyB3aGVuIHdlIGRlY2lk ZSB0byBzdXBwb3J0IGFsbCBlbGVtZW50cy4KLXN0YXRpYyBib29sIGNvbnRhaW5zVmlkZW9UYWdz KEVsZW1lbnQqIGVsZW1lbnQpCi17Ci0gICAgZm9yIChOb2RlKiBub2RlID0gZWxlbWVudC0+Zmly c3RDaGlsZCgpOyBub2RlOyBub2RlID0gTm9kZVRyYXZlcnNhbDo6bmV4dChub2RlLCBlbGVtZW50 KSkgewotICAgICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSkK LSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0K IHZvaWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVudCog ZWxlbWVudCkKIHsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgLy8gVE9ETzogV2Ugc2hvdWxkIG5v dCBjaGVjayB2aWRlbyB0YWcgd2hlbiB3ZSBkZWNpZGUgdG8gc3VwcG9ydCBhbGwgZWxlbWVudHMu Ci0gICAgaWYgKCFlbGVtZW50IHx8ICghZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZp ZGVvVGFnKSAmJiAhY29udGFpbnNWaWRlb1RhZ3MoZWxlbWVudCkpKQorICAgIGlmICghZWxlbWVu dCkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX3dlYlNldHRpbmdzLT5mdWxsU2NyZWVuVmlk ZW9DYXBhYmxlKCkpIHsKKyAgICBpZiAobV93ZWJTZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2Fw YWJsZSgpICYmIGVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykpIHsKICAg ICAgICAgLy8gVGhlIEJyb3dzZXIgY2hyb21lIGhhcyBpdHMgb3duIGZ1bGxzY3JlZW4gdmlkZW8g d2lkZ2V0IGl0IHdhbnRzIHRvCiAgICAgICAgIC8vIHVzZSwgYW5kIHRoaXMgaXMgYSB2aWRlbyBl bGVtZW50LiBUaGUgb25seSByZWFzb24gdGhhdAogICAgICAgICAvLyB3ZWJraXRXaWxsRW50ZXJG dWxsU2NyZWVuRm9yRWxlbWVudCgpIGFuZApAQCAtNTgyNSwxMCArNTgxNCw5IEBAIHZvaWQgV2Vi UGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkK IHZvaWQgV2ViUGFnZVByaXZhdGU6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KiBl bGVtZW50KQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICAvLyBUT0RPOiBXZSBzaG91bGQgbm90 IGNoZWNrIHZpZGVvIHRhZyB3aGVuIHdlIGRlY2lkZSB0byBzdXBwb3J0IGFsbCBlbGVtZW50cy4K LSAgICBpZiAoIWVsZW1lbnQgfHwgKCFlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlk ZW9UYWcpICYmICFjb250YWluc1ZpZGVvVGFncyhlbGVtZW50KSkpCisgICAgaWYgKCFlbGVtZW50 KQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKG1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRl b0NhcGFibGUoKSkgeworICAgIGlmIChtX3dlYlNldHRpbmdzLT5mdWxsU2NyZWVuVmlkZW9DYXBh YmxlKCkgJiYgZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSkgewogICAg ICAgICAvLyBUaGUgQnJvd3NlciBjaHJvbWUgaGFzIGl0cyBvd24gZnVsbHNjcmVlbiB2aWRlbyB3 aWRnZXQuCiAgICAgICAgIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShlbGVtZW50KTsKICAgICB9IGVs c2Ugewo= 186749 2013-02-05 20:10:40 -0800 2013-02-06 23:06:25 -0800 Patch bug-108314-20130206120717.patch text/plain 9086 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBjNzlhMGU2M2M3NjA1NGM2NTkwOGM2YjliZjUzOTc1ZGM2NTZhNDU4Li44NmZkN2M5OWY1 NDE3MDY3MjFkNGQ4MGRhNGZiYzk3OWNhMGJiZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0zMCAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgbm9uLXZpZGVv IGVsZW1lbnQgZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2Via2l0IHN1cHBvcnQgbm9uLXZpZGVvIGVsZW1lbnQg KGxpa2UgZGl2KSB0byBlbnRlci9leGl0CisgICAgICAgIGZ1bGxzY3JlZW4uIFdlIHNob3VsZCBw YXNzIHRoaXMgY2FwYWJpbGl0eSBpbiBibGFja2JlcnJ5IHBvcnRpbmcuCisKKyAgICAgICAgUklN IFBSIDI1NjM3MCwgaW50ZXJuYWxseSByZXZpZXdlZCBieSBNYXggRmVpbC4KKworICAgICAgICAq IEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZTo6 bm90aWZ5RnVsbFNjcmVlblZpZGVvRXhpdGVkKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAg IChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjplbnRlckZ1bGxTY3JlZW5Gb3JF bGVtZW50KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmV4 aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisKIDIwMTItMTItMjMgIEpha29iIFBldHNvdml0cyAg PGpwZXRzb3ZpdHNAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gU3BlY2lmeSB0aWxl IHVzYWdlIGVudW0gZm9yIGJhY2tpbmdzdG9yZSB0aWxlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGNlZDA0OTM4NDJlZGZjMGRkNTUxZWNmOWEwYTdmZTE4 ZTVhM2RjN2EuLmJjYzc3ZTZmYzUxYmNmMjYwZjY0MmJiZDQ3Njg2MmVlNGE1MzI0ZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtNDIyLDcgKzQyMiw3IEBA IFdlYlBhZ2VQcml2YXRlOjpXZWJQYWdlUHJpdmF0ZShXZWJQYWdlKiB3ZWJQYWdlLCBXZWJQYWdl Q2xpZW50KiBjbGllbnQsIGNvbnN0IEluCiAgICAgLCBtX3N1c3BlbmRSb290TGF5ZXJDb21taXQo ZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fcGVuZGluZ09yaWVudGF0aW9uKC0xKQotICAgICwgbV9m dWxsc2NyZWVuVmlkZW9Ob2RlKDApCisgICAgLCBtX2Z1bGxzY3JlZW5Ob2RlKDApCiAgICAgLCBt X2hhc0luUmVnaW9uU2Nyb2xsYWJsZUFyZWFzKGZhbHNlKQogICAgICwgbV91cGRhdGVEZWxlZ2F0 ZWRPdmVybGF5c0Rpc3BhdGNoZWQoZmFsc2UpCiAgICAgLCBtX2VuYWJsZVFueEphdmFTY3JpcHRP YmplY3QoZmFsc2UpCkBAIC0xNDc3LDggKzE0NzcsOCBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjp1 cGRhdGVWaWV3cG9ydFNpemUoYm9vbCBzZXRGaXhlZFJlcG9ydGVkU2l6ZSwgYm9vbCBzZW5kUmVz aQogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICAgICAgLy8gSWYgd2UgYXJlIGluIGZ1 bGxzY3JlZW4gdmlkZW8gbW9kZSwgYW5kIHdlIGNoYW5nZSB0aGUgRnJhbWVWaWV3Ojp2aWV3cG9y dFJlY3QsCiAgICAgICAgIC8vIHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBtZWRpYSBjb250YWluZXIg dG8gdGhlIG5ldyBzaXplLgotICAgICAgICBpZiAobV9mdWxsc2NyZWVuVmlkZW9Ob2RlKSB7Ci0g ICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2Z1bGxzY3JlZW5WaWRlb05vZGUtPmRv Y3VtZW50KCk7CisgICAgICAgIGlmIChtX2Z1bGxzY3JlZW5Ob2RlKSB7CisgICAgICAgICAgICBE b2N1bWVudCogZG9jdW1lbnQgPSBtX2Z1bGxzY3JlZW5Ob2RlLT5kb2N1bWVudCgpOwogICAgICAg ICAgICAgQVNTRVJUKGRvY3VtZW50KTsKICAgICAgICAgICAgIEFTU0VSVChkb2N1bWVudC0+ZnVs bFNjcmVlblJlbmRlcmVyKCkpOwogCkBAIC0yNTAwLDcgKzI1MDAsNyBAQCB2b2lkIFdlYlBhZ2VQ cml2YXRlOjpjbGVhckRvY3VtZW50RGF0YShjb25zdCBEb2N1bWVudCogZG9jdW1lbnRHb2luZ0F3 YXkpCiAgICAgaWYgKG5vZGVVbmRlckZhdEZpbmdlciAmJiBub2RlVW5kZXJGYXRGaW5nZXItPmRv Y3VtZW50KCkgPT0gZG9jdW1lbnRHb2luZ0F3YXkpCiAgICAgICAgIG1fdG91Y2hFdmVudEhhbmRs ZXItPnJlc2V0TGFzdEZhdEZpbmdlcnNSZXN1bHQoKTsKIAotICAgIC8vIE5PVEU6IG1fZnVsbHNj cmVlblZpZGVvTm9kZSwgbV9mdWxsU2NyZWVuUGx1Z2luVmlldyBhbmQgbV9wbHVnaW5WaWV3cwor ICAgIC8vIE5PVEU6IG1fZnVsbHNjcmVlbk5vZGUsIG1fZnVsbFNjcmVlblBsdWdpblZpZXcgYW5k IG1fcGx1Z2luVmlld3MKICAgICAvLyBhcmUgY2xlYXJlZCBpbiBvdGhlciBtZXRob2RzIGFscmVh ZHkuCiB9CiAKQEAgLTM4MjgsNyArMzgyOCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldFZp ZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplCiAg ICAgLy8gaWYgbmVlZGVkLgogICAgIC8vIEZJWE1FOiBUaGUgY2FjaGVkIHZhbHVlcyBtaWdodCBn ZXQgaW1wcmVjaXNlIGlmIHVzZXIgaGF2ZSByb3RhdGVkIHRoZQogICAgIC8vIGRldmljZSB3aGls ZSBpbiBmdWxsc2NyZWVuLgotICAgIGlmIChtX3NjYWxlQmVmb3JlRnVsbFNjcmVlbiA+IDAgJiYg IW1fZnVsbHNjcmVlblZpZGVvTm9kZSkgeworICAgIGlmIChtX3NjYWxlQmVmb3JlRnVsbFNjcmVl biA+IDAgJiYgIW1fZnVsbHNjcmVlbk5vZGUpIHsKICAgICAgICAgLy8gUmVzdG9yZSB0aGUgc2Nh bGUgd2hlbiBsZWF2aW5nIGZ1bGxzY3JlZW4uIFdlIGNhbid0IHVzZSBUcmFuc2Zvcm1hdGlvbk1h dHJpeDo6c2NhbGUoZG91YmxlKSBoZXJlLAogICAgICAgICAvLyBhcyBpdCB3aWxsIG11bHRpcGx5 IHRoZSBzY2FsZSByYXRoZXIgdGhhbiBzZXQgdGhlIHNjYWxlLgogICAgICAgICAvLyBGSVhNRTog V2UgY2FuIHJlZmFjdG9yIHRoaXMgaW50byBzZXRDdXJyZW50U2NhbGUoZG91YmxlKSBpZiBpdCBp cyB1c2VmdWwgaW4gdGhlIGZ1dHVyZS4KQEAgLTUxMTksMTUgKzUxMTksMTUgQEAgdm9pZCBXZWJQ YWdlOjpub3RpZnlGdWxsU2NyZWVuVmlkZW9FeGl0ZWQoYm9vbCBkb25lKQogewogICAgIFVOVVNF RF9QQVJBTShkb25lKTsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgaWYgKGQtPm1fd2ViU2V0dGlu Z3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSkgewotICAgICAgICBpZiAoSFRNTE1lZGlhRWxl bWVudCogbWVkaWFFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KGQtPm1f ZnVsbHNjcmVlblZpZGVvTm9kZS5nZXQoKSkpCi0gICAgICAgICAgICBtZWRpYUVsZW1lbnQtPmV4 aXRGdWxsc2NyZWVuKCk7Ci0gICAgfSBlbHNlIHsKKyAgICBFbGVtZW50KiBlbGVtZW50ID0gc3Rh dGljX2Nhc3Q8RWxlbWVudCo+KGQtPm1fZnVsbHNjcmVlbk5vZGUuZ2V0KCkpOworICAgIGlmICgh ZWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChkLT5tX3dlYlNldHRpbmdzLT5mdWxs U2NyZWVuVmlkZW9DYXBhYmxlKCkgJiYgZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZp ZGVvVGFnKSkKKyAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KGVsZW1lbnQp LT5leGl0RnVsbHNjcmVlbigpOwogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICAgICAg aWYgKEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oZC0+bV9mdWxsc2Ny ZWVuVmlkZW9Ob2RlLmdldCgpKSkKLSAgICAgICAgICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndl YmtpdENhbmNlbEZ1bGxTY3JlZW4oKTsKKyAgICBlbHNlCisgICAgICAgIGVsZW1lbnQtPmRvY3Vt ZW50KCktPndlYmtpdENhbmNlbEZ1bGxTY3JlZW4oKTsKICNlbmRpZgotICAgIH0KICNlbmRpZgog fQogCkBAIC01NzQ0LDcgKzU3NDQsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjplbnRlckZ1bGxz Y3JlZW5Gb3JOb2RlKE5vZGUqIG5vZGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1tclBsYXll ci0+c2V0RnVsbHNjcmVlbldlYlBhZ2VDbGllbnQobV9jbGllbnQpOwotICAgIG1fZnVsbHNjcmVl blZpZGVvTm9kZSA9IG5vZGU7CisgICAgbV9mdWxsc2NyZWVuTm9kZSA9IG5vZGU7CiAgICAgbV9j bGllbnQtPmZ1bGxzY3JlZW5TdGFydChjb250ZXh0TmFtZSwgd2luZG93LCBtbXJQbGF5ZXItPmdl dFdpbmRvd1NjcmVlblJlY3QoKSk7CiAjZW5kaWYKIH0KQEAgLTU3NTIsOSArNTc1Miw5IEBAIHZv aWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbHNjcmVlbkZvck5vZGUoTm9kZSogbm9kZSkKIHZv aWQgV2ViUGFnZVByaXZhdGU6OmV4aXRGdWxsc2NyZWVuRm9yTm9kZShOb2RlKiBub2RlKQogewog I2lmIEVOQUJMRShWSURFTykKLSAgICBpZiAobV9mdWxsc2NyZWVuVmlkZW9Ob2RlLmdldCgpKSB7 CisgICAgaWYgKG1fZnVsbHNjcmVlbk5vZGUuZ2V0KCkpIHsKICAgICAgICAgbV9jbGllbnQtPmZ1 bGxzY3JlZW5TdG9wKCk7Ci0gICAgICAgIG1fZnVsbHNjcmVlblZpZGVvTm9kZSA9IDA7CisgICAg ICAgIG1fZnVsbHNjcmVlbk5vZGUgPSAwOwogICAgIH0KIAogICAgIGlmICghbm9kZSB8fCAhbm9k ZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSkKQEAgLTU3NzQsMjMgKzU3NzQsMTIg QEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKE5vZGUqIG5vZGUp CiB9CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0vLyBUT0RPOiBXZSBzaG91bGQgcmVt b3ZlIHRoaXMgaGVscGVyIGNsYXNzIHdoZW4gd2UgZGVjaWRlIHRvIHN1cHBvcnQgYWxsIGVsZW1l bnRzLgotc3RhdGljIGJvb2wgY29udGFpbnNWaWRlb1RhZ3MoRWxlbWVudCogZWxlbWVudCkKLXsK LSAgICBmb3IgKE5vZGUqIG5vZGUgPSBlbGVtZW50LT5maXJzdENoaWxkKCk7IG5vZGU7IG5vZGUg PSBOb2RlVHJhdmVyc2FsOjpuZXh0KG5vZGUsIGVsZW1lbnQpKSB7Ci0gICAgICAgIGlmIChub2Rl LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKQotICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogdm9pZCBXZWJQYWdlUHJpdmF0ZTo6 ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50KQogewogI2lmIEVOQUJM RShWSURFTykKLSAgICAvLyBUT0RPOiBXZSBzaG91bGQgbm90IGNoZWNrIHZpZGVvIHRhZyB3aGVu IHdlIGRlY2lkZSB0byBzdXBwb3J0IGFsbCBlbGVtZW50cy4KLSAgICBpZiAoIWVsZW1lbnQgfHwg KCFlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpICYmICFjb250YWluc1Zp ZGVvVGFncyhlbGVtZW50KSkpCisgICAgaWYgKCFlbGVtZW50KQogICAgICAgICByZXR1cm47Ci0g ICAgaWYgKG1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSkgeworICAgIGlm IChtX3dlYlNldHRpbmdzLT5mdWxsU2NyZWVuVmlkZW9DYXBhYmxlKCkgJiYgZWxlbWVudC0+aGFz VGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSkgewogICAgICAgICAvLyBUaGUgQnJvd3NlciBj aHJvbWUgaGFzIGl0cyBvd24gZnVsbHNjcmVlbiB2aWRlbyB3aWRnZXQgaXQgd2FudHMgdG8KICAg ICAgICAgLy8gdXNlLCBhbmQgdGhpcyBpcyBhIHZpZGVvIGVsZW1lbnQuIFRoZSBvbmx5IHJlYXNv biB0aGF0CiAgICAgICAgIC8vIHdlYmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KCkg YW5kCkBAIC01ODE3LDcgKzU4MDYsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjplbnRlckZ1bGxT Y3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgICAgIC8vIEphdmFzY3JpcHQg Y2FsbCBpcyBvZnRlbiBtYWRlIG9uIGEgZGl2IGVsZW1lbnQuCiAgICAgICAgIC8vIFRoaXMgaXMg d2hlcmUgd2Ugd291bGQgaGlkZSB0aGUgYnJvd3NlcidzIGNocm9tZSBpZiB3ZSB3YW50ZWQgdG8u CiAgICAgICAgIGNsaWVudCgpLT5mdWxsc2NyZWVuU3RhcnQoKTsKLSAgICAgICAgbV9mdWxsc2Ny ZWVuVmlkZW9Ob2RlID0gZWxlbWVudDsKKyAgICAgICAgbV9mdWxsc2NyZWVuTm9kZSA9IGVsZW1l bnQ7CiAgICAgfQogI2VuZGlmCiB9CkBAIC01ODI1LDE3ICs1ODE0LDE2IEBAIHZvaWQgV2ViUGFn ZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKIHZv aWQgV2ViUGFnZVByaXZhdGU6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KiBlbGVt ZW50KQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICAvLyBUT0RPOiBXZSBzaG91bGQgbm90IGNo ZWNrIHZpZGVvIHRhZyB3aGVuIHdlIGRlY2lkZSB0byBzdXBwb3J0IGFsbCBlbGVtZW50cy4KLSAg ICBpZiAoIWVsZW1lbnQgfHwgKCFlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9U YWcpICYmICFjb250YWluc1ZpZGVvVGFncyhlbGVtZW50KSkpCisgICAgaWYgKCFlbGVtZW50KQog ICAgICAgICByZXR1cm47Ci0gICAgaWYgKG1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0Nh cGFibGUoKSkgeworICAgIGlmIChtX3dlYlNldHRpbmdzLT5mdWxsU2NyZWVuVmlkZW9DYXBhYmxl KCkgJiYgZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OnZpZGVvVGFnKSkgewogICAgICAg ICAvLyBUaGUgQnJvd3NlciBjaHJvbWUgaGFzIGl0cyBvd24gZnVsbHNjcmVlbiB2aWRlbyB3aWRn ZXQuCiAgICAgICAgIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShlbGVtZW50KTsKICAgICB9IGVsc2Ug ewogICAgICAgICAvLyBUaGlzIGlzIHdoZXJlIHdlIHdvdWxkIHJlc3RvcmUgdGhlIGJyb3dzZXIn cyBjaHJvbWUKICAgICAgICAgLy8gaWYgaGlkZGVuIGFib3ZlLgogICAgICAgICBjbGllbnQoKS0+ ZnVsbHNjcmVlblN0b3AoKTsKLSAgICAgICAgbV9mdWxsc2NyZWVuVmlkZW9Ob2RlID0gMDsKKyAg ICAgICAgbV9mdWxsc2NyZWVuTm9kZSA9IDA7CiAgICAgfQogI2VuZGlmCiB9CkBAIC01ODQ1LDE0 ICs1ODMzLDE0IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmFkanVzdEZ1bGxTY3JlZW5FbGVtZW50 RGltZW5zaW9uc0lmTmVlZGVkKCkKIHsKICAgICAvLyBJZiB3ZSBhcmUgaW4gZnVsbHNjcmVlbiB2 aWRlbyBtb2RlLCBhbmQgd2UgY2hhbmdlIHRoZSBGcmFtZVZpZXc6OnZpZXdwb3J0UmVjdCwKICAg ICAvLyB3ZSBuZWVkIHRvIGFkanVzdCB0aGUgbWVkaWEgY29udGFpbmVyIHRvIHRoZSBuZXcgc2l6 ZS4KLSAgICBpZiAoIW1fZnVsbHNjcmVlblZpZGVvTm9kZSB8fCAhbV9mdWxsc2NyZWVuVmlkZW9O b2RlLT5yZW5kZXJlcigpCi0gICAgICAgIHx8ICFtX2Z1bGxzY3JlZW5WaWRlb05vZGUtPmRvY3Vt ZW50KCkgfHwgIW1fZnVsbHNjcmVlblZpZGVvTm9kZS0+ZG9jdW1lbnQoKS0+ZnVsbFNjcmVlblJl bmRlcmVyKCkpCisgICAgaWYgKCFtX2Z1bGxzY3JlZW5Ob2RlIHx8ICFtX2Z1bGxzY3JlZW5Ob2Rl LT5yZW5kZXJlcigpCisgICAgICAgIHx8ICFtX2Z1bGxzY3JlZW5Ob2RlLT5kb2N1bWVudCgpIHx8 ICFtX2Z1bGxzY3JlZW5Ob2RlLT5kb2N1bWVudCgpLT5mdWxsU2NyZWVuUmVuZGVyZXIoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgQVNTRVJUKG1fZnVsbHNjcmVlblZpZGVvTm9kZS0+aXNFbGVt ZW50Tm9kZSgpKTsKLSAgICBBU1NFUlQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG1fZnVsbHNjcmVl blZpZGVvTm9kZS5nZXQoKSktPmlzTWVkaWFFbGVtZW50KCkpOworICAgIEFTU0VSVChtX2Z1bGxz Y3JlZW5Ob2RlLT5pc0VsZW1lbnROb2RlKCkpOworICAgIEFTU0VSVChzdGF0aWNfY2FzdDxFbGVt ZW50Kj4obV9mdWxsc2NyZWVuTm9kZS5nZXQoKSktPmlzTWVkaWFFbGVtZW50KCkpOwogCi0gICAg RG9jdW1lbnQqIGRvY3VtZW50ID0gbV9mdWxsc2NyZWVuVmlkZW9Ob2RlLT5kb2N1bWVudCgpOwor ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG1fZnVsbHNjcmVlbk5vZGUtPmRvY3VtZW50KCk7CiAg ICAgUmVuZGVyU3R5bGUqIGZ1bGxTY3JlZW5TdHlsZSA9IGRvY3VtZW50LT5mdWxsU2NyZWVuUmVu ZGVyZXIoKS0+c3R5bGUoKTsKICAgICBBU1NFUlQoZnVsbFNjcmVlblN0eWxlKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKaW5kZXggMzAzMzViOGQxMWNiMThkYWFm MDJmYTI3ZGNmMGVkOTBlNzlkNjM3Ni4uNmY3ZTM4NzkyN2UyNDFiOGE1ZDBjZWQ5MDQ5NDE2Y2Mz YjEyOTkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC01 ODIsNyArNTgyLDcgQEAgcHVibGljOgogCiAgICAgaW50IG1fcGVuZGluZ09yaWVudGF0aW9uOwog Ci0gICAgUmVmUHRyPFdlYkNvcmU6Ok5vZGU+IG1fZnVsbHNjcmVlblZpZGVvTm9kZTsKKyAgICBS ZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9mdWxsc2NyZWVuTm9kZTsKICAgICBSZWZQdHI8V2ViQ29y ZTo6UGx1Z2luVmlldz4gbV9mdWxsU2NyZWVuUGx1Z2luVmlldzsKIAogICAgIHR5cGVkZWYgSGFz aE1hcDxjb25zdCBXZWJDb3JlOjpGcmFtZSosIEJhY2tpbmdTdG9yZUNsaWVudCo+IEJhY2tpbmdT dG9yZUNsaWVudEZvckZyYW1lTWFwOwo= 186995 2013-02-06 23:06:34 -0800 2013-02-07 18:24:55 -0800 Patch bug-108314-20130207150308.patch text/plain 9073 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBjNzlhMGU2M2M3NjA1NGM2NTkwOGM2YjliZjUzOTc1ZGM2NTZhNDU4Li43MDhhZjIwYjEw MDc5MjAxY2NlNTdhODQwNDc3ZDhmOWEzNGUwZGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0zMCAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgbm9uLXZpZGVv IGVsZW1lbnQgZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 b25pbyBHb21lcy4KKworICAgICAgICBXZWJraXQgc3VwcG9ydCBub24tdmlkZW8gZWxlbWVudCAo bGlrZSBkaXYpIHRvIGVudGVyL2V4aXQKKyAgICAgICAgZnVsbHNjcmVlbi4gV2Ugc2hvdWxkIHBh c3MgdGhpcyBjYXBhYmlsaXR5IGluIGJsYWNrYmVycnkgcG9ydGluZy4KKworICAgICAgICBSSU0g UFIgMjU2MzcwLCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IE1heCBGZWlsLgorCisgICAgICAgICog QXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpu b3RpZnlGdWxsU2NyZWVuVmlkZW9FeGl0ZWQpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVs ZW1lbnQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6ZXhp dEZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKwogMjAxMi0xMi0yMyAgSmFrb2IgUGV0c292aXRzICA8 anBldHNvdml0c0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBTcGVjaWZ5IHRpbGUg dXNhZ2UgZW51bSBmb3IgYmFja2luZ3N0b3JlIHRpbGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggY2VkMDQ5Mzg0MmVkZmMwZGQ1NTFlY2Y5YTBhN2ZlMThl NWEzZGM3YS4uMWM5YWVmYWI2N2MzNzY0YjhmODk0MzIwYmVmMjAxZmNlNjE0NjRmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC00MjIsNyArNDIyLDcgQEAg V2ViUGFnZVByaXZhdGU6OldlYlBhZ2VQcml2YXRlKFdlYlBhZ2UqIHdlYlBhZ2UsIFdlYlBhZ2VD bGllbnQqIGNsaWVudCwgY29uc3QgSW4KICAgICAsIG1fc3VzcGVuZFJvb3RMYXllckNvbW1pdChm YWxzZSkKICNlbmRpZgogICAgICwgbV9wZW5kaW5nT3JpZW50YXRpb24oLTEpCi0gICAgLCBtX2Z1 bGxzY3JlZW5WaWRlb05vZGUoMCkKKyAgICAsIG1fZnVsbHNjcmVlbk5vZGUoMCkKICAgICAsIG1f aGFzSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMoZmFsc2UpCiAgICAgLCBtX3VwZGF0ZURlbGVnYXRl ZE92ZXJsYXlzRGlzcGF0Y2hlZChmYWxzZSkKICAgICAsIG1fZW5hYmxlUW54SmF2YVNjcmlwdE9i amVjdChmYWxzZSkKQEAgLTE0NzcsOCArMTQ3Nyw4IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnVw ZGF0ZVZpZXdwb3J0U2l6ZShib29sIHNldEZpeGVkUmVwb3J0ZWRTaXplLCBib29sIHNlbmRSZXNp CiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgICAgICAvLyBJZiB3ZSBhcmUgaW4gZnVs bHNjcmVlbiB2aWRlbyBtb2RlLCBhbmQgd2UgY2hhbmdlIHRoZSBGcmFtZVZpZXc6OnZpZXdwb3J0 UmVjdCwKICAgICAgICAgLy8gd2UgbmVlZCB0byBhZGp1c3QgdGhlIG1lZGlhIGNvbnRhaW5lciB0 byB0aGUgbmV3IHNpemUuCi0gICAgICAgIGlmIChtX2Z1bGxzY3JlZW5WaWRlb05vZGUpIHsKLSAg ICAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG1fZnVsbHNjcmVlblZpZGVvTm9kZS0+ZG9j dW1lbnQoKTsKKyAgICAgICAgaWYgKG1fZnVsbHNjcmVlbk5vZGUpIHsKKyAgICAgICAgICAgIERv Y3VtZW50KiBkb2N1bWVudCA9IG1fZnVsbHNjcmVlbk5vZGUtPmRvY3VtZW50KCk7CiAgICAgICAg ICAgICBBU1NFUlQoZG9jdW1lbnQpOwogICAgICAgICAgICAgQVNTRVJUKGRvY3VtZW50LT5mdWxs U2NyZWVuUmVuZGVyZXIoKSk7CiAKQEAgLTI1MDAsNyArMjUwMCw3IEBAIHZvaWQgV2ViUGFnZVBy aXZhdGU6OmNsZWFyRG9jdW1lbnREYXRhKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudEdvaW5nQXdh eSkKICAgICBpZiAobm9kZVVuZGVyRmF0RmluZ2VyICYmIG5vZGVVbmRlckZhdEZpbmdlci0+ZG9j dW1lbnQoKSA9PSBkb2N1bWVudEdvaW5nQXdheSkKICAgICAgICAgbV90b3VjaEV2ZW50SGFuZGxl ci0+cmVzZXRMYXN0RmF0RmluZ2Vyc1Jlc3VsdCgpOwogCi0gICAgLy8gTk9URTogbV9mdWxsc2Ny ZWVuVmlkZW9Ob2RlLCBtX2Z1bGxTY3JlZW5QbHVnaW5WaWV3IGFuZCBtX3BsdWdpblZpZXdzCisg ICAgLy8gTk9URTogbV9mdWxsc2NyZWVuTm9kZSwgbV9mdWxsU2NyZWVuUGx1Z2luVmlldyBhbmQg bV9wbHVnaW5WaWV3cwogICAgIC8vIGFyZSBjbGVhcmVkIGluIG90aGVyIG1ldGhvZHMgYWxyZWFk eS4KIH0KIApAQCAtMzgyOCw3ICszODI4LDcgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0Vmll d3BvcnRTaXplKGNvbnN0IEludFNpemUmIHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUKICAg ICAvLyBpZiBuZWVkZWQuCiAgICAgLy8gRklYTUU6IFRoZSBjYWNoZWQgdmFsdWVzIG1pZ2h0IGdl dCBpbXByZWNpc2UgaWYgdXNlciBoYXZlIHJvdGF0ZWQgdGhlCiAgICAgLy8gZGV2aWNlIHdoaWxl IGluIGZ1bGxzY3JlZW4uCi0gICAgaWYgKG1fc2NhbGVCZWZvcmVGdWxsU2NyZWVuID4gMCAmJiAh bV9mdWxsc2NyZWVuVmlkZW9Ob2RlKSB7CisgICAgaWYgKG1fc2NhbGVCZWZvcmVGdWxsU2NyZWVu ID4gMCAmJiAhbV9mdWxsc2NyZWVuTm9kZSkgewogICAgICAgICAvLyBSZXN0b3JlIHRoZSBzY2Fs ZSB3aGVuIGxlYXZpbmcgZnVsbHNjcmVlbi4gV2UgY2FuJ3QgdXNlIFRyYW5zZm9ybWF0aW9uTWF0 cml4OjpzY2FsZShkb3VibGUpIGhlcmUsCiAgICAgICAgIC8vIGFzIGl0IHdpbGwgbXVsdGlwbHkg dGhlIHNjYWxlIHJhdGhlciB0aGFuIHNldCB0aGUgc2NhbGUuCiAgICAgICAgIC8vIEZJWE1FOiBX ZSBjYW4gcmVmYWN0b3IgdGhpcyBpbnRvIHNldEN1cnJlbnRTY2FsZShkb3VibGUpIGlmIGl0IGlz IHVzZWZ1bCBpbiB0aGUgZnV0dXJlLgpAQCAtNTExOSwxNSArNTExOSwxNSBAQCB2b2lkIFdlYlBh Z2U6Om5vdGlmeUZ1bGxTY3JlZW5WaWRlb0V4aXRlZChib29sIGRvbmUpCiB7CiAgICAgVU5VU0VE X1BBUkFNKGRvbmUpOwogI2lmIEVOQUJMRShWSURFTykKLSAgICBpZiAoZC0+bV93ZWJTZXR0aW5n cy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJsZSgpKSB7Ci0gICAgICAgIGlmIChIVE1MTWVkaWFFbGVt ZW50KiBtZWRpYUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50Kj4oZC0+bV9m dWxsc2NyZWVuVmlkZW9Ob2RlLmdldCgpKSkKLSAgICAgICAgICAgIG1lZGlhRWxlbWVudC0+ZXhp dEZ1bGxzY3JlZW4oKTsKLSAgICB9IGVsc2UgeworICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0Vs ZW1lbnQoZC0+bV9mdWxsc2NyZWVuTm9kZS5nZXQoKSk7CisgICAgaWYgKCFlbGVtZW50KQorICAg ICAgICByZXR1cm47CisgICAgaWYgKGQtPm1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0Nh cGFibGUoKSAmJiBlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKQorICAg ICAgICBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50Kj4oZWxlbWVudCktPmV4aXRGdWxsc2Ny ZWVuKCk7CiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQotICAgICAgICBpZiAoRWxlbWVudCog ZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihkLT5tX2Z1bGxzY3JlZW5WaWRlb05vZGUu Z2V0KCkpKQotICAgICAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0Q2FuY2VsRnVs bFNjcmVlbigpOworICAgIGVsc2UKKyAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0 Q2FuY2VsRnVsbFNjcmVlbigpOwogI2VuZGlmCi0gICAgfQogI2VuZGlmCiB9CiAKQEAgLTU3NDQs NyArNTc0NCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbHNjcmVlbkZvck5vZGUo Tm9kZSogbm9kZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbW1yUGxheWVyLT5zZXRGdWxsc2Ny ZWVuV2ViUGFnZUNsaWVudChtX2NsaWVudCk7Ci0gICAgbV9mdWxsc2NyZWVuVmlkZW9Ob2RlID0g bm9kZTsKKyAgICBtX2Z1bGxzY3JlZW5Ob2RlID0gbm9kZTsKICAgICBtX2NsaWVudC0+ZnVsbHNj cmVlblN0YXJ0KGNvbnRleHROYW1lLCB3aW5kb3csIG1tclBsYXllci0+Z2V0V2luZG93U2NyZWVu UmVjdCgpKTsKICNlbmRpZgogfQpAQCAtNTc1Miw5ICs1NzUyLDkgQEAgdm9pZCBXZWJQYWdlUHJp dmF0ZTo6ZW50ZXJGdWxsc2NyZWVuRm9yTm9kZShOb2RlKiBub2RlKQogdm9pZCBXZWJQYWdlUHJp dmF0ZTo6ZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKE5vZGUqIG5vZGUpCiB7CiAjaWYgRU5BQkxFKFZJ REVPKQotICAgIGlmIChtX2Z1bGxzY3JlZW5WaWRlb05vZGUuZ2V0KCkpIHsKKyAgICBpZiAobV9m dWxsc2NyZWVuTm9kZS5nZXQoKSkgewogICAgICAgICBtX2NsaWVudC0+ZnVsbHNjcmVlblN0b3Ao KTsKLSAgICAgICAgbV9mdWxsc2NyZWVuVmlkZW9Ob2RlID0gMDsKKyAgICAgICAgbV9mdWxsc2Ny ZWVuTm9kZSA9IDA7CiAgICAgfQogCiAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5oYXNUYWdOYW1l KEhUTUxOYW1lczo6dmlkZW9UYWcpKQpAQCAtNTc3NCwyMyArNTc3NCwxMiBAQCB2b2lkIFdlYlBh Z2VQcml2YXRlOjpleGl0RnVsbHNjcmVlbkZvck5vZGUoTm9kZSogbm9kZSkKIH0KIAogI2lmIEVO QUJMRShGVUxMU0NSRUVOX0FQSSkKLS8vIFRPRE86IFdlIHNob3VsZCByZW1vdmUgdGhpcyBoZWxw ZXIgY2xhc3Mgd2hlbiB3ZSBkZWNpZGUgdG8gc3VwcG9ydCBhbGwgZWxlbWVudHMuCi1zdGF0aWMg Ym9vbCBjb250YWluc1ZpZGVvVGFncyhFbGVtZW50KiBlbGVtZW50KQotewotICAgIGZvciAoTm9k ZSogbm9kZSA9IGVsZW1lbnQtPmZpcnN0Q2hpbGQoKTsgbm9kZTsgbm9kZSA9IE5vZGVUcmF2ZXJz YWw6Om5leHQobm9kZSwgZWxlbWVudCkpIHsKLSAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUo SFRNTE5hbWVzOjp2aWRlb1RhZykpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0g ICAgcmV0dXJuIGZhbHNlOwotfQotCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjplbnRlckZ1bGxTY3Jl ZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAg IC8vIFRPRE86IFdlIHNob3VsZCBub3QgY2hlY2sgdmlkZW8gdGFnIHdoZW4gd2UgZGVjaWRlIHRv IHN1cHBvcnQgYWxsIGVsZW1lbnRzLgotICAgIGlmICghZWxlbWVudCB8fCAoIWVsZW1lbnQtPmhh c1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykgJiYgIWNvbnRhaW5zVmlkZW9UYWdzKGVsZW1l bnQpKSkKKyAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAobV93ZWJT ZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJsZSgpKSB7CisgICAgaWYgKG1fd2ViU2V0dGlu Z3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSAmJiBlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxO YW1lczo6dmlkZW9UYWcpKSB7CiAgICAgICAgIC8vIFRoZSBCcm93c2VyIGNocm9tZSBoYXMgaXRz IG93biBmdWxsc2NyZWVuIHZpZGVvIHdpZGdldCBpdCB3YW50cyB0bwogICAgICAgICAvLyB1c2Us IGFuZCB0aGlzIGlzIGEgdmlkZW8gZWxlbWVudC4gVGhlIG9ubHkgcmVhc29uIHRoYXQKICAgICAg ICAgLy8gd2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoKSBhbmQKQEAgLTU4MTcs NyArNTgwNiw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1l bnQoRWxlbWVudCogZWxlbWVudCkKICAgICAgICAgLy8gSmF2YXNjcmlwdCBjYWxsIGlzIG9mdGVu IG1hZGUgb24gYSBkaXYgZWxlbWVudC4KICAgICAgICAgLy8gVGhpcyBpcyB3aGVyZSB3ZSB3b3Vs ZCBoaWRlIHRoZSBicm93c2VyJ3MgY2hyb21lIGlmIHdlIHdhbnRlZCB0by4KICAgICAgICAgY2xp ZW50KCktPmZ1bGxzY3JlZW5TdGFydCgpOwotICAgICAgICBtX2Z1bGxzY3JlZW5WaWRlb05vZGUg PSBlbGVtZW50OworICAgICAgICBtX2Z1bGxzY3JlZW5Ob2RlID0gZWxlbWVudDsKICAgICB9CiAj ZW5kaWYKIH0KQEAgLTU4MjUsMTcgKzU4MTQsMTYgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZW50 ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50KQogdm9pZCBXZWJQYWdlUHJp dmF0ZTo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiB7CiAjaWYg RU5BQkxFKFZJREVPKQotICAgIC8vIFRPRE86IFdlIHNob3VsZCBub3QgY2hlY2sgdmlkZW8gdGFn IHdoZW4gd2UgZGVjaWRlIHRvIHN1cHBvcnQgYWxsIGVsZW1lbnRzLgotICAgIGlmICghZWxlbWVu dCB8fCAoIWVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykgJiYgIWNvbnRh aW5zVmlkZW9UYWdzKGVsZW1lbnQpKSkKKyAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVy bjsKLSAgICBpZiAobV93ZWJTZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJsZSgpKSB7Cisg ICAgaWYgKG1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSAmJiBlbGVtZW50 LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKSB7CiAgICAgICAgIC8vIFRoZSBCcm93 c2VyIGNocm9tZSBoYXMgaXRzIG93biBmdWxsc2NyZWVuIHZpZGVvIHdpZGdldC4KICAgICAgICAg ZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKGVsZW1lbnQpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8v IFRoaXMgaXMgd2hlcmUgd2Ugd291bGQgcmVzdG9yZSB0aGUgYnJvd3NlcidzIGNocm9tZQogICAg ICAgICAvLyBpZiBoaWRkZW4gYWJvdmUuCiAgICAgICAgIGNsaWVudCgpLT5mdWxsc2NyZWVuU3Rv cCgpOwotICAgICAgICBtX2Z1bGxzY3JlZW5WaWRlb05vZGUgPSAwOworICAgICAgICBtX2Z1bGxz Y3JlZW5Ob2RlID0gMDsKICAgICB9CiAjZW5kaWYKIH0KQEAgLTU4NDUsMTQgKzU4MzMsMTQgQEAg dm9pZCBXZWJQYWdlUHJpdmF0ZTo6YWRqdXN0RnVsbFNjcmVlbkVsZW1lbnREaW1lbnNpb25zSWZO ZWVkZWQoKQogewogICAgIC8vIElmIHdlIGFyZSBpbiBmdWxsc2NyZWVuIHZpZGVvIG1vZGUsIGFu ZCB3ZSBjaGFuZ2UgdGhlIEZyYW1lVmlldzo6dmlld3BvcnRSZWN0LAogICAgIC8vIHdlIG5lZWQg dG8gYWRqdXN0IHRoZSBtZWRpYSBjb250YWluZXIgdG8gdGhlIG5ldyBzaXplLgotICAgIGlmICgh bV9mdWxsc2NyZWVuVmlkZW9Ob2RlIHx8ICFtX2Z1bGxzY3JlZW5WaWRlb05vZGUtPnJlbmRlcmVy KCkKLSAgICAgICAgfHwgIW1fZnVsbHNjcmVlblZpZGVvTm9kZS0+ZG9jdW1lbnQoKSB8fCAhbV9m dWxsc2NyZWVuVmlkZW9Ob2RlLT5kb2N1bWVudCgpLT5mdWxsU2NyZWVuUmVuZGVyZXIoKSkKKyAg ICBpZiAoIW1fZnVsbHNjcmVlbk5vZGUgfHwgIW1fZnVsbHNjcmVlbk5vZGUtPnJlbmRlcmVyKCkK KyAgICAgICAgfHwgIW1fZnVsbHNjcmVlbk5vZGUtPmRvY3VtZW50KCkgfHwgIW1fZnVsbHNjcmVl bk5vZGUtPmRvY3VtZW50KCktPmZ1bGxTY3JlZW5SZW5kZXJlcigpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBBU1NFUlQobV9mdWxsc2NyZWVuVmlkZW9Ob2RlLT5pc0VsZW1lbnROb2RlKCkpOwot ICAgIEFTU0VSVChzdGF0aWNfY2FzdDxFbGVtZW50Kj4obV9mdWxsc2NyZWVuVmlkZW9Ob2RlLmdl dCgpKS0+aXNNZWRpYUVsZW1lbnQoKSk7CisgICAgQVNTRVJUKG1fZnVsbHNjcmVlbk5vZGUtPmlz RWxlbWVudE5vZGUoKSk7CisgICAgQVNTRVJUKHN0YXRpY19jYXN0PEVsZW1lbnQqPihtX2Z1bGxz Y3JlZW5Ob2RlLmdldCgpKS0+aXNNZWRpYUVsZW1lbnQoKSk7CiAKLSAgICBEb2N1bWVudCogZG9j dW1lbnQgPSBtX2Z1bGxzY3JlZW5WaWRlb05vZGUtPmRvY3VtZW50KCk7CisgICAgRG9jdW1lbnQq IGRvY3VtZW50ID0gbV9mdWxsc2NyZWVuTm9kZS0+ZG9jdW1lbnQoKTsKICAgICBSZW5kZXJTdHls ZSogZnVsbFNjcmVlblN0eWxlID0gZG9jdW1lbnQtPmZ1bGxTY3JlZW5SZW5kZXJlcigpLT5zdHls ZSgpOwogICAgIEFTU0VSVChmdWxsU2NyZWVuU3R5bGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlX3AuaAppbmRleCAzMDMzNWI4ZDExY2IxOGRhYWYwMmZhMjdkY2YwZWQ5 MGU3OWQ2Mzc2Li42ZjdlMzg3OTI3ZTI0MWI4YTVkMGNlZDkwNDk0MTZjYzNiMTI5OTJiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKQEAgLTU4Miw3ICs1ODIsNyBA QCBwdWJsaWM6CiAKICAgICBpbnQgbV9wZW5kaW5nT3JpZW50YXRpb247CiAKLSAgICBSZWZQdHI8 V2ViQ29yZTo6Tm9kZT4gbV9mdWxsc2NyZWVuVmlkZW9Ob2RlOworICAgIFJlZlB0cjxXZWJDb3Jl OjpOb2RlPiBtX2Z1bGxzY3JlZW5Ob2RlOwogICAgIFJlZlB0cjxXZWJDb3JlOjpQbHVnaW5WaWV3 PiBtX2Z1bGxTY3JlZW5QbHVnaW5WaWV3OwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPGNvbnN0IFdl YkNvcmU6OkZyYW1lKiwgQmFja2luZ1N0b3JlQ2xpZW50Kj4gQmFja2luZ1N0b3JlQ2xpZW50Rm9y RnJhbWVNYXA7Cg== 187213 2013-02-07 18:25:01 -0800 2013-02-07 19:03:15 -0800 Patch bug-108314-20130208102134.patch text/plain 9082 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxMjQ4YjlhNjVhMjFmYTNiZDQ1OWI3MDk0MTVhZTVlYTUwN2I2MmZmLi5hMjM3NTMxNTZj NTkxZWYxMjhiYjU5M2Q0NzJhMDlkOGY1OGU4ZGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMy0wMi0wNyAgTWFyeSBXdSAgPG1hcnkud3VAdG9y Y2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBFbmFibGUgbm9uLXZpZGVv IGVsZW1lbnQgZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 b25pbyBHb21lcy4KKworICAgICAgICBXZWJraXQgc3VwcG9ydCBub24tdmlkZW8gZWxlbWVudCAo bGlrZSBkaXYpIHRvIGVudGVyL2V4aXQKKyAgICAgICAgZnVsbHNjcmVlbi4gV2Ugc2hvdWxkIHBh c3MgdGhpcyBjYXBhYmlsaXR5IGluIGJsYWNrYmVycnkgcG9ydGluZy4KKworICAgICAgICBSSU0g UFIgMjU2MzcwLCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IE1heCBGZWlsLgorCisgICAgICAgICog QXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJp dmF0ZTo6V2ViUGFnZVByaXZhdGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6Y2xlYXJEb2N1bWVudERhdGEpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpXZWJQYWdlUHJpdmF0ZTo6c2V0Vmlld3BvcnRTaXplKToKKyAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6V2ViUGFnZTo6bm90aWZ5RnVsbFNjcmVlblZpZGVvRXhpdGVkKToKKyAgICAg ICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbHNjcmVlbkZv ck5vZGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6ZXhp dEZ1bGxzY3JlZW5Gb3JOb2RlKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmV4aXRGdWxsU2Ny ZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2 YXRlOjphZGp1c3RGdWxsU2NyZWVuRWxlbWVudERpbWVuc2lvbnNJZk5lZWRlZCk6CisgICAgICAg ICogQXBpL1dlYlBhZ2VfcC5oOgorICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgorCiAyMDEzLTAy LTA3ICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5jb20+CiAKICAgICAgICAgW0Js YWNrQmVycnldIEZpeCBhbGwgZmxpY2tlciBjYXVzZWQgYnkgZW1wdHkvaW5jb21wbGV0ZSBnZW9t ZXRyaWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggNTFm NDU3NGNlNTlkYjg0MzM2Y2U2ZTgxMGQxNmE5MDcyYjRkOGRmOC4uNzA5ZmU1MDlmMDBmZjNlNzY4 ZjgyZDc0YjQ1YjkyMTUwOWFkMmJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuY3BwCkBAIC00MjIsNyArNDIyLDcgQEAgV2ViUGFnZVByaXZhdGU6OldlYlBhZ2VQcml2 YXRlKFdlYlBhZ2UqIHdlYlBhZ2UsIFdlYlBhZ2VDbGllbnQqIGNsaWVudCwgY29uc3QgSW4KICAg ICAsIG1fc3VzcGVuZFJvb3RMYXllckNvbW1pdChmYWxzZSkKICNlbmRpZgogICAgICwgbV9wZW5k aW5nT3JpZW50YXRpb24oLTEpCi0gICAgLCBtX2Z1bGxzY3JlZW5WaWRlb05vZGUoMCkKKyAgICAs IG1fZnVsbHNjcmVlbk5vZGUoMCkKICAgICAsIG1faGFzSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMo ZmFsc2UpCiAgICAgLCBtX3VwZGF0ZURlbGVnYXRlZE92ZXJsYXlzRGlzcGF0Y2hlZChmYWxzZSkK ICAgICAsIG1fZW5hYmxlUW54SmF2YVNjcmlwdE9iamVjdChmYWxzZSkKQEAgLTI1MDMsNyArMjUw Myw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmNsZWFyRG9jdW1lbnREYXRhKGNvbnN0IERvY3Vt ZW50KiBkb2N1bWVudEdvaW5nQXdheSkKICAgICBpZiAobm9kZVVuZGVyRmF0RmluZ2VyICYmIG5v ZGVVbmRlckZhdEZpbmdlci0+ZG9jdW1lbnQoKSA9PSBkb2N1bWVudEdvaW5nQXdheSkKICAgICAg ICAgbV90b3VjaEV2ZW50SGFuZGxlci0+cmVzZXRMYXN0RmF0RmluZ2Vyc1Jlc3VsdCgpOwogCi0g ICAgLy8gTk9URTogbV9mdWxsc2NyZWVuVmlkZW9Ob2RlLCBtX2Z1bGxTY3JlZW5QbHVnaW5WaWV3 IGFuZCBtX3BsdWdpblZpZXdzCisgICAgLy8gTk9URTogbV9mdWxsc2NyZWVuTm9kZSwgbV9mdWxs U2NyZWVuUGx1Z2luVmlldyBhbmQgbV9wbHVnaW5WaWV3cwogICAgIC8vIGFyZSBjbGVhcmVkIGlu IG90aGVyIG1ldGhvZHMgYWxyZWFkeS4KIH0KIApAQCAtMzgzOCw3ICszODM4LDcgQEAgdm9pZCBX ZWJQYWdlUHJpdmF0ZTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHRyYW5zZm9ybWVk QWN0dWFsVmlzaWJsZVNpemUKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpICYmIEVOQUJMRShW SURFTykKICAgICAvLyBXaGVuIGxlYXZpbmcgZnVsbHNjcmVlbiBtb2RlLCByZXN0b3JlIHRoZSBz Y2FsZSBhbmQgc2Nyb2xsIHBvc2l0aW9uIGlmIG5lZWRlZC4KICAgICAvLyBXZSBhbHNvIG5lZWQg dG8gbWFrZSBzdXJlIHRoZSBzY2FsZSBhbmQgc2Nyb2xsIHBvc2l0aW9uIHdvbid0IGNhdXNlIG92 ZXIgc2NhbGUgb3Igb3ZlciBzY3JvbGwuCi0gICAgaWYgKG1fc2NhbGVCZWZvcmVGdWxsU2NyZWVu ID4gMCAmJiAhbV9mdWxsc2NyZWVuVmlkZW9Ob2RlKSB7CisgICAgaWYgKG1fc2NhbGVCZWZvcmVG dWxsU2NyZWVuID4gMCAmJiAhbV9mdWxsc2NyZWVuTm9kZSkgewogICAgICAgICAvLyBSZXN0b3Jl IHRoZSBzY2FsZSB3aGVuIGxlYXZpbmcgZnVsbHNjcmVlbi4gV2UgY2FuJ3QgdXNlIFRyYW5zZm9y bWF0aW9uTWF0cml4OjpzY2FsZShkb3VibGUpIGhlcmUsCiAgICAgICAgIC8vIGFzIGl0IHdpbGwg bXVsdGlwbHkgdGhlIHNjYWxlIHJhdGhlciB0aGFuIHNldCB0aGUgc2NhbGUuCiAgICAgICAgIC8v IEZJWE1FOiBXZSBjYW4gcmVmYWN0b3IgdGhpcyBpbnRvIHNldEN1cnJlbnRTY2FsZShkb3VibGUp IGlmIGl0IGlzIHVzZWZ1bCBpbiB0aGUgZnV0dXJlLgpAQCAtNTE1NywxNSArNTE1NywxNSBAQCB2 b2lkIFdlYlBhZ2U6Om5vdGlmeUZ1bGxTY3JlZW5WaWRlb0V4aXRlZChib29sIGRvbmUpCiB7CiAg ICAgVU5VU0VEX1BBUkFNKGRvbmUpOwogI2lmIEVOQUJMRShWSURFTykKLSAgICBpZiAoZC0+bV93 ZWJTZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJsZSgpKSB7Ci0gICAgICAgIGlmIChIVE1M TWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50 Kj4oZC0+bV9mdWxsc2NyZWVuVmlkZW9Ob2RlLmdldCgpKSkKLSAgICAgICAgICAgIG1lZGlhRWxl bWVudC0+ZXhpdEZ1bGxzY3JlZW4oKTsKLSAgICB9IGVsc2UgeworICAgIEVsZW1lbnQqIGVsZW1l bnQgPSB0b0VsZW1lbnQoZC0+bV9mdWxsc2NyZWVuTm9kZS5nZXQoKSk7CisgICAgaWYgKCFlbGVt ZW50KQorICAgICAgICByZXR1cm47CisgICAgaWYgKGQtPm1fd2ViU2V0dGluZ3MtPmZ1bGxTY3Jl ZW5WaWRlb0NhcGFibGUoKSAmJiBlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9U YWcpKQorICAgICAgICBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50Kj4oZWxlbWVudCktPmV4 aXRGdWxsc2NyZWVuKCk7CiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQotICAgICAgICBpZiAo RWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihkLT5tX2Z1bGxzY3JlZW5W aWRlb05vZGUuZ2V0KCkpKQotICAgICAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0 Q2FuY2VsRnVsbFNjcmVlbigpOworICAgIGVsc2UKKyAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQo KS0+d2Via2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogI2VuZGlmCi0gICAgfQogI2VuZGlmCiB9CiAK QEAgLTU3ODEsNyArNTc4MSw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbHNjcmVl bkZvck5vZGUoTm9kZSogbm9kZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbW1yUGxheWVyLT5z ZXRGdWxsc2NyZWVuV2ViUGFnZUNsaWVudChtX2NsaWVudCk7Ci0gICAgbV9mdWxsc2NyZWVuVmlk ZW9Ob2RlID0gbm9kZTsKKyAgICBtX2Z1bGxzY3JlZW5Ob2RlID0gbm9kZTsKICAgICBtX2NsaWVu dC0+ZnVsbHNjcmVlblN0YXJ0KGNvbnRleHROYW1lLCB3aW5kb3csIG1tclBsYXllci0+Z2V0V2lu ZG93U2NyZWVuUmVjdCgpKTsKICNlbmRpZgogfQpAQCAtNTc4OSw5ICs1Nzg5LDkgQEAgdm9pZCBX ZWJQYWdlUHJpdmF0ZTo6ZW50ZXJGdWxsc2NyZWVuRm9yTm9kZShOb2RlKiBub2RlKQogdm9pZCBX ZWJQYWdlUHJpdmF0ZTo6ZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKE5vZGUqIG5vZGUpCiB7CiAjaWYg RU5BQkxFKFZJREVPKQotICAgIGlmIChtX2Z1bGxzY3JlZW5WaWRlb05vZGUuZ2V0KCkpIHsKKyAg ICBpZiAobV9mdWxsc2NyZWVuTm9kZS5nZXQoKSkgewogICAgICAgICBtX2NsaWVudC0+ZnVsbHNj cmVlblN0b3AoKTsKLSAgICAgICAgbV9mdWxsc2NyZWVuVmlkZW9Ob2RlID0gMDsKKyAgICAgICAg bV9mdWxsc2NyZWVuTm9kZSA9IDA7CiAgICAgfQogCiAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKQpAQCAtNTgxMSwyMyArNTgxMSwxMiBAQCB2 b2lkIFdlYlBhZ2VQcml2YXRlOjpleGl0RnVsbHNjcmVlbkZvck5vZGUoTm9kZSogbm9kZSkKIH0K IAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLS8vIFRPRE86IFdlIHNob3VsZCByZW1vdmUg dGhpcyBoZWxwZXIgY2xhc3Mgd2hlbiB3ZSBkZWNpZGUgdG8gc3VwcG9ydCBhbGwgZWxlbWVudHMu Ci1zdGF0aWMgYm9vbCBjb250YWluc1ZpZGVvVGFncyhFbGVtZW50KiBlbGVtZW50KQotewotICAg IGZvciAoTm9kZSogbm9kZSA9IGVsZW1lbnQtPmZpcnN0Q2hpbGQoKTsgbm9kZTsgbm9kZSA9IE5v ZGVUcmF2ZXJzYWw6Om5leHQobm9kZSwgZWxlbWVudCkpIHsKLSAgICAgICAgaWYgKG5vZGUtPmhh c1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjplbnRl ckZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiB7CiAjaWYgRU5BQkxFKFZJ REVPKQotICAgIC8vIFRPRE86IFdlIHNob3VsZCBub3QgY2hlY2sgdmlkZW8gdGFnIHdoZW4gd2Ug ZGVjaWRlIHRvIHN1cHBvcnQgYWxsIGVsZW1lbnRzLgotICAgIGlmICghZWxlbWVudCB8fCAoIWVs ZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykgJiYgIWNvbnRhaW5zVmlkZW9U YWdzKGVsZW1lbnQpKSkKKyAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKLSAgICBp ZiAobV93ZWJTZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJsZSgpKSB7CisgICAgaWYgKG1f d2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSAmJiBlbGVtZW50LT5oYXNUYWdO YW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKSB7CiAgICAgICAgIC8vIFRoZSBCcm93c2VyIGNocm9t ZSBoYXMgaXRzIG93biBmdWxsc2NyZWVuIHZpZGVvIHdpZGdldCBpdCB3YW50cyB0bwogICAgICAg ICAvLyB1c2UsIGFuZCB0aGlzIGlzIGEgdmlkZW8gZWxlbWVudC4gVGhlIG9ubHkgcmVhc29uIHRo YXQKICAgICAgICAgLy8gd2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoKSBhbmQK QEAgLTU4NTksNyArNTg0OCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmVudGVyRnVsbFNjcmVl bkZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKICAgICAgICAgLy8gSmF2YXNjcmlwdCBjYWxs IGlzIG9mdGVuIG1hZGUgb24gYSBkaXYgZWxlbWVudC4KICAgICAgICAgLy8gVGhpcyBpcyB3aGVy ZSB3ZSB3b3VsZCBoaWRlIHRoZSBicm93c2VyJ3MgY2hyb21lIGlmIHdlIHdhbnRlZCB0by4KICAg ICAgICAgY2xpZW50KCktPmZ1bGxzY3JlZW5TdGFydCgpOwotICAgICAgICBtX2Z1bGxzY3JlZW5W aWRlb05vZGUgPSBlbGVtZW50OworICAgICAgICBtX2Z1bGxzY3JlZW5Ob2RlID0gZWxlbWVudDsK ICAgICB9CiAjZW5kaWYKIH0KQEAgLTU4NjcsMTcgKzU4NTYsMTYgQEAgdm9pZCBXZWJQYWdlUHJp dmF0ZTo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50KQogdm9pZCBX ZWJQYWdlUHJpdmF0ZTo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQp CiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIC8vIFRPRE86IFdlIHNob3VsZCBub3QgY2hlY2sg dmlkZW8gdGFnIHdoZW4gd2UgZGVjaWRlIHRvIHN1cHBvcnQgYWxsIGVsZW1lbnRzLgotICAgIGlm ICghZWxlbWVudCB8fCAoIWVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2aWRlb1RhZykg JiYgIWNvbnRhaW5zVmlkZW9UYWdzKGVsZW1lbnQpKSkKKyAgICBpZiAoIWVsZW1lbnQpCiAgICAg ICAgIHJldHVybjsKLSAgICBpZiAobV93ZWJTZXR0aW5ncy0+ZnVsbFNjcmVlblZpZGVvQ2FwYWJs ZSgpKSB7CisgICAgaWYgKG1fd2ViU2V0dGluZ3MtPmZ1bGxTY3JlZW5WaWRlb0NhcGFibGUoKSAm JiBlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6dmlkZW9UYWcpKSB7CiAgICAgICAgIC8v IFRoZSBCcm93c2VyIGNocm9tZSBoYXMgaXRzIG93biBmdWxsc2NyZWVuIHZpZGVvIHdpZGdldC4K ICAgICAgICAgZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKGVsZW1lbnQpOwogICAgIH0gZWxzZSB7CiAg ICAgICAgIC8vIFRoaXMgaXMgd2hlcmUgd2Ugd291bGQgcmVzdG9yZSB0aGUgYnJvd3NlcidzIGNo cm9tZQogICAgICAgICAvLyBpZiBoaWRkZW4gYWJvdmUuCiAgICAgICAgIGNsaWVudCgpLT5mdWxs c2NyZWVuU3RvcCgpOwotICAgICAgICBtX2Z1bGxzY3JlZW5WaWRlb05vZGUgPSAwOworICAgICAg ICBtX2Z1bGxzY3JlZW5Ob2RlID0gMDsKICAgICB9CiAjZW5kaWYKIH0KQEAgLTU4ODcsMTQgKzU4 NzUsMTQgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6YWRqdXN0RnVsbFNjcmVlbkVsZW1lbnREaW1l bnNpb25zSWZOZWVkZWQoKQogewogICAgIC8vIElmIHdlIGFyZSBpbiBmdWxsc2NyZWVuIHZpZGVv IG1vZGUsIGFuZCB3ZSBjaGFuZ2UgdGhlIEZyYW1lVmlldzo6dmlld3BvcnRSZWN0LAogICAgIC8v IHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBtZWRpYSBjb250YWluZXIgdG8gdGhlIG5ldyBzaXplLgot ICAgIGlmICghbV9mdWxsc2NyZWVuVmlkZW9Ob2RlIHx8ICFtX2Z1bGxzY3JlZW5WaWRlb05vZGUt PnJlbmRlcmVyKCkKLSAgICAgICAgfHwgIW1fZnVsbHNjcmVlblZpZGVvTm9kZS0+ZG9jdW1lbnQo KSB8fCAhbV9mdWxsc2NyZWVuVmlkZW9Ob2RlLT5kb2N1bWVudCgpLT5mdWxsU2NyZWVuUmVuZGVy ZXIoKSkKKyAgICBpZiAoIW1fZnVsbHNjcmVlbk5vZGUgfHwgIW1fZnVsbHNjcmVlbk5vZGUtPnJl bmRlcmVyKCkKKyAgICAgICAgfHwgIW1fZnVsbHNjcmVlbk5vZGUtPmRvY3VtZW50KCkgfHwgIW1f ZnVsbHNjcmVlbk5vZGUtPmRvY3VtZW50KCktPmZ1bGxTY3JlZW5SZW5kZXJlcigpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBBU1NFUlQobV9mdWxsc2NyZWVuVmlkZW9Ob2RlLT5pc0VsZW1lbnRO b2RlKCkpOwotICAgIEFTU0VSVChzdGF0aWNfY2FzdDxFbGVtZW50Kj4obV9mdWxsc2NyZWVuVmlk ZW9Ob2RlLmdldCgpKS0+aXNNZWRpYUVsZW1lbnQoKSk7CisgICAgQVNTRVJUKG1fZnVsbHNjcmVl bk5vZGUtPmlzRWxlbWVudE5vZGUoKSk7CisgICAgQVNTRVJUKHN0YXRpY19jYXN0PEVsZW1lbnQq PihtX2Z1bGxzY3JlZW5Ob2RlLmdldCgpKS0+aXNNZWRpYUVsZW1lbnQoKSk7CiAKLSAgICBEb2N1 bWVudCogZG9jdW1lbnQgPSBtX2Z1bGxzY3JlZW5WaWRlb05vZGUtPmRvY3VtZW50KCk7CisgICAg RG9jdW1lbnQqIGRvY3VtZW50ID0gbV9mdWxsc2NyZWVuTm9kZS0+ZG9jdW1lbnQoKTsKICAgICBS ZW5kZXJTdHlsZSogZnVsbFNjcmVlblN0eWxlID0gZG9jdW1lbnQtPmZ1bGxTY3JlZW5SZW5kZXJl cigpLT5zdHlsZSgpOwogICAgIEFTU0VSVChmdWxsU2NyZWVuU3R5bGUpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAppbmRleCA4YzFjMzRkNDlmOWUwNzJjZmUzNTUz ZDIyMTg4NzllNmEyNGY1YWVhLi4yYmY0Mjk4N2E0ODgxNjdhNTE4NjQxMTVjYjA3MjNmMWJmNWUy MzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKQEAgLTU4Miw3 ICs1ODIsNyBAQCBwdWJsaWM6CiAKICAgICBpbnQgbV9wZW5kaW5nT3JpZW50YXRpb247CiAKLSAg ICBSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9mdWxsc2NyZWVuVmlkZW9Ob2RlOworICAgIFJlZlB0 cjxXZWJDb3JlOjpOb2RlPiBtX2Z1bGxzY3JlZW5Ob2RlOwogICAgIFJlZlB0cjxXZWJDb3JlOjpQ bHVnaW5WaWV3PiBtX2Z1bGxTY3JlZW5QbHVnaW5WaWV3OwogCiAgICAgdHlwZWRlZiBIYXNoTWFw PGNvbnN0IFdlYkNvcmU6OkZyYW1lKiwgQmFja2luZ1N0b3JlQ2xpZW50Kj4gQmFja2luZ1N0b3Jl Q2xpZW50Rm9yRnJhbWVNYXA7Cg==