198974 2019-06-18 13:22:26 -0700 Update WebKit API to separately retrieve actions and use context menus 2019-06-19 11:02:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes andersca commit-queue dino mitz ryanhaddad thorton webkit-bug-importer oldest_to_newest 1545761 0 achristensen 2019-06-18 13:22:26 -0700 Update WebKit API to separately retrieve actions and use context menus 1545767 1 372371 achristensen 2019-06-18 13:25:00 -0700 Created attachment 372371 Patch 1545768 2 achristensen 2019-06-18 13:25:02 -0700 <rdar://problem/50735687> 1545834 3 372371 thorton 2019-06-18 15:09:58 -0700 Comment on attachment 372371 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372371&action=review > Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h:170 > +- (void)webView:(WKWebView *)webView contextMenuConfigurationForElement:(WKContextMenuElementInfo *)elementInfo completionHandler:(void (^)(UIContextMenuConfiguration * _Nullable))completionHandler WK_API_AVAILABLE(ios(WK_IOS_TBA)); I think you want to name the block parameters so that Xcode pops a name in for you? We do in other places. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:489 > +- (void)ensurePositionInformationIsUpToDate:(const WebKit::InteractionInformationRequest&)request completionHandler:(CompletionHandler<void(BOOL)>&&)completionHandler; I don't think we need an additional way to get async position information updates; see above. 1545837 4 372391 achristensen 2019-06-18 15:27:06 -0700 Created attachment 372391 Patch 1545871 5 372391 commit-queue 2019-06-18 16:09:42 -0700 Comment on attachment 372391 Patch Rejecting attachment 372391 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 372391, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=372391&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=198974&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 372391 from bug 198974. Fetching: https://bugs.webkit.org/attachment.cgi?id=372391 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 3 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h Hunk #1 succeeded at 45 with fuzz 2 (offset 6 lines). Hunk #2 FAILED at 141. Hunk #3 FAILED at 156. 2 out of 3 hunks FAILED -- saving rejects to file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h.rej patching file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h Hunk #1 FAILED at 147. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 3 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h Hunk #1 succeeded at 45 with fuzz 2 (offset 6 lines). Hunk #2 FAILED at 141. Hunk #3 FAILED at 156. 2 out of 3 hunks FAILED -- saving rejects to file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h.rej patching file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h Hunk #1 FAILED at 147. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit 4a8cbd8f81f..50e451c1e4c master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 246572 = 4a8cbd8f81fbb759640f01fd804aa90361784fc6 r246573 = a49db596d6b7c9466c743d99f3879840310f23f4 r246574 = 4a74c0a384396b431f750f144c52f50ae70d3656 r246575 = 4b20a15db3add74bf10b1bd28986f3ce0afbcff2 r246576 = 50e451c1e4c55505257a6ac5faa3a629e99b8f89 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/12513573 1545958 6 achristensen 2019-06-18 21:31:52 -0700 https://trac.webkit.org/changeset/246575/webkit 1545959 7 ryanhaddad 2019-06-18 21:44:17 -0700 Reverted r246575 for reason: Breaks internal builds. Committed r246580: <https://trac.webkit.org/changeset/246580> 1546136 8 achristensen 2019-06-19 11:02:11 -0700 This was relanded in these two patches: https://trac.webkit.org/changeset/246583/webkit http://trac.webkit.org/r246598 372371 2019-06-18 13:25:00 -0700 2019-06-18 15:27:05 -0700 Patch bug-198974-20190618132459.patch text/plain 16320 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlkZWI5M2M2Njc2ZjkzMjkx YjI1YzE3ZTUxZjM5NGY1NWZmOTdkMmIuLjBlZjNjZmE0OTZlMmVlNTNhZTAyYTY1N2JlZWExMzc1 NGQxZTc4NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDYtMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVcGRhdGUgV2Vi S2l0IEFQSSB0byBzZXBhcmF0ZWx5IHJldHJpZXZlIGFjdGlvbnMgYW5kIHVzZSBjb250ZXh0IG1l bnVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5 NzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwNzM1Njg3PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBBUEkgYW5kIFNQSSwgYW5kIGFk ZCBpbmZyYXN0cnVjdHVyZSBmb3IgYXN5bmNocm9ub3VzbHkgcmVxdWVzdGluZyBpbnRlcmFjdGlv biBpbmZvcm1hdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVn YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBlbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0 ZTpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBlbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9u SXNVcFRvRGF0ZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvblN5bmMp OgorCiAyMDE5LTA2LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CiAKICAgICAgICAgRml4IGludGVybmFsIGJ1aWxkIGFmdGVyIHIyNDY1MTQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGUuaAppbmRleCBhMzU0 NGNlYTQ3MGY2OWNhYjQ2OWRlNjI3NjhiM2RhZmU4YzFiY2ExLi4yN2Q4MGJhNjYyYTcwNzRjNmM5 OTg3YWFjY2JjZDg1YjJiODM1YTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLVUlEZWxlZ2F0ZS5oCkBAIC0zOSw2ICszOSwxMiBAQCBOU19BU1NVTUVfTk9O TlVMTF9CRUdJTgogQGNsYXNzIFdLV2ViVmlld0NvbmZpZ3VyYXRpb247CiBAY2xhc3MgV0tXaW5k b3dGZWF0dXJlczsKIAorI2lmIFRBUkdFVF9PU19JUEhPTkUKK0BjbGFzcyBXS0NvbnRleHRNZW51 RWxlbWVudEluZm87CitAY2xhc3MgVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb247CitAcHJvdG9j b2wgVUlDb250ZXh0TWVudUludGVyYWN0aW9uQ29tbWl0QW5pbWF0aW5nOworI2VuZGlmCisKIC8q ISBBIGNsYXNzIGNvbmZvcm1pbmcgdG8gdGhlIFdLVUlEZWxlZ2F0ZSBwcm90b2NvbCBwcm92aWRl cyBtZXRob2RzIGZvcgogIHByZXNlbnRpbmcgbmF0aXZlIFVJIG9uIGJlaGFsZiBvZiBhIHdlYnBh Z2UuCiAgKi8KQEAgLTEyOSw3ICsxMzUsNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogIFRo aXMgbWV0aG9kIHdpbGwgb25seSBiZSBpbnZva2VkIGZvciBlbGVtZW50cyB0aGF0IGhhdmUgZGVm YXVsdCBwcmV2aWV3IGluIFdlYktpdCwgd2hpY2ggaXMKICBsaW1pdGVkIHRvIGxpbmtzLiBJbiB0 aGUgZnV0dXJlLCBpdCBjb3VsZCBiZSBpbnZva2VkIGZvciBhZGRpdGlvbmFsIGVsZW1lbnRzLgog ICovCi0tIChCT09MKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc2hvdWxkUHJldmlld0Vs ZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVudEluZm8gV0tfQVBJX0RFUFJFQ0FU RUQoIlRoaXMgQVBJIHdpbGwgYmUgcmVwbGFjZWQiLCBpb3MoMTAuMCwgV0tfSU9TX1RCQSkpOwor LSAoQk9PTCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHNob3VsZFByZXZpZXdFbGVtZW50 OihXS1ByZXZpZXdFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIFdLX0FQSV9ERVBSRUNBVEVEX1dJ VEhfUkVQTEFDRU1FTlQoIndlYlZpZXc6Y29udGV4dE1lbnVDb25maWd1cmF0aW9uRm9yRWxlbWVu dDpjb21wbGV0aW9uSGFuZGxlcjoiLCBpb3MoMTAuMCwgV0tfSU9TX1RCQSkpOwogCiAvKiEgQGFi c3RyYWN0IEFsbG93cyB5b3VyIGFwcCB0byBwcm92aWRlIGEgY3VzdG9tIHZpZXcgY29udHJvbGxl ciB0byBzaG93IHdoZW4gdGhlIGdpdmVuIGVsZW1lbnQgaXMgcGVla2VkLgogIEBwYXJhbSB3ZWJW aWV3IFRoZSB3ZWIgdmlldyBpbnZva2luZyB0aGUgZGVsZWdhdGUgbWV0aG9kLgpAQCAtMTQ0LDEz ICsxNTAsNTMgQEAgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KICBSZXR1cm5pbmcgbmlsIHdpbGwg cmVzdWx0IGluIFdlYktpdCdzIGRlZmF1bHQgcHJldmlldyBiZWhhdmlvci4gd2ViVmlldzpjb21t aXRQcmV2aWV3aW5nVmlld0NvbnRyb2xsZXI6IHdpbGwgb25seSBiZSBpbnZva2VkCiAgaWYgYSBu b24tbmlsIHZpZXcgY29udHJvbGxlciB3YXMgcmV0dXJuZWQuCiAgKi8KLS0gKG51bGxhYmxlIFVJ Vmlld0NvbnRyb2xsZXIgKil3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHByZXZpZXdpbmdW aWV3Q29udHJvbGxlckZvckVsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVudElu Zm8gZGVmYXVsdEFjdGlvbnM6KE5TQXJyYXk8aWQgPFdLUHJldmlld0FjdGlvbkl0ZW0+PiAqKXBy ZXZpZXdBY3Rpb25zIFdLX0FQSV9ERVBSRUNBVEVEKCJUaGlzIEFQSSB3aWxsIGJlIHJlcGxhY2Vk IiwgaW9zKDEwLjAsIFdLX0lPU19UQkEpKTsKKy0gKG51bGxhYmxlIFVJVmlld0NvbnRyb2xsZXIg Kil3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHByZXZpZXdpbmdWaWV3Q29udHJvbGxlckZv ckVsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVudEluZm8gZGVmYXVsdEFjdGlv bnM6KE5TQXJyYXk8aWQgPFdLUHJldmlld0FjdGlvbkl0ZW0+PiAqKXByZXZpZXdBY3Rpb25zIFdL X0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIndlYlZpZXc6Y29udGV4dE1lbnVDb25m aWd1cmF0aW9uRm9yRWxlbWVudDpjb21wbGV0aW9uSGFuZGxlcjoiLCBpb3MoMTAuMCwgV0tfSU9T X1RCQSkpOwogCiAvKiEgQGFic3RyYWN0IEFsbG93cyB5b3VyIGFwcCB0byBwb3AgdG8gdGhlIHZp ZXcgY29udHJvbGxlciBpdCBjcmVhdGVkLgogIEBwYXJhbSB3ZWJWaWV3IFRoZSB3ZWIgdmlldyBp bnZva2luZyB0aGUgZGVsZWdhdGUgbWV0aG9kLgogIEBwYXJhbSBwcmV2aWV3aW5nVmlld0NvbnRy b2xsZXIgVGhlIHZpZXcgY29udHJvbGxlciB0aGF0IGlzIGJlaW5nIHBvcHBlZC4KICAqLwotLSAo dm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbW1pdFByZXZpZXdpbmdWaWV3Q29u dHJvbGxlcjooVUlWaWV3Q29udHJvbGxlciAqKXByZXZpZXdpbmdWaWV3Q29udHJvbGxlciBXS19B UElfREVQUkVDQVRFRCgiVGhpcyBBUEkgd2lsbCBiZSByZXBsYWNlZCIsIGlvcygxMC4wLCBXS19J T1NfVEJBKSk7CistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29tbWl0UHJl dmlld2luZ1ZpZXdDb250cm9sbGVyOihVSVZpZXdDb250cm9sbGVyICopcHJldmlld2luZ1ZpZXdD b250cm9sbGVyIFdLX0FQSV9ERVBSRUNBVEVEKCJ3ZWJWaWV3OmNvbnRleHRNZW51Rm9yRWxlbWVu dDp3aWxsQ29tbWl0V2l0aEFuaW1hdG9yOiIsIGlvcygxMC4wLCBXS19JT1NfVEJBKSk7CisKKy8q KgorICogQGFic3RyYWN0IENhbGxlZCB3aGVuIGEgY29udGV4dCBtZW51IGludGVyYWN0aW9uIGJl Z2lucy4KKyAqCisgKiBAcGFyYW0gd2ViVmlldyBUaGUgd2ViIHZpZXcgaW52b2tpbmcgdGhlIGRl bGVnYXRlIG1ldGhvZC4KKyAqIEBwYXJhbSBlbGVtZW50SW5mbyBUaGUgZWxlbWVudEluZm8gZm9y IHRoZSBlbGVtZW50IHRoZSB1c2VyIGlzIHRvdWNoaW5nLgorICogQHBhcmFtIGNvbXBsZXRpb25I YW5kbGVyIEEgY29tcGxldGlvbiBoYW5kbGVyIHRvIGNhbGwgb25jZSBhIGl0IGhhcyBiZWVuIGRl Y2lkZWQgd2hldGhlciBvciBub3QgdG8gc2hvdyBhIGNvbnRleHQgbWVudS4KKyAqIFBhc3MgYSB2 YWxpZCBVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiB0byBzaG93IGEgY29udGV4dCBtZW51LCBv ciBwYXNzIG5pbCB0byBub3Qgc2hvdyBhIGNvbnRleHQgbWVudS4KKyAqLworCistICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVDb25maWd1cmF0aW9uRm9yRWxl bWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gY29tcGxldGlvbkhh bmRsZXI6KHZvaWQgKF4pKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICogX051bGxhYmxlKSlj b21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CisKKy8q KgorICogQGFic3RyYWN0IENhbGxlZCB3aGVuIHRoZSBjb250ZXh0IG1lbnUgY29uZmlndXJlZCBi eSB0aGUgVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gZnJvbQorICogd2ViVmlldzpjb250ZXh0 TWVudUNvbmZpZ3VyYXRpb25Gb3JFbGVtZW50OmNvbXBsZXRpb25IYW5kbGVyOiBpcyBjb21taXR0 ZWQuCisgKgorICogQHBhcmFtIHdlYlZpZXcgVGhlIHdlYiB2aWV3IGludm9raW5nIHRoZSBkZWxl Z2F0ZSBtZXRob2QuCisgKiBAcGFyYW0gZWxlbWVudEluZm8gVGhlIGVsZW1lbnRJbmZvIGZvciB0 aGUgZWxlbWVudCB0aGUgdXNlciBpcyB0b3VjaGluZy4KKyAqIEBwYXJhbSBhbmltYXRvciBUaGUg YW5pbWF0b3IgdG8gdXNlIGZvciB0aGUgY29tbWl0IGFuaW1hdGlvbi4KKyAqLworCistICh2b2lk KXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVGb3JFbGVtZW50OihXS0Nv bnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50SW5mbyB3aWxsQ29tbWl0V2l0aEFuaW1hdG9y OihpZDxVSUNvbnRleHRNZW51SW50ZXJhY3Rpb25Db21taXRBbmltYXRpbmc+KWFuaW1hdG9yIFdL X0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKKworLyoqCisgKiBAYWJzdHJhY3QgQ2Fs bGVkIHdoZW4gdGhlIGNvbnRleHQgbWVudSB3aWxsIGJlIHByZXNlbnRlZC4KKyAqCisgKiBAcGFy YW0gd2ViVmlldyBUaGUgd2ViIHZpZXcgaW52b2tpbmcgdGhlIGRlbGVnYXRlIG1ldGhvZC4KKyAq IEBwYXJhbSBlbGVtZW50SW5mbyBUaGUgZWxlbWVudEluZm8gZm9yIHRoZSBlbGVtZW50IHRoZSB1 c2VyIGlzIHRvdWNoaW5nLgorICovCisKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBjb250ZXh0TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1l bnRJbmZvICopZWxlbWVudEluZm8gV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwor CisvKioKKyAqIEBhYnN0cmFjdCBDYWxsZWQgd2hlbiB0aGUgY29udGV4dCBtZW51IGVuZHMuCisg KgorICogQHBhcmFtIHdlYlZpZXcgVGhlIHdlYiB2aWV3IGludm9raW5nIHRoZSBkZWxlZ2F0ZSBt ZXRob2QuCisgKiBAcGFyYW0gZWxlbWVudEluZm8gVGhlIGVsZW1lbnRJbmZvIGZvciB0aGUgZWxl bWVudCB0aGUgdXNlciBpcyB0b3VjaGluZy4KKyAqLworCistICh2b2lkKXdlYlZpZXc6KFdLV2Vi VmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVEaWRFbmRGb3JFbGVtZW50OihXS0NvbnRleHRNZW51 RWxlbWVudEluZm8gKillbGVtZW50SW5mbyBXS19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJB KSk7CiAKICNlbmRpZiAvLyBUQVJHRVRfT1NfSVBIT05FCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCmluZGV4IGQ2 NmRkNmYyYzJlZGY1MGE5N2ZlMDc4MTY5NzM5NDliMTI3NzI0OWQuLmE2YzcwODNlZTA5OWZmZjI3 YmM0ZWRjZDcyYTAwOGIyNGIyY2QzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaApAQCAtMTQ3LDEzICsxNDcs MTMgQEAgc3RydWN0IFVJRWRnZUluc2V0czsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGlkRGlzbWlzc1ByZXZpZXdWaWV3Q29udHJvbGxlcjooVUlWaWV3Q29udHJvbGxl ciAqKXByZXZpZXdlZFZpZXdDb250cm9sbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFD RU1FTlQoIndlYlZpZXc6ZGlzbWlzc0NvbnRleHRNZW51OiIsIGlvcyg5LjAsIFdLX0lPU19UQkEp KTsKIAogI2lmIFRBUkdFVF9PU19JT1MKLS8vIFRoaXMgbmVlZHMgdG8gYmUgcmVtb3ZlZCBvbmNl IHRoZXJlIGlzIGFuIEFQSSB2ZXJzaW9uIHRvIGNvbnRpbnVlIHRvIGRvIGNhbGxiYWNrcyBmb3Ig aW1hZ2UgZWxlbWVudCBjb250ZXh0IG1lbnVzLgorLy8gVGhpcyBtdXN0IGJlIGtlcHQgdG8gY29u dGludWUgdG8gZG8gY2FsbGJhY2tzIGZvciBpbWFnZSBlbGVtZW50IGNvbnRleHQgbWVudXMuCiAt ICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbnRleHRNZW51Q29uZmlndXJh dGlvbkZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIGNv bXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopKWNv bXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKIAotLy8g VGhlc2UgY2FuIGJlIHJlbW92ZWQgb25jZSB0aGVyZSBpcyBhbiBBUEkgdmVyc2lvbi4KLS0gKHZv aWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVGb3JFbGVtZW50OihX S0NvbnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50SW5mbyB3aWxsQ29tbWl0V2l0aEFuaW1h dG9yOihpZDxVSUNvbnRleHRNZW51SW50ZXJhY3Rpb25Db21taXRBbmltYXRpbmc+KWFuaW1hdG9y IFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKLS0gKHZvaWQpX3dlYlZpZXc6KFdL V2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVXaWxsUHJlc2VudEZvckVsZW1lbnQ6KFdLQ29u dGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdL X0lPU19UQkEpKTsKLS0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4 dE1lbnVEaWRFbmRGb3JFbGVtZW50OihXS0NvbnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50 SW5mbyBXS19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CisvLyBUaGVzZSBjYW4gYmUg cmVtb3ZlZCBvbmNlIHRoZSBBUEkgdmVyc2lvbiBpcyBhZG9wdGVkIGJ5IGFsbCBjbGllbnRzLgor LSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVudUZvckVsZW1l bnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIHdpbGxDb21taXRXaXRo QW5pbWF0b3I6KGlkPFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbkNvbW1pdEFuaW1hdGluZz4pYW5p bWF0b3IgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgid2ViVmlldzpjb250ZXh0 TWVudUZvckVsZW1lbnQ6d2lsbENvbW1pdFdpdGhBbmltYXRvcjoiLCBpb3MoV0tfSU9TX1RCQSwg V0tfSU9TX1RCQSkpOworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250 ZXh0TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJbmZvICop ZWxlbWVudEluZm8gV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgid2ViVmlldzpj b250ZXh0TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDoiLCBpb3MoV0tfSU9TX1RCQSwgV0tfSU9T X1RCQSkpOworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVu dURpZEVuZEZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZv IFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIndlYlZpZXc6Y29udGV4dE1lbnVE aWRFbmRGb3JFbGVtZW50OiIsIGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CiAjZW5kaWYK IAogLSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzaG93Q3VzdG9tU2hlZXRG b3JFbGVtZW50OihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnQgV0tfQVBJX0FWQUlM QUJMRShpb3MoMTAuMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IDI3MThhNTQwMGNlZDFlOWRlNmI1NjY4 MjZkZWNmNTJmZjZjYmE3MGIuLmZkNzdlOGVhZDRiMzk1M2RjYWVjNDY0YWUyNmYwOTJkNjM0ZGY5 ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKQEAgLTQ4NSw3ICs0ODUsOCBAQCBGT1JfRUFDSF9QUklWQVRFX1dL Q09OVEVOVFZJRVdfQUNUSU9OKERFQ0xBUkVfV0tDT05URU5UVklFV19BQ1RJT05fRk9SX1dFQl9W SUVXKQogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFdlYktpdDo6SW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb24gY3VycmVudFBvc2l0aW9uSW5mb3JtYXRpb247CiAtICh2 b2lkKWRvQWZ0ZXJQb3NpdGlvbkluZm9ybWF0aW9uVXBkYXRlOih2b2lkICheKShXZWJLaXQ6Oklu dGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uKSlhY3Rpb24gZm9yUmVxdWVzdDooV2ViS2l0 OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdClyZXF1ZXN0OwotLSAoQk9PTCllbnN1cmVQ b3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTooV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0 aW9uUmVxdWVzdClyZXF1ZXN0OworLSAoQk9PTCllbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNV cFRvRGF0ZTooY29uc3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYpcmVx dWVzdDsKKy0gKHZvaWQpZW5zdXJlUG9zaXRpb25JbmZvcm1hdGlvbklzVXBUb0RhdGU6KGNvbnN0 IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmKXJlcXVlc3QgY29tcGxldGlv bkhhbmRsZXI6KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoQk9PTCk+JiYpY29tcGxldGlvbkhhbmRs ZXI7CiAKICNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikKIC0gKHZvaWQpX2RpZENoYW5nZURy YWdJbnRlcmFjdGlvblBvbGljeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDYyYjNhZTE5ODc3YWFhMTg0 NThiYWEzNGQ4ZTRkZGNkNTMyYWVhNzguLjlhYzY2ZmNlMTM3Nzc5YWVlODkyZTZkNGFjY2ZhZGU1 YTQ3ZWMzZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMTkyMSw3ICsxOTIxLDcgQEAgc3RhdGljIGlu bGluZSBib29sIGlzU2FtZVBhaXIoVUlHZXN0dXJlUmVjb2duaXplciAqYSwgVUlHZXN0dXJlUmVj b2duaXplciAqYiwgVUkKICAgICAgICAgW3NlbGYgcmVxdWVzdEFzeW5jaHJvbm91c1Bvc2l0aW9u SW5mb3JtYXRpb25VcGRhdGU6cmVxdWVzdF07CiB9CiAKLS0gKEJPT0wpZW5zdXJlUG9zaXRpb25J bmZvcm1hdGlvbklzVXBUb0RhdGU6KFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVl c3QpcmVxdWVzdAorLSAoQk9PTCllbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZToo Y29uc3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYpcmVxdWVzdAogewog ICAgIGlmIChbc2VsZiBfY3VycmVudFBvc2l0aW9uSW5mb3JtYXRpb25Jc1ZhbGlkRm9yUmVxdWVz dDpyZXF1ZXN0XSkKICAgICAgICAgcmV0dXJuIFlFUzsKQEAgLTE5MzMsNyArMTkzMyw3IEBAIHN0 YXRpYyBpbmxpbmUgYm9vbCBpc1NhbWVQYWlyKFVJR2VzdHVyZVJlY29nbml6ZXIgKmEsIFVJR2Vz dHVyZVJlY29nbml6ZXIgKmIsIFVJCiAgICAgaWYgKFtzZWxmIF9oYXNWYWxpZE91dHN0YW5kaW5n UG9zaXRpb25JbmZvcm1hdGlvblJlcXVlc3Q6cmVxdWVzdF0pCiAgICAgICAgIHJldHVybiBjb25u ZWN0aW9uLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRSZWNlaXZlUG9zaXRpb25JbmZvcm1hdGlvbj4oX3BhZ2UtPnBhZ2VJRCgpLCAxX3Ms IElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVz KTsKIAotICAgIGJvb2wgcmVjZWl2ZWRSZXNwb25zZSA9IF9wYWdlLT5wcm9jZXNzKCkuc2VuZFN5 bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBvc2l0aW9uSW5mb3JtYXRpb24ocmVxdWVzdCksIE1l c3NhZ2VzOjpXZWJQYWdlOjpHZXRQb3NpdGlvbkluZm9ybWF0aW9uOjpSZXBseShfcG9zaXRpb25J bmZvcm1hdGlvbiksIF9wYWdlLT5wYWdlSUQoKSwgMV9zKTsKKyAgICBib29sIHJlY2VpdmVkUmVz cG9uc2UgPSBfcGFnZS0+cHJvY2VzcygpLnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQ b3NpdGlvbkluZm9ybWF0aW9uU3luYyhyZXF1ZXN0KSwgTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBv c2l0aW9uSW5mb3JtYXRpb25TeW5jOjpSZXBseShfcG9zaXRpb25JbmZvcm1hdGlvbiksIF9wYWdl LT5wYWdlSUQoKSwgMV9zKTsKICAgICBfaGFzVmFsaWRQb3NpdGlvbkluZm9ybWF0aW9uID0gcmVj ZWl2ZWRSZXNwb25zZSAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5jYW5CZVZhbGlkOwogICAgIAog ICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGNsZWFuIHVwIHRoZXNlIGhhbmRsZXJzIGluIHRoZSBl dmVudCB0aGF0IHdlIGFyZSBub3QgYWJsZSB0byBjb2xsZWN0IGRhdGEsIG9yIGlmIHRoZSBXZWJQ cm9jZXNzIGNyYXNoZXMuCkBAIC0xOTQzLDYgKzE5NDMsMjUgQEAgc3RhdGljIGlubGluZSBib29s IGlzU2FtZVBhaXIoVUlHZXN0dXJlUmVjb2duaXplciAqYSwgVUlHZXN0dXJlUmVjb2duaXplciAq YiwgVUkKICAgICByZXR1cm4gX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbjsKIH0KIAorLSAo dm9pZCllbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTooY29uc3QgV2ViS2l0OjpJ bnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYpcmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjoo Q29tcGxldGlvbkhhbmRsZXI8dm9pZChCT09MKT4mJiljb21wbGV0aW9uSGFuZGxlcgoreworICAg IGlmIChbc2VsZiBfY3VycmVudFBvc2l0aW9uSW5mb3JtYXRpb25Jc1ZhbGlkRm9yUmVxdWVzdDpy ZXF1ZXN0XSkKKyAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFlFUyk7CisKKyAgICBh dXRvKiBjb25uZWN0aW9uID0gX3BhZ2UtPnByb2Nlc3MoKS5jb25uZWN0aW9uKCk7CisgICAgaWYg KCFjb25uZWN0aW9uKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoTk8pOworCisg ICAgY29ubmVjdGlvbi0+c2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQ b3NpdGlvbkluZm9ybWF0aW9uKHJlcXVlc3QpLCBbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKSwgd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0NvbnRlbnRWaWV3 PihzZWxmKV0gKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mJiBpbmZv cm1hdGlvbikgbXV0YWJsZSB7CisgICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdl dCgpOworICAgICAgICBpZiAoIXN0cm9uZ1NlbGYpCisgICAgICAgICAgICByZXR1cm4gY29tcGxl dGlvbkhhbmRsZXIoTk8pOworICAgICAgICBzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlv biA9IGluZm9ybWF0aW9uOworICAgICAgICBzdHJvbmdTZWxmLT5faGFzVmFsaWRQb3NpdGlvbklu Zm9ybWF0aW9uID0gaW5mb3JtYXRpb24uY2FuQmVWYWxpZDsKKyAgICAgICAgY29tcGxldGlvbkhh bmRsZXIoaW5mb3JtYXRpb24uY2FuQmVWYWxpZCk7CisgICAgfSwgX3BhZ2UtPnBhZ2VJRCgpKTsK K30KKwogLSAodm9pZClyZXF1ZXN0QXN5bmNocm9ub3VzUG9zaXRpb25JbmZvcm1hdGlvblVwZGF0 ZTooV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdClyZXF1ZXN0CiB7CiAgICAg aWYgKFtzZWxmIF9jdXJyZW50UG9zaXRpb25JbmZvcm1hdGlvbklzVmFsaWRGb3JSZXF1ZXN0OnJl cXVlc3RdKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4 IGFhNzMwNThmOTU4ODNiYmVlMDgzNzJjMjlmMGViZTQ3YmEyZjQ5N2MuLjI3OGYyYmM2MzFkMmRh MDBhNDBhZDA3MDU0ZDQ0ODU1ZmFlMmI3NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKQEAgLTY2Myw2ICs2NjMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBz eW5jQXBwbHlBdXRvY29ycmVjdGlvbihjb25zdCBTdHJpbmcmIGNvcnJlY3Rpb24sIGNvbnN0IFN0 cmluZyYgb3JpZ2luYWxUZXh0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKICAg ICB2b2lkIHJlcXVlc3RBdXRvY29ycmVjdGlvbkNvbnRleHQoKTsKICAgICB2b2lkIGdldFBvc2l0 aW9uSW5mb3JtYXRpb24oY29uc3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmLCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJiYpPiYm KTsKKyAgICB2b2lkIGdldFBvc2l0aW9uSW5mb3JtYXRpb25TeW5jKGNvbnN0IEludGVyYWN0aW9u SW5mb3JtYXRpb25SZXF1ZXN0JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChJbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbiYmKT4mJik7CiAgICAgdm9pZCByZXF1ZXN0UG9zaXRpb25JbmZv cm1hdGlvbihjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYpOwogICAgIHZvaWQg c3RhcnRJbnRlcmFjdGlvbldpdGhFbGVtZW50QXRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQ b2ludCYpOwogICAgIHZvaWQgc3RvcEludGVyYWN0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCA2ZjlmOTcy NDNiYTRiNTdiZWRjM2E0ODBmMGZkMTRhMjgwNDljYzk4Li5mNDMyNjE1MTQ5YzhhNTJmZTM3Njg4 OGJjZjNiNzljMWE0MWE0NDA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTgxLDcgKzgxLDggQEAgbWVzc2FnZXMg LT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgU3luY0FwcGx5QXV0b2NvcnJlY3Rpb24o U3RyaW5nIGNvcnJlY3Rpb24sIFN0cmluZyBvcmlnaW5hbFRleHQpIC0+IChib29sIGF1dG9jb3Jy ZWN0aW9uQXBwbGllZCkgU3luY2hyb25vdXMKICAgICBSZXF1ZXN0QXV0b2NvcnJlY3Rpb25Db250 ZXh0KCkKICAgICBSZXF1ZXN0RXZhc2lvblJlY3RzQWJvdmVTZWxlY3Rpb24oKSAtPiAoVmVjdG9y PFdlYkNvcmU6OkZsb2F0UmVjdD4gcmVjdHMpIEFzeW5jCi0gICAgR2V0UG9zaXRpb25JbmZvcm1h dGlvbihzdHJ1Y3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCByZXF1ZXN0 KSAtPiAoc3RydWN0IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24gaW5m b3JtYXRpb24pIFN5bmNocm9ub3VzCisgICAgR2V0UG9zaXRpb25JbmZvcm1hdGlvblN5bmMoc3Ry dWN0IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcmVxdWVzdCkgLT4gKHN0 cnVjdCBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIGluZm9ybWF0aW9u KSBTeW5jaHJvbm91cworICAgIEdldFBvc2l0aW9uSW5mb3JtYXRpb24oc3RydWN0IFdlYktpdDo6 SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcmVxdWVzdCkgLT4gKHN0cnVjdCBXZWJLaXQ6 OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIGluZm9ybWF0aW9uKSBBc3luYwogICAg IFJlcXVlc3RQb3NpdGlvbkluZm9ybWF0aW9uKHN0cnVjdCBXZWJLaXQ6OkludGVyYWN0aW9uSW5m b3JtYXRpb25SZXF1ZXN0IHJlcXVlc3QpCiAgICAgU3RhcnRJbnRlcmFjdGlvbldpdGhFbGVtZW50 QXRQb3NpdGlvbihXZWJDb3JlOjpJbnRQb2ludCBwb2ludCkKICAgICBTdG9wSW50ZXJhY3Rpb24o KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbQppbmRleCBjNmRiZWU5ODIyZDVhODdmYzRmYjQ3NzY2ZGFlZDU2Y2M1NDhmMzg1Li4xYmU3 ZGI5MzFiNDZlMzYyZTY5MmEwYTQxMWM4OWIzZTA5ODU1MGUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjQ1OCw3ICsy NDU4LDEyIEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbihjb25zdCBJbnRl cmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYgcmVxdWVzCiAgICAgaWYgKGF1dG8gcmVwbHkgPSBX VEZNb3ZlKG1fcGVuZGluZ1N5bmNocm9ub3VzUG9zaXRpb25JbmZvcm1hdGlvblJlcGx5KSkKICAg ICAgICAgcmVwbHkoV1RGTW92ZShpbmZvcm1hdGlvbikpOwogfQotICAgIAorCit2b2lkIFdlYlBh Z2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb25TeW5jKGNvbnN0IEludGVyYWN0aW9uSW5mb3JtYXRp b25SZXF1ZXN0JiByZXF1ZXN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEludGVyYWN0aW9uSW5m b3JtYXRpb25BdFBvc2l0aW9uJiYpPiYmIHJlcGx5KQoreworICAgIHJldHVybiBnZXRQb3NpdGlv bkluZm9ybWF0aW9uKHJlcXVlc3QsIFdURk1vdmUocmVwbHkpKTsKK30KKwogc3RhdGljIHZvaWQg Zm9jdXNlZEVsZW1lbnRQb3NpdGlvbkluZm9ybWF0aW9uKFdlYlBhZ2UmIHBhZ2UsIEVsZW1lbnQm IGZvY3VzZWRFbGVtZW50LCBjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCYgcmVx dWVzdCwgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mIGluZm8pCiB7CiAgICAgY29u c3QgRnJhbWUmIGZyYW1lID0gcGFnZS5jb3JlUGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1 c2VkT3JNYWluRnJhbWUoKTsK 372391 2019-06-18 15:27:06 -0700 2019-06-18 16:09:42 -0700 Patch bug-198974-20190618152706.patch text/plain 8428 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMzNzFjY2ZjMzExZTZkODNh ZGI0MGMwODA0NjI4YzhiODJjZTU0ZmQuLjc2NDg1MGM1YjI4YzI5ZGE0ZGQ3NmJmM2EyMmJmNWM4 N2Y0ZDBmOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDYtMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVcGRhdGUgV2Vi S2l0IEFQSSB0byBzZXBhcmF0ZWx5IHJldHJpZXZlIGFjdGlvbnMgYW5kIHVzZSBjb250ZXh0IG1l bnVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5 NzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwNzM1Njg3PgorCisgICAgICAgIFJldmlld2Vk IGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgVXBkYXRlIEFQSSBhbmQgU1BJLCBhbmQgYWRkIGlu ZnJhc3RydWN0dXJlIGZvciBhc3luY2hyb25vdXNseSByZXF1ZXN0aW5nIGludGVyYWN0aW9uIGlu Zm9ybWF0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGUu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaDoK KwogMjAxOS0wNi0xOCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBDaGFuZ2UgbG9nIGNoYW5uZWwgbmFtZSBmcm9tIFJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1ZyB0byBJVFBEZWJ1ZyBhbmQgcmVtb3ZlIHVubmVjZXNzYXJ5ICNpZiAhUkVMRUFTRV9MT0df RElTQUJMRUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1VJRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVs ZWdhdGUuaAppbmRleCBhMzU0NGNlYTQ3MGY2OWNhYjQ2OWRlNjI3NjhiM2RhZmU4YzFiY2ExLi4x OWE1YTkxNGMyYjVhYzY0ZTY5YmE0MDNlNjAwNGJlOWE1ZWY1Mzg1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlLmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZS5oCkBAIC0zOSw2ICszOSwx MiBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogQGNsYXNzIFdLV2ViVmlld0NvbmZpZ3VyYXRp b247CiBAY2xhc3MgV0tXaW5kb3dGZWF0dXJlczsKIAorI2lmIFRBUkdFVF9PU19JUEhPTkUKK0Bj bGFzcyBXS0NvbnRleHRNZW51RWxlbWVudEluZm87CitAY2xhc3MgVUlDb250ZXh0TWVudUNvbmZp Z3VyYXRpb247CitAcHJvdG9jb2wgVUlDb250ZXh0TWVudUludGVyYWN0aW9uQ29tbWl0QW5pbWF0 aW5nOworI2VuZGlmCisKIC8qISBBIGNsYXNzIGNvbmZvcm1pbmcgdG8gdGhlIFdLVUlEZWxlZ2F0 ZSBwcm90b2NvbCBwcm92aWRlcyBtZXRob2RzIGZvcgogIHByZXNlbnRpbmcgbmF0aXZlIFVJIG9u IGJlaGFsZiBvZiBhIHdlYnBhZ2UuCiAgKi8KQEAgLTEyOSw3ICsxMzUsNyBAQCBOU19BU1NVTUVf Tk9OTlVMTF9CRUdJTgogIFRoaXMgbWV0aG9kIHdpbGwgb25seSBiZSBpbnZva2VkIGZvciBlbGVt ZW50cyB0aGF0IGhhdmUgZGVmYXVsdCBwcmV2aWV3IGluIFdlYktpdCwgd2hpY2ggaXMKICBsaW1p dGVkIHRvIGxpbmtzLiBJbiB0aGUgZnV0dXJlLCBpdCBjb3VsZCBiZSBpbnZva2VkIGZvciBhZGRp dGlvbmFsIGVsZW1lbnRzLgogICovCi0tIChCT09MKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZp ZXcgc2hvdWxkUHJldmlld0VsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVudElu Zm8gV0tfQVBJX0RFUFJFQ0FURUQoIlRoaXMgQVBJIHdpbGwgYmUgcmVwbGFjZWQiLCBpb3MoMTAu MCwgV0tfSU9TX1RCQSkpOworLSAoQk9PTCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHNo b3VsZFByZXZpZXdFbGVtZW50OihXS1ByZXZpZXdFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIFdL X0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIndlYlZpZXc6Y29udGV4dE1lbnVDb25m aWd1cmF0aW9uRm9yRWxlbWVudDpjb21wbGV0aW9uSGFuZGxlcjoiLCBpb3MoMTAuMCwgV0tfSU9T X1RCQSkpOwogCiAvKiEgQGFic3RyYWN0IEFsbG93cyB5b3VyIGFwcCB0byBwcm92aWRlIGEgY3Vz dG9tIHZpZXcgY29udHJvbGxlciB0byBzaG93IHdoZW4gdGhlIGdpdmVuIGVsZW1lbnQgaXMgcGVl a2VkLgogIEBwYXJhbSB3ZWJWaWV3IFRoZSB3ZWIgdmlldyBpbnZva2luZyB0aGUgZGVsZWdhdGUg bWV0aG9kLgpAQCAtMTQ0LDEzICsxNTAsNTMgQEAgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KICBS ZXR1cm5pbmcgbmlsIHdpbGwgcmVzdWx0IGluIFdlYktpdCdzIGRlZmF1bHQgcHJldmlldyBiZWhh dmlvci4gd2ViVmlldzpjb21taXRQcmV2aWV3aW5nVmlld0NvbnRyb2xsZXI6IHdpbGwgb25seSBi ZSBpbnZva2VkCiAgaWYgYSBub24tbmlsIHZpZXcgY29udHJvbGxlciB3YXMgcmV0dXJuZWQuCiAg Ki8KLS0gKG51bGxhYmxlIFVJVmlld0NvbnRyb2xsZXIgKil3ZWJWaWV3OihXS1dlYlZpZXcgKil3 ZWJWaWV3IHByZXZpZXdpbmdWaWV3Q29udHJvbGxlckZvckVsZW1lbnQ6KFdLUHJldmlld0VsZW1l bnRJbmZvICopZWxlbWVudEluZm8gZGVmYXVsdEFjdGlvbnM6KE5TQXJyYXk8aWQgPFdLUHJldmll d0FjdGlvbkl0ZW0+PiAqKXByZXZpZXdBY3Rpb25zIFdLX0FQSV9ERVBSRUNBVEVEKCJUaGlzIEFQ SSB3aWxsIGJlIHJlcGxhY2VkIiwgaW9zKDEwLjAsIFdLX0lPU19UQkEpKTsKKy0gKG51bGxhYmxl IFVJVmlld0NvbnRyb2xsZXIgKil3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHByZXZpZXdp bmdWaWV3Q29udHJvbGxlckZvckVsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVu dEluZm8gZGVmYXVsdEFjdGlvbnM6KE5TQXJyYXk8aWQgPFdLUHJldmlld0FjdGlvbkl0ZW0+PiAq KXByZXZpZXdBY3Rpb25zIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIndlYlZp ZXc6Y29udGV4dE1lbnVDb25maWd1cmF0aW9uRm9yRWxlbWVudDpjb21wbGV0aW9uSGFuZGxlcjoi LCBpb3MoMTAuMCwgV0tfSU9TX1RCQSkpOwogCiAvKiEgQGFic3RyYWN0IEFsbG93cyB5b3VyIGFw cCB0byBwb3AgdG8gdGhlIHZpZXcgY29udHJvbGxlciBpdCBjcmVhdGVkLgogIEBwYXJhbSB3ZWJW aWV3IFRoZSB3ZWIgdmlldyBpbnZva2luZyB0aGUgZGVsZWdhdGUgbWV0aG9kLgogIEBwYXJhbSBw cmV2aWV3aW5nVmlld0NvbnRyb2xsZXIgVGhlIHZpZXcgY29udHJvbGxlciB0aGF0IGlzIGJlaW5n IHBvcHBlZC4KICAqLwotLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbW1p dFByZXZpZXdpbmdWaWV3Q29udHJvbGxlcjooVUlWaWV3Q29udHJvbGxlciAqKXByZXZpZXdpbmdW aWV3Q29udHJvbGxlciBXS19BUElfREVQUkVDQVRFRCgiVGhpcyBBUEkgd2lsbCBiZSByZXBsYWNl ZCIsIGlvcygxMC4wLCBXS19JT1NfVEJBKSk7CistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgY29tbWl0UHJldmlld2luZ1ZpZXdDb250cm9sbGVyOihVSVZpZXdDb250cm9sbGVy ICopcHJldmlld2luZ1ZpZXdDb250cm9sbGVyIFdLX0FQSV9ERVBSRUNBVEVEKCJ3ZWJWaWV3OmNv bnRleHRNZW51Rm9yRWxlbWVudDp3aWxsQ29tbWl0V2l0aEFuaW1hdG9yOiIsIGlvcygxMC4wLCBX S19JT1NfVEJBKSk7CisKKy8qKgorICogQGFic3RyYWN0IENhbGxlZCB3aGVuIGEgY29udGV4dCBt ZW51IGludGVyYWN0aW9uIGJlZ2lucy4KKyAqCisgKiBAcGFyYW0gd2ViVmlldyBUaGUgd2ViIHZp ZXcgaW52b2tpbmcgdGhlIGRlbGVnYXRlIG1ldGhvZC4KKyAqIEBwYXJhbSBlbGVtZW50SW5mbyBU aGUgZWxlbWVudEluZm8gZm9yIHRoZSBlbGVtZW50IHRoZSB1c2VyIGlzIHRvdWNoaW5nLgorICog QHBhcmFtIGNvbXBsZXRpb25IYW5kbGVyIEEgY29tcGxldGlvbiBoYW5kbGVyIHRvIGNhbGwgb25j ZSBhIGl0IGhhcyBiZWVuIGRlY2lkZWQgd2hldGhlciBvciBub3QgdG8gc2hvdyBhIGNvbnRleHQg bWVudS4KKyAqIFBhc3MgYSB2YWxpZCBVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiB0byBzaG93 IGEgY29udGV4dCBtZW51LCBvciBwYXNzIG5pbCB0byBub3Qgc2hvdyBhIGNvbnRleHQgbWVudS4K KyAqLworCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29udGV4dE1lbnVD b25maWd1cmF0aW9uRm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJbmZvICopZWxlbWVu dEluZm8gY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKFVJQ29udGV4dE1lbnVDb25maWd1cmF0 aW9uICogX051bGxhYmxlIGNvbmZpZ3VyYXRpb24pKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9B VkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKKworLyoqCisgKiBAYWJzdHJhY3QgQ2FsbGVkIHdo ZW4gdGhlIGNvbnRleHQgbWVudSBjb25maWd1cmVkIGJ5IHRoZSBVSUNvbnRleHRNZW51Q29uZmln dXJhdGlvbiBmcm9tCisgKiB3ZWJWaWV3OmNvbnRleHRNZW51Q29uZmlndXJhdGlvbkZvckVsZW1l bnQ6Y29tcGxldGlvbkhhbmRsZXI6IGlzIGNvbW1pdHRlZC4KKyAqCisgKiBAcGFyYW0gd2ViVmll dyBUaGUgd2ViIHZpZXcgaW52b2tpbmcgdGhlIGRlbGVnYXRlIG1ldGhvZC4KKyAqIEBwYXJhbSBl bGVtZW50SW5mbyBUaGUgZWxlbWVudEluZm8gZm9yIHRoZSBlbGVtZW50IHRoZSB1c2VyIGlzIHRv dWNoaW5nLgorICogQHBhcmFtIGFuaW1hdG9yIFRoZSBhbmltYXRvciB0byB1c2UgZm9yIHRoZSBj b21taXQgYW5pbWF0aW9uLgorICovCisKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBjb250ZXh0TWVudUZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVs ZW1lbnRJbmZvIHdpbGxDb21taXRXaXRoQW5pbWF0b3I6KGlkPFVJQ29udGV4dE1lbnVJbnRlcmFj dGlvbkNvbW1pdEFuaW1hdGluZz4pYW5pbWF0b3IgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9T X1RCQSkpOworCisvKioKKyAqIEBhYnN0cmFjdCBDYWxsZWQgd2hlbiB0aGUgY29udGV4dCBtZW51 IHdpbGwgYmUgcHJlc2VudGVkLgorICoKKyAqIEBwYXJhbSB3ZWJWaWV3IFRoZSB3ZWIgdmlldyBp bnZva2luZyB0aGUgZGVsZWdhdGUgbWV0aG9kLgorICogQHBhcmFtIGVsZW1lbnRJbmZvIFRoZSBl bGVtZW50SW5mbyBmb3IgdGhlIGVsZW1lbnQgdGhlIHVzZXIgaXMgdG91Y2hpbmcuCisgKi8KKwor LSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbnRleHRNZW51V2lsbFByZXNl bnRGb3JFbGVtZW50OihXS0NvbnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50SW5mbyBXS19B UElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CisKKy8qKgorICogQGFic3RyYWN0IENhbGxl ZCB3aGVuIHRoZSBjb250ZXh0IG1lbnUgZW5kcy4KKyAqCisgKiBAcGFyYW0gd2ViVmlldyBUaGUg d2ViIHZpZXcgaW52b2tpbmcgdGhlIGRlbGVnYXRlIG1ldGhvZC4KKyAqIEBwYXJhbSBlbGVtZW50 SW5mbyBUaGUgZWxlbWVudEluZm8gZm9yIHRoZSBlbGVtZW50IHRoZSB1c2VyIGlzIHRvdWNoaW5n LgorICovCisKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVu dURpZEVuZEZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZv IFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKIAogI2VuZGlmIC8vIFRBUkdFVF9P U19JUEhPTkUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLVUlEZWxlZ2F0ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1VJRGVsZWdhdGVQcml2YXRlLmgKaW5kZXggZDY2ZGQ2ZjJjMmVkZjUwYTk3ZmUwNzgxNjk3 Mzk0OWIxMjc3MjQ5ZC4uYTZjNzA4M2VlMDk5ZmZmMjdiYzRlZGNkNzJhMDA4YjI0YjJjZDNmMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0 ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURl bGVnYXRlUHJpdmF0ZS5oCkBAIC0xNDcsMTMgKzE0NywxMyBAQCBzdHJ1Y3QgVUlFZGdlSW5zZXRz OwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWREaXNtaXNzUHJldmll d1ZpZXdDb250cm9sbGVyOihVSVZpZXdDb250cm9sbGVyICopcHJldmlld2VkVmlld0NvbnRyb2xs ZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgid2ViVmlldzpkaXNtaXNzQ29u dGV4dE1lbnU6IiwgaW9zKDkuMCwgV0tfSU9TX1RCQSkpOwogCiAjaWYgVEFSR0VUX09TX0lPUwot Ly8gVGhpcyBuZWVkcyB0byBiZSByZW1vdmVkIG9uY2UgdGhlcmUgaXMgYW4gQVBJIHZlcnNpb24g dG8gY29udGludWUgdG8gZG8gY2FsbGJhY2tzIGZvciBpbWFnZSBlbGVtZW50IGNvbnRleHQgbWVu dXMuCisvLyBUaGlzIG11c3QgYmUga2VwdCB0byBjb250aW51ZSB0byBkbyBjYWxsYmFja3MgZm9y IGltYWdlIGVsZW1lbnQgY29udGV4dCBtZW51cy4KIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgY29udGV4dE1lbnVDb25maWd1cmF0aW9uRm9yRWxlbWVudDooV0tDb250ZXh0 TWVudUVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gY29tcGxldGlvbkhhbmRsZXI6KHZvaWQoXiko VUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKikpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FW QUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwogCi0vLyBUaGVzZSBjYW4gYmUgcmVtb3ZlZCBvbmNl IHRoZXJlIGlzIGFuIEFQSSB2ZXJzaW9uLgotLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICop d2ViVmlldyBjb250ZXh0TWVudUZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAq KWVsZW1lbnRJbmZvIHdpbGxDb21taXRXaXRoQW5pbWF0b3I6KGlkPFVJQ29udGV4dE1lbnVJbnRl cmFjdGlvbkNvbW1pdEFuaW1hdGluZz4pYW5pbWF0b3IgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tf SU9TX1RCQSkpOwotLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0 TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJbmZvICopZWxl bWVudEluZm8gV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwotLSAodm9pZClfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVudURpZEVuZEZvckVsZW1lbnQ6KFdL Q29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIFdLX0FQSV9BVkFJTEFCTEUoaW9z KFdLX0lPU19UQkEpKTsKKy8vIFRoZXNlIGNhbiBiZSByZW1vdmVkIG9uY2UgdGhlIEFQSSB2ZXJz aW9uIGlzIGFkb3B0ZWQgYnkgYWxsIGNsaWVudHMuCistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3IGNvbnRleHRNZW51Rm9yRWxlbWVudDooV0tDb250ZXh0TWVudUVsZW1lbnRJ bmZvICopZWxlbWVudEluZm8gd2lsbENvbW1pdFdpdGhBbmltYXRvcjooaWQ8VUlDb250ZXh0TWVu dUludGVyYWN0aW9uQ29tbWl0QW5pbWF0aW5nPilhbmltYXRvciBXS19BUElfREVQUkVDQVRFRF9X SVRIX1JFUExBQ0VNRU5UKCJ3ZWJWaWV3OmNvbnRleHRNZW51Rm9yRWxlbWVudDp3aWxsQ29tbWl0 V2l0aEFuaW1hdG9yOiIsIGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CistICh2b2lkKV93 ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbnRleHRNZW51V2lsbFByZXNlbnRGb3JFbGVt ZW50OihXS0NvbnRleHRNZW51RWxlbWVudEluZm8gKillbGVtZW50SW5mbyBXS19BUElfREVQUkVD QVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJ3ZWJWaWV3OmNvbnRleHRNZW51V2lsbFByZXNlbnRGb3JF bGVtZW50OiIsIGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CistICh2b2lkKV93ZWJWaWV3 OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNvbnRleHRNZW51RGlkRW5kRm9yRWxlbWVudDooV0tDb250 ZXh0TWVudUVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9S RVBMQUNFTUVOVCgid2ViVmlldzpjb250ZXh0TWVudURpZEVuZEZvckVsZW1lbnQ6IiwgaW9zKFdL X0lPU19UQkEsIFdLX0lPU19UQkEpKTsKICNlbmRpZgogCiAtIChCT09MKV93ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IHNob3dDdXN0b21TaGVldEZvckVsZW1lbnQ6KF9XS0FjdGl2YXRlZEVs ZW1lbnRJbmZvICopZWxlbWVudCBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7Cg==