200791 2019-08-15 15:17:12 -0700 [iOS WK2] Scroll indicators disappear sometimes 2020-04-05 10:27:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue ews-watchlist simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1561783 0 simon.fraser 2019-08-15 15:17:12 -0700 [iOS WK2] Scroll indicators disappear sometimes 1561787 1 376430 simon.fraser 2019-08-15 15:19:36 -0700 Created attachment 376430 Patch 1561788 2 webkit-bug-importer 2019-08-15 15:20:18 -0700 <rdar://problem/54364984> 1561790 3 ews-watchlist 2019-08-15 15:21:49 -0700 Attachment 376430 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/ios/OverflowScrollViewTests.mm:31: Found header this file implements after other header. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1562222 4 376430 thorton 2019-08-16 14:20:37 -0700 Comment on attachment 376430 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376430&action=review > Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.h:41 > +@protocol WKWebKitControlled <NSObject> Not sure about the name, but the concept seems sound. Clearly you should call it <WKView> 😉 1562391 5 376588 simon.fraser 2019-08-16 20:49:15 -0700 Created attachment 376588 Patch 1562394 6 ews-watchlist 2019-08-16 20:51:49 -0700 Attachment 376588 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/ios/OverflowScrollViewTests.mm:31: Found header this file implements after other header. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] ERROR: Tools/TestWebKitAPI/Tests/ios/OverflowScrollViewTests.mm:37: Misplaced OS version check. Please use a named macro in wtf/Platform.h, wtf/FeatureDefines.h, or an appropriate internal file. [build/version_check] [5] Total errors found: 2 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1562477 7 376588 commit-queue 2019-08-17 08:27:45 -0700 Comment on attachment 376588 Patch Clearing flags on attachment: 376588 Committed r248820: <https://trac.webkit.org/changeset/248820> 376430 2019-08-15 15:19:36 -0700 2019-08-16 14:20:37 -0700 Patch bug-200791-20190815151935.patch text/plain 22347 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcwOWY1YzM2MjUxNDI4Njg5 NDczYzk5OGIzOGZkYWFiYjU0YTYwY2QuLjZkOTI1NGM1ZDg2MjZmMzAyMDU3Mzg5MmY0YzViODQ1 M2YyOWMzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDgtMTUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFNjcm9s bCBpbmRpY2F0b3JzIGRpc2FwcGVhciBzb21ldGltZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDc5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgX3dlYl9zZXRTdWJ2aWV3czogcmVwbGFj ZXMgYWxsIG9mIHRoZSB2aWV3cyBzdWJ2aWV3cyB3aXRoIHRoZSBzdXBwbGllZCBhcnJheSwgYnV0 IHRoaXMgYmxvd3MKKyAgICAgICAgYXdheSB2aWV3cyBub3QgbWFuYWdlZCBieSBXZWJLaXQsIGlu Y2x1ZGluZyBVSVNjcm9sbFZpZXdzIHNjcm9sbCBpbmRpY2F0b3JzLiBGaXggYnkgaGF2aW5nCisg ICAgICAgIFdlYktpdC1tYW5hZ2VkIHZpZXdzIGltcGxlbWVudCB0aGUgV0tXZWJLaXRDb250cm9s bGVkIHByb3RvY29sLCBhbmQgb25seSByZW1vdmluZyB2aWV3cworICAgICAgICBpbXBsZW1lbnRp bmcgdGhhdCBwcm90b2NvbC4KKworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVt b3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tOgorICAgICAgICAoLVtVSVZpZXcgX3dlYl9z ZXRTdWJ2aWV3czpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9S ZW1vdGVMYXllclRyZWVWaWV3cy5oOgorCiAyMDE5LTA4LTE0ICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBtX2Jsb2NrUmVjdEZvclRleHRT ZWxlY3Rpb24gKGFsb25nIHdpdGggcmVsYXRlZCBjb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGll ci5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRy ZWVQcm9wZXJ0eUFwcGxpZXIubW0KaW5kZXggY2FmYTVmNmUxMTgzMWQ1YWY1M2YyNzhmYzBiMzlj NmRhOTg3NmFmYi4uZWRhOGZkY2QwNTkxYjIzZTdlYWUzMzZhNTI1MTFjYzg0N2I2ZWI1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy VHJlZVByb3BlcnR5QXBwbGllci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVM YXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tCkBAIC0yOSw2ICsyOSw3 IEBACiAjaW1wb3J0ICJQbGF0Zm9ybUNBQW5pbWF0aW9uUmVtb3RlLmgiCiAjaW1wb3J0ICJQbGF0 Zm9ybUNBTGF5ZXJSZW1vdGUuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZUhvc3QuaCIKKyNp bXBvcnQgIlJlbW90ZUxheWVyVHJlZVZpZXdzLmgiCiAjaW1wb3J0IDxRdWFydHpDb3JlL1F1YXJ0 ekNvcmUuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGxhdGZvcm1DQUZpbHRlcnMuaD4KICNpbXBvcnQg PFdlYkNvcmUvU2Nyb2xsYmFyVGhlbWVNYWMuaD4KQEAgLTY3LDExICs2OCwyNSBAQCAtICh2b2lk KV93ZWJfc2V0U3Vidmlld3M6KE5TQXJyYXkgKiluZXdTdWJ2aWV3cwogICAgIH0KIAogICAgIC8v IFJlbW92ZSB2aWV3cyBhdCB0aGUgZW5kLgorICAgIE5TTXV0YWJsZUFycmF5ICp2aWV3c1RvUmVt b3ZlID0gbmlsOworICAgIGF1dG8gYXBwZW5kVmlld1RvUmVtb3ZlID0gWyZ2aWV3c1RvUmVtb3Zl XShVSVZpZXcgKnZpZXcpIHsKKyAgICAgICAgaWYgKCF2aWV3c1RvUmVtb3ZlKQorICAgICAgICAg ICAgdmlld3NUb1JlbW92ZSA9IFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdOworCisgICAg ICAgIFt2aWV3c1RvUmVtb3ZlIGFkZE9iamVjdDp2aWV3XTsKKyAgICB9OworCiAgICAgTlNVSW50 ZWdlciByZW1haW5pbmdTdWJ2aWV3cyA9IHNlbGYuc3Vidmlld3MuY291bnQ7Ci0gICAgZm9yIChO U1VJbnRlZ2VyIGkgPSBjdXJySW5kZXg7IGkgPCByZW1haW5pbmdTdWJ2aWV3czsgKytpKQotICAg ICAgICBbW3NlbGYuc3Vidmlld3Mgb2JqZWN0QXRJbmRleDpjdXJySW5kZXhdIHJlbW92ZUZyb21T dXBlcnZpZXddOworICAgIGZvciAoTlNVSW50ZWdlciBpID0gY3VyckluZGV4OyBpIDwgcmVtYWlu aW5nU3Vidmlld3M7ICsraSkgeworICAgICAgICBVSVZpZXcgKnN1YnZpZXcgPSBbc2VsZi5zdWJ2 aWV3cyBvYmplY3RBdEluZGV4OmldOworICAgICAgICBpZiAoW3N1YnZpZXcgY29uZm9ybXNUb1By b3RvY29sOkBwcm90b2NvbChXS1dlYktpdENvbnRyb2xsZWQpXSkKKyAgICAgICAgICAgIGFwcGVu ZFZpZXdUb1JlbW92ZShzdWJ2aWV3KTsKKyAgICB9CiAKLSAgICBBU1NFUlQoW3NlbGYuc3Vidmll d3MgaXNFcXVhbFRvQXJyYXk6bmV3U3Vidmlld3NdKTsKKyAgICBpZiAodmlld3NUb1JlbW92ZSkg eworICAgICAgICBbdmlld3NUb1JlbW92ZSBtYWtlT2JqZWN0c1BlcmZvcm1TZWxlY3RvcjpAc2Vs ZWN0b3IocmVtb3ZlRnJvbVN1cGVydmlldyldOworICAgICAgICBbdmlld3NUb1JlbW92ZSByZWxl YXNlXTsKKyAgICB9CiB9CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3Mu aAppbmRleCBjNTA3OTBjMWZmOWYwODY0OGUwOGViYmE3OTM0MGQzMWI4ZmMwN2Y4Li4yMjFhODIw NGE3MTc1OTI1MmYyZWZkN2FkYTY1NTg1NWZjYTIwZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVM YXllclRyZWVWaWV3cy5oCkBAIC0zOCw3ICszOCwxMCBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiBA cHJvdG9jb2wgV0tOYXRpdmVseUludGVyYWN0aWJsZSA8TlNPYmplY3Q+CiBAZW5kCiAKLUBpbnRl cmZhY2UgV0tDb21wb3NpdGluZ1ZpZXcgOiBVSVZpZXcKK0Bwcm90b2NvbCBXS1dlYktpdENvbnRy b2xsZWQgPE5TT2JqZWN0PgorQGVuZAorCitAaW50ZXJmYWNlIFdLQ29tcG9zaXRpbmdWaWV3IDog VUlWaWV3IDxXS1dlYktpdENvbnRyb2xsZWQ+CiBAZW5kCiAKIEBpbnRlcmZhY2UgV0tUcmFuc2Zv cm1WaWV3IDogV0tDb21wb3NpdGluZ1ZpZXcKQEAgLTU2LDE2ICs1OSwxNiBAQCBjbGFzcyBXZWJQ YWdlUHJveHk7CiAKIEBlbmQKIAotQGludGVyZmFjZSBXS1VJUmVtb3RlVmlldyA6IF9VSVJlbW90 ZVZpZXcKK0BpbnRlcmZhY2UgV0tVSVJlbW90ZVZpZXcgOiBfVUlSZW1vdGVWaWV3IDxXS1dlYktp dENvbnRyb2xsZWQ+CiBAZW5kCiAKLUBpbnRlcmZhY2UgV0tCYWNrZHJvcFZpZXcgOiBfVUlCYWNr ZHJvcFZpZXcKK0BpbnRlcmZhY2UgV0tCYWNrZHJvcFZpZXcgOiBfVUlCYWNrZHJvcFZpZXcgPFdL V2ViS2l0Q29udHJvbGxlZD4KIEBlbmQKIAotQGludGVyZmFjZSBXS0NoaWxkU2Nyb2xsVmlldyA6 IFVJU2Nyb2xsVmlldworQGludGVyZmFjZSBXS0NoaWxkU2Nyb2xsVmlldyA6IFVJU2Nyb2xsVmll dyA8V0tXZWJLaXRDb250cm9sbGVkPgogQGVuZAogCi1AaW50ZXJmYWNlIFdLRW1iZWRkZWRWaWV3 IDogVUlWaWV3CitAaW50ZXJmYWNlIFdLRW1iZWRkZWRWaWV3IDogVUlWaWV3IDxXS1dlYktpdENv bnRyb2xsZWQ+CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEVtYmVkZGVkVmlld0lEOihXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpFbWJlZGRlZFZpZXdJRCllbWJlZGRlZFZpZXdJRDsKIApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJhNTlhNzI1 YTBkNzFjZTcwYzAxYjFhMDg3ODZiZmEyMmZmODQzMTcuLjhkMmQwNTRjZDc1NjQyZWViZjExYTU1 MjA1ZGYwNDdiNDdkZTM1ZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOS0wOC0xNSAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIFdLMl0gU2Nyb2xsIGluZGlj YXRvcnMgZGlzYXBwZWFyIHNvbWV0aW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdHMgdGhhdCB0ZXN0IHRoYXQgc2Nyb2xsIGluZGljYXRvcnMg c3Vydml2ZSBzdWJ2aWV3IHJlcGxhY2VtZW50LCBhbmQgdGhhdAorICAgICAgICBhIGN1c3RvbSB2 aWV3IGFsc28gc3Vydml2ZXMgc3VidmlldyByZXBsYWNlbWVudC4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL092ZXJmbG93U2Nyb2xsVmlld1Rlc3RzLm1tOiBB ZGRlZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAqIFRlc3RXZWJL aXRBUEkvY29jb2EvVGVzdFdLV2ViVmlldy5oOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvY29j b2EvVGVzdFdLV2ViVmlldy5tbToKKyAgICAgICAgKC1bVGVzdFdLV2ViVmlldyBwZXJmb3JtQWZ0 ZXJMb2FkaW5nOl0pOgorICAgICAgICAoLVtVSVZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6 XSk6CisgICAgICAgICgtW1VJVmlldyB3a0ZpcnN0U3Vidmlld1dpdGhCb3VuZHNTaXplOl0pOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvaW9zL2NvbXBvc2l0ZWQuaHRtbDogQWRkZWQuCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9pb3Mvb3ZlcmZsb3ctc2Nyb2xsLmh0bWw6IEFkZGVkLgorCiAy MDE5LTA4LTE0ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10oUkVHUkVTU0lPTjogcjIwMDQ4Nyk6IFdlYktpdC5SZXF1ZXN0QWN0aXZh dGVkRWxlbWVudEluZm9Gb3JSb3RhdGVkSW1hZ2UgZmFpbHMgb24gaU9TIDEzCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCmluZGV4IGQ4YTRiYTk0ZGNjOGRmY2Y3MWUxYTAxOTdmYTI5YzFlYWQ3OTg5NzMu LmY3OTgwZTI5MjljZjE3NjY5ZTliYmRiMjU5MDBlNTljY2IxZmU0MWYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCkBAIC02Nyw4ICs2NywxMSBAQAogCQkwRUJCQ0M2NjFGRkY5RTBDMDBGQTQyQUIg LyogcG9wLXVwLWNoZWNrLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMEVCQkNDNjUxRkZGOURDRTAwRkE0MkFCIC8qIHBvcC11cC1jaGVj ay5odG1sICovOyB9OwogCQkwRjEzOUU3NzFBNDIzQTVCMDBGNTkwRjUgLyogV2Vha09iakNQdHIu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjEzOUU3 NTFBNDIzQTUzMDBGNTkwRjUgLyogV2Vha09iakNQdHIubW0gKi87IH07CiAJCTBGMTM5RTc5MUE0 MjQ1NzAwMEY1OTBGNSAvKiBQbGF0Zm9ybVV0aWxpdGllc0NvY29hLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYxMzlFNzIxQTQyM0EyQjAwRjU5MEY1 IC8qIFBsYXRmb3JtVXRpbGl0aWVzQ29jb2EubW0gKi87IH07CisJCTBGMTZCRUQ4MjMwNEExRjMw MEI0QTE2NyAvKiBjb21wb3NpdGVkLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYxNkJFRDcyMzA0QTFEMTAwQjRBMTY3IC8qIGNvbXBv c2l0ZWQuaHRtbCAqLzsgfTsKIAkJMEYyQzIwQjgxRENENTQ1MDAwNTQyRDlFIC8qIFRpbWUuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYyQzIwQjcx RENENTQ0ODAwNTQyRDlFIC8qIFRpbWUuY3BwICovOyB9OwogCQkwRjMwQ0I1QzFGQ0UxNzk2MDA0 QjUzMjMgLyogQ29uY3VycmVudFB0ckhhc2hTZXQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYzMENCNUIxRkNFMTc5MjAwNEI1MzIzIC8qIENvbmN1 cnJlbnRQdHJIYXNoU2V0LmNwcCAqLzsgfTsKKwkJMEYzNDA3NzYyMzAzN0ZEQzAwNjBBMUEwIC8q IE92ZXJmbG93U2Nyb2xsVmlld1Rlc3RzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMEYzNDA3NzUyMzAzN0ZEQzAwNjBBMUEwIC8qIE92ZXJmbG93U2Ny b2xsVmlld1Rlc3RzLm1tICovOyB9OworCQkwRjM0MDc3OTIzMDM4Mjg3MDA2MEExQTAgLyogb3Zl cmZsb3ctc2Nyb2xsLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMEYzNDA3NzcyMzAzODI1NDAwNjBBMUEwIC8qIG92ZXJmbG93LXNjcm9s bC5odG1sICovOyB9OwogCQkwRjNCOTRBNzFBNzcyNjc0MDBERTMyNzIgLyogV0tXZWJWaWV3RXZh bHVhdGVKYXZhU2NyaXB0Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMEYzQjk0QTUxQTc3MjY2QzAwREUzMjcyIC8qIFdLV2ViVmlld0V2YWx1YXRlSmF2 YVNjcmlwdC5tbSAqLzsgfTsKIAkJMEY0RkZBOUUxRUQzQUE4NTAwRjcxMTFGIC8qIFNuYXBzaG90 VmlhUmVuZGVySW5Db250ZXh0Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMEY0RkZBOUQxRUQzQUE4NTAwRjcxMTFGIC8qIFNuYXBzaG90VmlhUmVuZGVy SW5Db250ZXh0Lm1tICovOyB9OwogCQkwRjU2NTFGNzFGQ0U0RERDMDAzMTBGQkMgLyogTm9IaXN0 b3J5SXRlbVNjcm9sbFRvRnJhZ21lbnQubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAwRjU2NTFGNjFGQ0U0RERCMDAzMTBGQkMgLyogTm9IaXN0b3J5SXRl bVNjcm9sbFRvRnJhZ21lbnQubW0gKi87IH07CkBAIC0xMTUyLDYgKzExNTUsNyBAQAogCQkJCTlC MjcwRkVFMUREQzJDMEIwMDJENTNGMyAvKiBjbG9zZWQtc2hhZG93LXRyZWUtdGVzdC5odG1sIGlu IENvcHkgUmVzb3VyY2VzICovLAogCQkJCTlCQUUxNzdCMjJFMkJCRkIwMERGMzA5OCAvKiBjb2Nv YS13cml0ZXItbWFya3VwLXdpdGgtc3lzdGVtLWZvbnRzLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJRTUwMzZGNzgyMTFCQzI1NDAwQkZEQkUyIC8qIGNvbG9yLWRyb3AuaHRtbCBpbiBD b3B5IFJlc291cmNlcyAqLywKKwkJCQkwRjE2QkVEODIzMDRBMUYzMDBCNEExNjcgLyogY29tcG9z aXRlZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0QjgyNUQ4MUVGNERCRkIwMDZF NDE3RiAvKiBjb21wcmVzc2VkLWZpbGVzLnppcCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk1 QzlFNTY4NzFERjkxNEFFMDBDOUVFMzMgLyogY29udGVudEJsb2NrZXJDaGVjay5odG1sIGluIENv cHkgUmVzb3VyY2VzICovLAogCQkJCUY0NjlGQjI0MUYwMTgwNEIwMDQwMTUzOSAvKiBjb250ZW50 ZWRpdGFibGUtYW5kLXRhcmdldC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMTM0MCw2 ICsxMzQ0LDcgQEAKIAkJCQk0NjhCQzQ1NTIyNjUzQTEwMDBBMzZDOTYgLyogb3Blbi13aW5kb3ct dGhlbi13cml0ZS10by1pdC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTkzMUMyODFF MjJCQzU3OUEwMDFEOThDNCAvKiBvcGVuZGF0YWJhc2UtYWx3YXlzLWV4aXN0cy5odG1sIGluIENv cHkgUmVzb3VyY2VzICovLAogCQkJCTI5MEE5QkI5MTczNUY2MzgwMEQ3MUJCQyAvKiBPcGVuTmV3 V2luZG93Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCisJCQkJMEYzNDA3NzkyMzAzODI4NzAw NjBBMUEwIC8qIG92ZXJmbG93LXNjcm9sbC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ CTgzMTQ4QjA5MjAyQUM3OEQwMEJBREU5OSAvKiBvdmVycmlkZS1idWlsdGlucy10ZXN0Lmh0bWwg aW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQ0VCQ0ExMzkxRTNBODA3QTAwQzczMjkzIC8qIHBh Z2Utd2l0aC1jc3AtaWZyYW1lLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQ0VCQ0Ex MzgxRTNBODA3QTAwQzczMjkzIC8qIHBhZ2Utd2l0aC1jc3AuaHRtbCBpbiBDb3B5IFJlc291cmNl cyAqLywKQEAgLTE0NDksOSArMTQ1NCwxMiBAQAogCQkwRUJCQ0M2NTFGRkY5RENFMDBGQTQyQUIg LyogcG9wLXVwLWNoZWNrLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAicG9wLXVw LWNoZWNrLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjEzOUU3MjFBNDIz QTJCMDBGNTkwRjUgLyogUGxhdGZvcm1VdGlsaXRpZXNDb2NvYS5tbSAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IFBsYXRmb3JtVXRpbGl0aWVzQ29jb2EubW07IHBhdGgg PSBjb2NvYS9QbGF0Zm9ybVV0aWxpdGllc0NvY29hLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkwRjEzOUU3NTFBNDIzQTUzMDBGNTkwRjUgLyogV2Vha09iakNQdHIubW0gKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBXZWFrT2JqQ1B0ci5tbTsgcGF0aCA9 IGNvY29hL1dlYWtPYmpDUHRyLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkwRjE2 QkVENzIzMDRBMUQxMDBCNEExNjcgLyogY29tcG9zaXRlZC5odG1sICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBuYW1lID0gY29tcG9z aXRlZC5odG1sOyBwYXRoID0gaW9zL2NvbXBvc2l0ZWQuaHRtbDsgc291cmNlVHJlZSA9IFNPVVJD RV9ST09UOyB9OwogCQkwRjE3QkJENDE1QUY2QzREMDA3QUI3NTMgLyogV2ViQ29yZVN0YXRpc3Rp Y3NXaXRoTm9XZWJQcm9jZXNzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFdlYkNvcmVTdGF0aXN0aWNzV2l0aE5vV2ViUHJvY2Vzcy5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTBGMkMyMEI3MURDRDU0NDgwMDU0MkQ5RSAvKiBUaW1lLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFRpbWUuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkwRjMwQ0I1QjFGQ0UxNzkyMDA0QjUzMjMgLyogQ29uY3VycmVudFB0 ckhhc2hTZXQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ29uY3Vy cmVudFB0ckhhc2hTZXQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkwRjM0MDc3 NTIzMDM3RkRDMDA2MEExQTAgLyogT3ZlcmZsb3dTY3JvbGxWaWV3VGVzdHMubW0gKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBPdmVyZmxvd1Njcm9sbFZpZXdUZXN0cy5t bTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMEYzNDA3NzcyMzAzODI1NDAwNjBBMUEw IC8qIG92ZXJmbG93LXNjcm9sbC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBuYW1lID0gIm92 ZXJmbG93LXNjcm9sbC5odG1sIjsgcGF0aCA9ICJpb3Mvb3ZlcmZsb3ctc2Nyb2xsLmh0bWwiOyBz b3VyY2VUcmVlID0gU09VUkNFX1JPT1Q7IH07CiAJCTBGM0I5NEE1MUE3NzI2NkMwMERFMzI3MiAv KiBXS1dlYlZpZXdFdmFsdWF0ZUphdmFTY3JpcHQubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5vYmpjcHA7IHBhdGggPSBXS1dlYlZpZXdFdmFsdWF0ZUphdmFTY3JpcHQubW07IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGNEZGQTlEMUVEM0FBODUwMEY3MTExRiAvKiBTbmFwc2hv dFZpYVJlbmRlckluQ29udGV4dC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg cGF0aCA9IFNuYXBzaG90VmlhUmVuZGVySW5Db250ZXh0Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkwRjRGRkFBMDFFRDNEMERFMDBGNzExMUYgLyogSW1hZ2VJTy5mcmFtZXdvcmsg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVy LmZyYW1ld29yazsgbmFtZSA9IEltYWdlSU8uZnJhbWV3b3JrOyBwYXRoID0gU3lzdGVtL0xpYnJh cnkvRnJhbWV3b3Jrcy9JbWFnZUlPLmZyYW1ld29yazsgc291cmNlVHJlZSA9IFNES1JPT1Q7IH07 CkBAIC0zMDMxLDYgKzMwMzksNyBAQAogCQkJCUNEQTkzREFDMjJGNEVDMjIwMDQ5MEE2OSAvKiBG dWxsc2NyZWVuVG91Y2hTZWNoZXVyaXN0aWNUZXN0cy5jcHAgKi8sCiAJCQkJRjQ1RTE1NzIyMTEy Q0UyOTAwMzA3RTgyIC8qIEtleWJvYXJkSW5wdXRUZXN0c0lPUy5tbSAqLywKIAkJCQk3NTYwOTE3 NzE5MjU5QzU5MDA5RUYwNkUgLyogTWVtb3J5Q2FjaGVBZGRJbWFnZVRvQ2FjaGVJT1MubW0gKi8s CisJCQkJMEYzNDA3NzUyMzAzN0ZEQzAwNjBBMUEwIC8qIE92ZXJmbG93U2Nyb2xsVmlld1Rlc3Rz Lm1tICovLAogCQkJCUY0NjRBRjkxMjBCQjY2RUEwMDdGOUIxOCAvKiBSZW5kZXJpbmdQcm9ncmVz c1Rlc3RzLm1tICovLAogCQkJCUY0Qzg3OTdFMjA1OUQ4RDMwMDlDRDAwQiAvKiBTY3JvbGxWaWV3 SW5zZXRUZXN0cy5tbSAqLywKIAkJCQkwRkYxMTM0RDIyRDY4Njc5MDA5QTgxREEgLyogU2Nyb2xs Vmlld1Njcm9sbGFiaWxpdHlUZXN0cy5tbSAqLywKQEAgLTMzMjQsNiArMzMzMyw4IEBACiAJCUEx QzRGQjZGMUJBQ0NFRkEwMDM3NDJEMCAvKiBSZXNvdXJjZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhH cm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTBGMTZCRUQ3MjMwNEExRDEwMEI0QTE2NyAvKiBj b21wb3NpdGVkLmh0bWwgKi8sCisJCQkJMEYzNDA3NzcyMzAzODI1NDAwNjBBMUEwIC8qIG92ZXJm bG93LXNjcm9sbC5odG1sICovLAogCQkJCUExQzRGQjcyMUJBQ0QxQjcwMDM3NDJEMCAvKiBwYWdl cy5wYWdlcyAqLywKIAkJCQlDRTZFODFBMzIwQTkzM0I4MDBFMkM4MEYgLyogc2V0LXRpbWVvdXQt ZnVuY3Rpb24uaHRtbCAqLywKIAkJCSk7CkBAIC00NTcyLDYgKzQ1ODMsNyBAQAogCQkJCTM3QTIy QUE3MURDQUEyNzIwMEFGQkZDNCAvKiBPYnNlcnZlZFJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzQWZ0 ZXJDcmFzaC5tbSBpbiBTb3VyY2VzICovLAogCQkJCTJENzAwNTk5MjFFREE0RDAwMDM0NjNDQiAv KiBPZmZzY3JlZW5XaW5kb3cubW0gaW4gU291cmNlcyAqLywKIAkJCQk3Q0NFN0YyNTFBNDExQUY2 MDA0NDdDNEMgLyogT3BlbkFuZENsb3NlV2luZG93Lm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMEYz NDA3NzYyMzAzN0ZEQzAwNjBBMUEwIC8qIE92ZXJmbG93U2Nyb2xsVmlld1Rlc3RzLm1tIGluIFNv dXJjZXMgKi8sCiAJCQkJQ0VCQ0ExMkYxRTNBNjYwMTAwQzczMjkzIC8qIE92ZXJyaWRlQ29udGVu dFNlY3VyaXR5UG9saWN5Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMkRBMjU4NkYyMjVDNjdEQzAw QjQ1QzFDIC8qIE92ZXJyaWRlVmlld3BvcnRBcmd1bWVudHMubW0gaW4gU291cmNlcyAqLywKIAkJ CQk3Q0NCNERBOTFDODNBRTczMDBDQzY5MTggLyogUGFnZUdyb3VwLmNwcCBpbiBTb3VyY2VzICov LApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvT3ZlcmZsb3dTY3Jv bGxWaWV3VGVzdHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9PdmVyZmxvd1Nj cm9sbFZpZXdUZXN0cy5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZWFjNzIxNjFlNmJlOTFlNzA1NGVhM2FhZDA5 MDQ1NDZiOWRlMmYwCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9pb3MvT3ZlcmZsb3dTY3JvbGxWaWV3VGVzdHMubW0KQEAgLTAsMCArMSw5OSBAQAorLyoKKyAq IENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgor ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJ VFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G CisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisK KyNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisjaW1wb3J0ICJUZXN0LmgiCisjaW1wb3J0 ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCisjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCisj aW1wb3J0ICJVSUtpdFNQSS5oIgorI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld1ByaXZhdGUuaD4K KworbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgeworCitURVNUKE92ZXJmbG93U2Nyb2xsVmlld1Rl c3RzLCBDb250ZW50Q2hhbmdlTWFpbnRhaW5zU2Nyb2xsYmFycykKK3sKKyAgICBhdXRvIHdlYlZp ZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXRdKTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFs bG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRp b246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIFJldGFpblB0cjxOU1VSTD4g dGVzdFVSTCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJvdmVyZmxv dy1zY3JvbGwiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0 QVBJLnJlc291cmNlcyJdOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6dGVzdFVSTC5nZXQoKV1dOworICAgIFt3ZWJWaWV3IF90ZXN0X3dhaXRG b3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRh dGlvblVwZGF0ZV07CisKKyAgICBVSVZpZXcgKmNoaWxkU2Nyb2xsVmlldyA9IFt3ZWJWaWV3IHdr Rmlyc3RTdWJ2aWV3V2l0aENsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKEAiV0tDaGlsZFNjcm9sbFZp ZXciKV07CisgICAgRVhQRUNUX05PVF9OVUxMKGNoaWxkU2Nyb2xsVmlldyk7CisKKyAgICBVSVZp ZXcgKnNjcm9sbGJhciA9IFtjaGlsZFNjcm9sbFZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6 TlNDbGFzc0Zyb21TdHJpbmcoQCJfVUlTY3JvbGxWaWV3U2Nyb2xsSW5kaWNhdG9yIildOworICAg IEVYUEVDVF9OT1RfTlVMTChzY3JvbGxiYXIpOworCisgICAgYm9vbCBjb250ZW50Q2hhbmdlZCA9 IGZhbHNlOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAImNoYW5nZVNjcm9sbGVy U3Vidmlld3MoKSIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICpl cnJvcikgeworICAgICAgICBjb250ZW50Q2hhbmdlZCA9IHRydWU7CisgICAgfV07CisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZjb250ZW50Q2hhbmdlZCk7CisgICAgW3dlYlZpZXcgd2Fp dEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworCisgICAgY2hpbGRTY3JvbGxWaWV3ID0gW3dl YlZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJXS0NoaWxk U2Nyb2xsVmlldyIpXTsKKyAgICBFWFBFQ1RfTk9UX05VTEwoY2hpbGRTY3JvbGxWaWV3KTsKKwor ICAgIHNjcm9sbGJhciA9IFtjaGlsZFNjcm9sbFZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6 TlNDbGFzc0Zyb21TdHJpbmcoQCJfVUlTY3JvbGxWaWV3U2Nyb2xsSW5kaWNhdG9yIildOworICAg IEVYUEVDVF9OT1RfTlVMTChzY3JvbGxiYXIpOworfQorCitURVNUKE92ZXJmbG93U2Nyb2xsVmll d1Rlc3RzLCBDb21wb3NpdGluZ0NoYW5nZU1haW50YWluc0N1c3RvbVZpZXcpCit7CisgICAgYXV0 byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9u IGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25m aWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBSZXRhaW5QdHI8 TlNVUkw+IHRlc3RVUkwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAi Y29tcG9zaXRlZCIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJL aXRBUEkucmVzb3VyY2VzIl07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDp0ZXN0VVJMLmdldCgpXV07CisgICAgW3dlYlZpZXcgX3Rlc3Rfd2Fp dEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2Vu dGF0aW9uVXBkYXRlXTsKKworICAgIFVJVmlldyAqY29tcG9zaXRpbmdWaWV3ID0gW3dlYlZpZXcg d2tGaXJzdFN1YnZpZXdXaXRoQm91bmRzU2l6ZTpDR1NpemVNYWtlKDIwMCwgMjAwKV07CisgICAg RVhQRUNUX05PVF9OVUxMKGNvbXBvc2l0aW5nVmlldyk7CisKKyAgICBhdXRvIGN1c3RvbVZpZXcg PSBhZG9wdE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMjAsIDIw LCAyMDAsIDEwMCldKTsKKyAgICBbY29tcG9zaXRpbmdWaWV3IGFkZFN1YnZpZXc6Y3VzdG9tVmll dy5nZXQoKV07CisKKyAgICBib29sIGNvbnRlbnRDaGFuZ2VkID0gZmFsc2U7CisgICAgW3dlYlZp ZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYXBwbHlDaGFuZ2UoKSIgY29tcGxldGlvbkhhbmRsZXI6 IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBjb250ZW50Q2hhbmdl ZCA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZjb250ZW50 Q2hhbmdlZCk7CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwor CisgICAgRVhQRUNUX05PVF9OVUxMKFtjdXN0b21WaWV3IHN1cGVydmlld10pOworfQorCit9IC8v IG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCisKKyNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZ KQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0V0tXZWJWaWV3Lmgg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dlYlZpZXcuaAppbmRleCBmMGZlZDVk OGY4YjQ0MGZiOTRjZTIzZjE0ZWVkNzNlYzc2NmNmZTA0Li5kNzQ1ZDdlYTg2M2E3ZTlhNTFhNzJh YTkyOGQxM2I2OTIzZDEyNmNjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29h L1Rlc3RXS1dlYlZpZXcuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dl YlZpZXcuaApAQCAtODIsNiArODIsMTMgQEAKIC0gKHZvaWQpYWRkVG9UZXN0V2luZG93OwogQGVu ZAogCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKK0BpbnRlcmZhY2UgVUlWaWV3IChXS1Rlc3Rp bmdVSVZpZXdVdGlsaXRpZXMpCistIChVSVZpZXcgKil3a0ZpcnN0U3Vidmlld1dpdGhDbGFzczoo Q2xhc3MpdGFyZ2V0Q2xhc3M7CistIChVSVZpZXcgKil3a0ZpcnN0U3Vidmlld1dpdGhCb3VuZHNT aXplOihDR1NpemUpc2l6ZTsKK0BlbmQKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyA6IFVJVmlldwogQGVuZApkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0V0tXZWJWaWV3Lm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9jb2NvYS9UZXN0V0tXZWJWaWV3Lm1tCmluZGV4IDU0NmNhNmUyMjJkOWZlYTgxY2U3 YmU0ZTJjMmQzOTg1YzViNDRmMGYuLmM0YmFjZDA1M2MzY2YzZTQ3ODQzOTQyOGNiMTM0NDNjYmZh OGM3ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvVGVzdFdLV2ViVmll dy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dlYlZpZXcubW0KQEAg LTQxMiw3ICs0MTIsOCBAQCAtICh2b2lkKXdhaXRGb3JNZXNzYWdlOihOU1N0cmluZyAqKW1lc3Nh Z2UKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZVdhaXRpbmcpOwogfQogCi0t ICh2b2lkKXBlcmZvcm1BZnRlckxvYWRpbmc6KGRpc3BhdGNoX2Jsb2NrX3QpYWN0aW9ucyB7Cist ICh2b2lkKXBlcmZvcm1BZnRlckxvYWRpbmc6KGRpc3BhdGNoX2Jsb2NrX3QpYWN0aW9ucworewog ICAgIFRlc3RNZXNzYWdlSGFuZGxlciAqaGFuZGxlciA9IFtbVGVzdE1lc3NhZ2VIYW5kbGVyIGFs bG9jXSBpbml0XTsKICAgICBbaGFuZGxlciBhZGRNZXNzYWdlOkAibG9hZGVkIiB3aXRoSGFuZGxl cjphY3Rpb25zXTsKIApAQCAtNjM5LDQgKzY0MCwzOSBAQCAtICh2b2lkKXR5cGVDaGFyYWN0ZXI6 KGNoYXIpY2hhcmFjdGVyCiB9CiAKIEBlbmQKLSNlbmRpZgorI2VuZGlmIC8vIFBMQVRGT1JNKE1B QykKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCitAaW1wbGVtZW50YXRpb24gVUlWaWV3IChX S1Rlc3RpbmdVSVZpZXdVdGlsaXRpZXMpCisKKy0gKFVJVmlldyAqKXdrRmlyc3RTdWJ2aWV3V2l0 aENsYXNzOihDbGFzcyl0YXJnZXRDbGFzcworeworICAgIGZvciAoVUlWaWV3ICp2aWV3IGluIHNl bGYuc3Vidmlld3MpIHsKKyAgICAgICAgaWYgKFt2aWV3IGlzS2luZE9mQ2xhc3M6dGFyZ2V0Q2xh c3NdKQorICAgICAgICAgICAgcmV0dXJuIHZpZXc7CisgICAgCisgICAgICAgIFVJVmlldyAqZm91 bmRTdWJ2aWV3ID0gW3ZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6dGFyZ2V0Q2xhc3NdOwor ICAgICAgICBpZiAoZm91bmRTdWJ2aWV3KQorICAgICAgICAgICAgcmV0dXJuIGZvdW5kU3Vidmll dzsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIG5pbDsKK30KKworLSAoVUlWaWV3ICopd2tGaXJz dFN1YnZpZXdXaXRoQm91bmRzU2l6ZTooQ0dTaXplKXNpemUKK3sKKyAgICBmb3IgKFVJVmlldyAq dmlldyBpbiBzZWxmLnN1YnZpZXdzKSB7CisgICAgICAgIGlmIChDR1NpemVFcXVhbFRvU2l6ZShb dmlldyBib3VuZHNdLnNpemUsIHNpemUpKQorICAgICAgICAgICAgcmV0dXJuIHZpZXc7CisgICAg CisgICAgICAgIFVJVmlldyAqZm91bmRTdWJ2aWV3ID0gW3ZpZXcgd2tGaXJzdFN1YnZpZXdXaXRo Qm91bmRzU2l6ZTpzaXplXTsKKyAgICAgICAgaWYgKGZvdW5kU3VidmlldykKKyAgICAgICAgICAg IHJldHVybiBmb3VuZFN1YnZpZXc7CisgICAgfQorICAgIAorICAgIHJldHVybiBuaWw7Cit9CisK K0BlbmQKKworI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL2lvcy9jb21wb3NpdGVkLmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L2lvcy9jb21wb3NpdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGI0NjMxMDVjMzEwY2Q1YzcxYWFjNjRh MjllMDBlOThlOWVhZjAwNAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv aW9zL2NvbXBvc2l0ZWQuaHRtbApAQCAtMCwwICsxLDQyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+CisgICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRl dmljZS13aWR0aCI+CisgICAgPHN0eWxlPgorICAgICAgICAqIHsKKyAgICAgICAgICAgIGJveC1z aXppbmc6IGJvcmRlci1ib3g7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5jb250YWlu ZXIgeworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAyMDBw eDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgICB9CisKKyAg ICAgICAgLmJveCB7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBoZWln aHQ6IDEwMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgICAgICAg fQorICAgICAgICAKKyAgICAgICAgYm9keS5jaGFuZ2VkIC5ib3guZGlzYXBwZWFyIHsKKyAgICAg ICAgICAgIGRpc3BsYXk6IG5vbmU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5jb21w b3NpdGVkIHsKKyAgICAgICAgICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAg fQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gYXBwbHlDaGFu Z2UoKQorICAgICAgICB7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQo J2NoYW5nZWQnKTsKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cisg ICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIGNvbXBvc2l0ZWQiPgorICAgICAgICA8ZGl2IGNsYXNz PSJjb21wb3NpdGVkIGRpc2FwcGVhciBib3giPmJveDwvZGl2PgorICAgIDwvZGl2PgorPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3Mvb3ZlcmZsb3ct c2Nyb2xsLmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9vdmVyZmxvdy1zY3JvbGwuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi42YjJmYTVkYmZmMDI0MzA3ZDE1YjhlNGExNzRiYjRjNTNiZGQ5OWRkCi0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3Mvb3ZlcmZsb3ctc2Nyb2xs Lmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor ICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgiPgor ICAgIDxzdHlsZT4KKyAgICAgICAgLnNjcm9sbGVyIHsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBw eDsKKyAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBz b2xpZCBibGFjazsKKyAgICAgICAgICAgIG92ZXJmbG93OiBzY3JvbGw7CisgICAgICAgIH0KKyAg ICAgICAgLmNvbnRlbnQgeworICAgICAgICAgICAgd2lkdGg6IDIwMCU7CisgICAgICAgICAgICBo ZWlnaHQ6IDIwMCU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5ib3ggeworICAgICAg ICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAg ICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IC5ib3guYXBwZWFyIHsKKyAgICAgICAgICAgIGRpc3BsYXk6IG5vbmU7CisgICAgICAgIH0KKyAg ICAgICAgLmNvbnRlbnQuY2hhbmdlZCAuYm94LmFwcGVhciB7CisgICAgICAgICAgICBkaXNwbGF5 OiBibG9jazsKKyAgICAgICAgfQorCisgICAgICAgIC5ib3guZGlzYXBwZWFyIHsKKyAgICAgICAg ICAgIGRpc3BsYXk6IGJsb2NrOworICAgICAgICB9CisgICAgICAgIC5jb250ZW50LmNoYW5nZWQg LmJveC5kaXNhcHBlYXIgeworICAgICAgICAgICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgfQor ICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0ZWQgeworICAgICAgICAgICAgdHJhbnNmb3JtOiB0 cmFuc2xhdGVaKDApOworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0PgorICAg ICAgICBmdW5jdGlvbiBjaGFuZ2VTY3JvbGxlclN1YnZpZXdzKCkKKyAgICAgICAgeworICAgICAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Njcm9sbC1jb250ZW50JykuY2xhc3NMaXN0 LmFkZCgnY2hhbmdlZCcpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKyAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIHNjcm9sbGVyIj4KKyAgICAgICAgPGRpdiBp ZD0ic2Nyb2xsLWNvbnRlbnQiIGNsYXNzPSJjb250ZW50Ij4KKyAgICAgICAgICAgIENvbnRlbnQK KyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNvbXBvc2l0ZWQgYm94IGFwcGVhciI+YXBwZWFyPC9k aXY+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGJveCBkaXNhcHBlYXIiPmRp c2FwcGVhcjwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4K 376588 2019-08-16 20:49:15 -0700 2019-08-17 08:27:45 -0700 Patch bug-200791-20190816204914.patch text/plain 22473 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4ODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyZTQ1Nzg0OTY4MzNkMWQ5 OTZkZWVkMjY2M2M0MzVkYTFjN2Y0ZjYuLmNlMjgyZjUzNjJhZGE5NzM3NWUzNDc1Y2FjNzI3Mjhi YTFjZDMzNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDgtMTYgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFNjcm9s bCBpbmRpY2F0b3JzIGRpc2FwcGVhciBzb21ldGltZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDc5MQorCisgICAgICAgIFJldmlld2VkIGJ5IFRp bSBIb3J0b24uCisgICAgICAgIAorICAgICAgICBfd2ViX3NldFN1YnZpZXdzOiByZXBsYWNlcyBh bGwgb2YgdGhlIHZpZXdzIHN1YnZpZXdzIHdpdGggdGhlIHN1cHBsaWVkIGFycmF5LCBidXQgdGhp cyBibG93cworICAgICAgICBhd2F5IHZpZXdzIG5vdCBtYW5hZ2VkIGJ5IFdlYktpdCwgaW5jbHVk aW5nIFVJU2Nyb2xsVmlld3Mgc2Nyb2xsIGluZGljYXRvcnMuIEZpeCBieSBoYXZpbmcKKyAgICAg ICAgV2ViS2l0LW1hbmFnZWQgdmlld3MgaW1wbGVtZW50IHRoZSBXS1dlYktpdENvbnRyb2xsZWQg cHJvdG9jb2wsIGFuZCBvbmx5IHJlbW92aW5nIHZpZXdzCisgICAgICAgIGltcGxlbWVudGluZyB0 aGF0IHByb3RvY29sLgorCisgICAgICAgICogU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW06CisgICAgICAgICgtW1VJVmlldyBfd2ViX3NldFN1 YnZpZXdzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90 ZUxheWVyVHJlZVZpZXdzLmg6CisKIDIwMTktMDgtMTYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KIAogICAgICAgICBEcm9wIFN0b3JhZ2VBcmVhOjpzZXRXb3JrUXVldWUoKSBtZW1i ZXIgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVy VHJlZS9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tCmlu ZGV4IGNhZmE1ZjZlMTE4MzFkNWFmNTNmMjc4ZmMwYjM5YzZkYTk4NzZhZmIuLmU0NzAzNWNjYTFl N2E4ODkyZDFkOTBlYjhiMjE1MjNjZTE0ZGE0MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0K KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJl ZVByb3BlcnR5QXBwbGllci5tbQpAQCAtMjksNiArMjksNyBAQAogI2ltcG9ydCAiUGxhdGZvcm1D QUFuaW1hdGlvblJlbW90ZS5oIgogI2ltcG9ydCAiUGxhdGZvcm1DQUxheWVyUmVtb3RlLmgiCiAj aW1wb3J0ICJSZW1vdGVMYXllclRyZWVIb3N0LmgiCisjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVW aWV3cy5oIgogI2ltcG9ydCA8UXVhcnR6Q29yZS9RdWFydHpDb3JlLmg+CiAjaW1wb3J0IDxXZWJD b3JlL1BsYXRmb3JtQ0FGaWx0ZXJzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Njcm9sbGJhclRoZW1l TWFjLmg+CkBAIC02NywxMSArNjgsMjUgQEAgLSAodm9pZClfd2ViX3NldFN1YnZpZXdzOihOU0Fy cmF5ICopbmV3U3Vidmlld3MKICAgICB9CiAKICAgICAvLyBSZW1vdmUgdmlld3MgYXQgdGhlIGVu ZC4KKyAgICBOU011dGFibGVBcnJheSAqdmlld3NUb1JlbW92ZSA9IG5pbDsKKyAgICBhdXRvIGFw cGVuZFZpZXdUb1JlbW92ZSA9IFsmdmlld3NUb1JlbW92ZV0oVUlWaWV3ICp2aWV3KSB7CisgICAg ICAgIGlmICghdmlld3NUb1JlbW92ZSkKKyAgICAgICAgICAgIHZpZXdzVG9SZW1vdmUgPSBbW05T TXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XTsKKworICAgICAgICBbdmlld3NUb1JlbW92ZSBhZGRP YmplY3Q6dmlld107CisgICAgfTsKKwogICAgIE5TVUludGVnZXIgcmVtYWluaW5nU3Vidmlld3Mg PSBzZWxmLnN1YnZpZXdzLmNvdW50OwotICAgIGZvciAoTlNVSW50ZWdlciBpID0gY3VyckluZGV4 OyBpIDwgcmVtYWluaW5nU3Vidmlld3M7ICsraSkKLSAgICAgICAgW1tzZWxmLnN1YnZpZXdzIG9i amVjdEF0SW5kZXg6Y3VyckluZGV4XSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKKyAgICBmb3IgKE5T VUludGVnZXIgaSA9IGN1cnJJbmRleDsgaSA8IHJlbWFpbmluZ1N1YnZpZXdzOyArK2kpIHsKKyAg ICAgICAgVUlWaWV3ICpzdWJ2aWV3ID0gW3NlbGYuc3Vidmlld3Mgb2JqZWN0QXRJbmRleDppXTsK KyAgICAgICAgaWYgKFtzdWJ2aWV3IGNvbmZvcm1zVG9Qcm90b2NvbDpAcHJvdG9jb2woV0tDb250 ZW50Q29udHJvbGxlZCldKQorICAgICAgICAgICAgYXBwZW5kVmlld1RvUmVtb3ZlKHN1YnZpZXcp OworICAgIH0KIAotICAgIEFTU0VSVChbc2VsZi5zdWJ2aWV3cyBpc0VxdWFsVG9BcnJheTpuZXdT dWJ2aWV3c10pOworICAgIGlmICh2aWV3c1RvUmVtb3ZlKSB7CisgICAgICAgIFt2aWV3c1RvUmVt b3ZlIG1ha2VPYmplY3RzUGVyZm9ybVNlbGVjdG9yOkBzZWxlY3RvcihyZW1vdmVGcm9tU3VwZXJ2 aWV3KV07CisgICAgICAgIFt2aWV3c1RvUmVtb3ZlIHJlbGVhc2VdOworICAgIH0KIH0KIAogQGVu ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9SZW1vdGVMYXllclRyZWVWaWV3cy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3Rl TGF5ZXJUcmVlL2lvcy9SZW1vdGVMYXllclRyZWVWaWV3cy5oCmluZGV4IGM1MDc5MGMxZmY5ZjA4 NjQ4ZTA4ZWJiYTc5MzQwZDMxYjhmYzA3ZjguLjRmODlhOWY3MjkxMTdjZjBhNThmNmY1YWI0YTQ5 YTM4NTc1ZDUyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxh eWVyVHJlZS9pb3MvUmVtb3RlTGF5ZXJUcmVlVmlld3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZUxheWVyVHJlZVZpZXdzLmgKQEAgLTM4 LDcgKzM4LDEwIEBAIGNsYXNzIFdlYlBhZ2VQcm94eTsKIEBwcm90b2NvbCBXS05hdGl2ZWx5SW50 ZXJhY3RpYmxlIDxOU09iamVjdD4KIEBlbmQKIAotQGludGVyZmFjZSBXS0NvbXBvc2l0aW5nVmll dyA6IFVJVmlldworQHByb3RvY29sIFdLQ29udGVudENvbnRyb2xsZWQgPE5TT2JqZWN0PgorQGVu ZAorCitAaW50ZXJmYWNlIFdLQ29tcG9zaXRpbmdWaWV3IDogVUlWaWV3IDxXS0NvbnRlbnRDb250 cm9sbGVkPgogQGVuZAogCiBAaW50ZXJmYWNlIFdLVHJhbnNmb3JtVmlldyA6IFdLQ29tcG9zaXRp bmdWaWV3CkBAIC01NiwxNiArNTksMTYgQEAgY2xhc3MgV2ViUGFnZVByb3h5OwogCiBAZW5kCiAK LUBpbnRlcmZhY2UgV0tVSVJlbW90ZVZpZXcgOiBfVUlSZW1vdGVWaWV3CitAaW50ZXJmYWNlIFdL VUlSZW1vdGVWaWV3IDogX1VJUmVtb3RlVmlldyA8V0tDb250ZW50Q29udHJvbGxlZD4KIEBlbmQK IAotQGludGVyZmFjZSBXS0JhY2tkcm9wVmlldyA6IF9VSUJhY2tkcm9wVmlldworQGludGVyZmFj ZSBXS0JhY2tkcm9wVmlldyA6IF9VSUJhY2tkcm9wVmlldyA8V0tDb250ZW50Q29udHJvbGxlZD4K IEBlbmQKIAotQGludGVyZmFjZSBXS0NoaWxkU2Nyb2xsVmlldyA6IFVJU2Nyb2xsVmlldworQGlu dGVyZmFjZSBXS0NoaWxkU2Nyb2xsVmlldyA6IFVJU2Nyb2xsVmlldyA8V0tDb250ZW50Q29udHJv bGxlZD4KIEBlbmQKIAotQGludGVyZmFjZSBXS0VtYmVkZGVkVmlldyA6IFVJVmlldworQGludGVy ZmFjZSBXS0VtYmVkZGVkVmlldyA6IFVJVmlldyA8V0tDb250ZW50Q29udHJvbGxlZD4KIAogLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoRW1iZWRkZWRWaWV3SUQ6KFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXI6OkVtYmVkZGVkVmlld0lEKWVtYmVkZGVkVmlld0lEOwogCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzcwN2ViYzQxYzBiNjI2MTU3ZTRlY2E2 ZTk3MjE4OTYzMWEzZmY4OS4uMDdhYzQ1ZTE4ZDdiZjRlZmQxYTcxMWJkYWMyZDQ0NjQzMzZjM2Jh ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDE5LTA4LTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBTY3JvbGwgaW5kaWNhdG9ycyBkaXNhcHBlYXIg c29tZXRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDA3OTEKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFRl c3RzIHRoYXQgdGVzdCB0aGF0IHNjcm9sbCBpbmRpY2F0b3JzIHN1cnZpdmUgc3VidmlldyByZXBs YWNlbWVudCwgYW5kIHRoYXQKKyAgICAgICAgYSBjdXN0b20gdmlldyBhbHNvIHN1cnZpdmVzIHN1 YnZpZXcgcmVwbGFjZW1lbnQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL2lvcy9PdmVyZmxvd1Njcm9sbFZpZXdUZXN0cy5tbTogQWRkZWQuCisgICAgICAgIChUZXN0 V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dl YlZpZXcuaDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dlYlZpZXcubW06 CisgICAgICAgICgtW1Rlc3RXS1dlYlZpZXcgcGVyZm9ybUFmdGVyTG9hZGluZzpdKToKKyAgICAg ICAgKC1bVUlWaWV3IHdrRmlyc3RTdWJ2aWV3V2l0aENsYXNzOl0pOgorICAgICAgICAoLVtVSVZp ZXcgd2tGaXJzdFN1YnZpZXdXaXRoQm91bmRzU2l6ZTpdKToKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL2lvcy9jb21wb3NpdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkv aW9zL292ZXJmbG93LXNjcm9sbC5odG1sOiBBZGRlZC4KKwogMjAxOS0wOC0xNiAgSm9obiBXaWxh bmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgSm9obiBXaWxhbmRlciBh cyBXZWJLaXQgUmV2aWV3ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYjQ1OTc4Nzk4Zjcy YzM2NzEzOGViNTJhNjZkMDdkM2IwZDExMDA2OC4uMWIzNWYwZDBiNWRlNTg4NGI2NWFmZWQ3MDQy ZTc1ZmFlNDliZjM2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0 QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTY3LDggKzY3LDExIEBA CiAJCTBFQkJDQzY2MUZGRjlFMEMwMEZBNDJBQiAvKiBwb3AtdXAtY2hlY2suaHRtbCBpbiBDb3B5 IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRUJCQ0M2NTFG RkY5RENFMDBGQTQyQUIgLyogcG9wLXVwLWNoZWNrLmh0bWwgKi87IH07CiAJCTBGMTM5RTc3MUE0 MjNBNUIwMEY1OTBGNSAvKiBXZWFrT2JqQ1B0ci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGMTM5RTc1MUE0MjNBNTMwMEY1OTBGNSAvKiBXZWFrT2Jq Q1B0ci5tbSAqLzsgfTsKIAkJMEYxMzlFNzkxQTQyNDU3MDAwRjU5MEY1IC8qIFBsYXRmb3JtVXRp bGl0aWVzQ29jb2EubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAwRjEzOUU3MjFBNDIzQTJCMDBGNTkwRjUgLyogUGxhdGZvcm1VdGlsaXRpZXNDb2NvYS5t bSAqLzsgfTsKKwkJMEYxNkJFRDgyMzA0QTFGMzAwQjRBMTY3IC8qIGNvbXBvc2l0ZWQuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjE2 QkVENzIzMDRBMUQxMDBCNEExNjcgLyogY29tcG9zaXRlZC5odG1sICovOyB9OwogCQkwRjJDMjBC ODFEQ0Q1NDUwMDA1NDJEOUUgLyogVGltZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAwRjJDMjBCNzFEQ0Q1NDQ4MDA1NDJEOUUgLyogVGltZS5jcHAg Ki87IH07CiAJCTBGMzBDQjVDMUZDRTE3OTYwMDRCNTMyMyAvKiBDb25jdXJyZW50UHRySGFzaFNl dC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjMw Q0I1QjFGQ0UxNzkyMDA0QjUzMjMgLyogQ29uY3VycmVudFB0ckhhc2hTZXQuY3BwICovOyB9Owor CQkwRjM0MDc3NjIzMDM3RkRDMDA2MEExQTAgLyogT3ZlcmZsb3dTY3JvbGxWaWV3VGVzdHMubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjM0MDc3NTIz MDM3RkRDMDA2MEExQTAgLyogT3ZlcmZsb3dTY3JvbGxWaWV3VGVzdHMubW0gKi87IH07CisJCTBG MzQwNzc5MjMwMzgyODcwMDYwQTFBMCAvKiBvdmVyZmxvdy1zY3JvbGwuaHRtbCBpbiBDb3B5IFJl c291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjM0MDc3NzIzMDM4 MjU0MDA2MEExQTAgLyogb3ZlcmZsb3ctc2Nyb2xsLmh0bWwgKi87IH07CiAJCTBGM0I5NEE3MUE3 NzI2NzQwMERFMzI3MiAvKiBXS1dlYlZpZXdFdmFsdWF0ZUphdmFTY3JpcHQubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjNCOTRBNTFBNzcyNjZDMDBE RTMyNzIgLyogV0tXZWJWaWV3RXZhbHVhdGVKYXZhU2NyaXB0Lm1tICovOyB9OwogCQkwRjRGRkE5 RTFFRDNBQTg1MDBGNzExMUYgLyogU25hcHNob3RWaWFSZW5kZXJJbkNvbnRleHQubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjRGRkE5RDFFRDNBQTg1 MDBGNzExMUYgLyogU25hcHNob3RWaWFSZW5kZXJJbkNvbnRleHQubW0gKi87IH07CiAJCTBGNTY1 MUY3MUZDRTREREMwMDMxMEZCQyAvKiBOb0hpc3RvcnlJdGVtU2Nyb2xsVG9GcmFnbWVudC5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGNTY1MUY2MUZD RTREREIwMDMxMEZCQyAvKiBOb0hpc3RvcnlJdGVtU2Nyb2xsVG9GcmFnbWVudC5tbSAqLzsgfTsK QEAgLTExNTMsNiArMTE1Niw3IEBACiAJCQkJOUIyNzBGRUUxRERDMkMwQjAwMkQ1M0YzIC8qIGNs b3NlZC1zaGFkb3ctdHJlZS10ZXN0Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJOUJB RTE3N0IyMkUyQkJGQjAwREYzMDk4IC8qIGNvY29hLXdyaXRlci1tYXJrdXAtd2l0aC1zeXN0ZW0t Zm9udHMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlFNTAzNkY3ODIxMUJDMjU0MDBC RkRCRTIgLyogY29sb3ItZHJvcC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAorCQkJCTBGMTZC RUQ4MjMwNEExRjMwMEI0QTE2NyAvKiBjb21wb3NpdGVkLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJRjRCODI1RDgxRUY0REJGQjAwNkU0MTdGIC8qIGNvbXByZXNzZWQtZmlsZXMuemlw IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTVDOUU1Njg3MURGOTE0QUUwMEM5RUUzMyAvKiBj b250ZW50QmxvY2tlckNoZWNrLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQ2OUZC MjQxRjAxODA0QjAwNDAxNTM5IC8qIGNvbnRlbnRlZGl0YWJsZS1hbmQtdGFyZ2V0Lmh0bWwgaW4g Q29weSBSZXNvdXJjZXMgKi8sCkBAIC0xMzQxLDYgKzEzNDUsNyBAQAogCQkJCTQ2OEJDNDU1MjI2 NTNBMTAwMEEzNkM5NiAvKiBvcGVuLXdpbmRvdy10aGVuLXdyaXRlLXRvLWl0Lmh0bWwgaW4gQ29w eSBSZXNvdXJjZXMgKi8sCiAJCQkJOTMxQzI4MUUyMkJDNTc5QTAwMUQ5OEM0IC8qIG9wZW5kYXRh YmFzZS1hbHdheXMtZXhpc3RzLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJMjkwQTlC QjkxNzM1RjYzODAwRDcxQkJDIC8qIE9wZW5OZXdXaW5kb3cuaHRtbCBpbiBDb3B5IFJlc291cmNl cyAqLywKKwkJCQkwRjM0MDc3OTIzMDM4Mjg3MDA2MEExQTAgLyogb3ZlcmZsb3ctc2Nyb2xsLmh0 bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJODMxNDhCMDkyMDJBQzc4RDAwQkFERTk5IC8q IG92ZXJyaWRlLWJ1aWx0aW5zLXRlc3QuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlD RUJDQTEzOTFFM0E4MDdBMDBDNzMyOTMgLyogcGFnZS13aXRoLWNzcC1pZnJhbWUuaHRtbCBpbiBD b3B5IFJlc291cmNlcyAqLywKIAkJCQlDRUJDQTEzODFFM0E4MDdBMDBDNzMyOTMgLyogcGFnZS13 aXRoLWNzcC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMTQ1MCw5ICsxNDU1LDEyIEBA CiAJCTBFQkJDQzY1MUZGRjlEQ0UwMEZBNDJBQiAvKiBwb3AtdXAtY2hlY2suaHRtbCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJwb3AtdXAtY2hlY2suaHRtbCI7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTBGMTM5RTcyMUE0MjNBMkIwMEY1OTBGNSAvKiBQbGF0Zm9ybVV0aWxp dGllc0NvY29hLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gUGxh dGZvcm1VdGlsaXRpZXNDb2NvYS5tbTsgcGF0aCA9IGNvY29hL1BsYXRmb3JtVXRpbGl0aWVzQ29j b2EubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGMTM5RTc1MUE0MjNBNTMwMEY1 OTBGNSAvKiBXZWFrT2JqQ1B0ci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg bmFtZSA9IFdlYWtPYmpDUHRyLm1tOyBwYXRoID0gY29jb2EvV2Vha09iakNQdHIubW07IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTBGMTZCRUQ3MjMwNEExRDEwMEI0QTE2NyAvKiBjb21w b3NpdGVkLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSB0ZXh0Lmh0bWw7IG5hbWUgPSBjb21wb3NpdGVkLmh0bWw7IHBhdGggPSBpb3MvY29tcG9z aXRlZC5odG1sOyBzb3VyY2VUcmVlID0gU09VUkNFX1JPT1Q7IH07CiAJCTBGMTdCQkQ0MTVBRjZD NEQwMDdBQjc1MyAvKiBXZWJDb3JlU3RhdGlzdGljc1dpdGhOb1dlYlByb2Nlc3MuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViQ29yZVN0YXRpc3RpY3NXaXRoTm9X ZWJQcm9jZXNzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEYyQzIwQjcxRENE NTQ0ODAwNTQyRDlFIC8qIFRpbWUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gVGltZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGMzBDQjVCMUZD RTE3OTIwMDRCNTMyMyAvKiBDb25jdXJyZW50UHRySGFzaFNldC5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDb25jdXJyZW50UHRySGFzaFNldC5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTBGMzQwNzc1MjMwMzdGREMwMDYwQTFBMCAvKiBPdmVyZmxv d1Njcm9sbFZpZXdUZXN0cy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0 aCA9IE92ZXJmbG93U2Nyb2xsVmlld1Rlc3RzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQkwRjM0MDc3NzIzMDM4MjU0MDA2MEExQTAgLyogb3ZlcmZsb3ctc2Nyb2xsLmh0bWwgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSB0ZXh0Lmh0bWw7IG5hbWUgPSAib3ZlcmZsb3ctc2Nyb2xsLmh0bWwiOyBwYXRoID0g Imlvcy9vdmVyZmxvdy1zY3JvbGwuaHRtbCI7IHNvdXJjZVRyZWUgPSBTT1VSQ0VfUk9PVDsgfTsK IAkJMEYzQjk0QTUxQTc3MjY2QzAwREUzMjcyIC8qIFdLV2ViVmlld0V2YWx1YXRlSmF2YVNjcmlw dC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLV2ViVmlld0V2 YWx1YXRlSmF2YVNjcmlwdC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY0RkZB OUQxRUQzQUE4NTAwRjcxMTFGIC8qIFNuYXBzaG90VmlhUmVuZGVySW5Db250ZXh0Lm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU25hcHNob3RWaWFSZW5kZXJJbkNv bnRleHQubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGNEZGQUEwMUVEM0QwREUw MEY3MTExRiAvKiBJbWFnZUlPLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gSW1hZ2VJTy5m cmFtZXdvcms7IHBhdGggPSBTeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL0ltYWdlSU8uZnJhbWV3 b3JrOyBzb3VyY2VUcmVlID0gU0RLUk9PVDsgfTsKQEAgLTMwMzMsNiArMzA0MSw3IEBACiAJCQkJ Q0RBOTNEQUMyMkY0RUMyMjAwNDkwQTY5IC8qIEZ1bGxzY3JlZW5Ub3VjaFNlY2hldXJpc3RpY1Rl c3RzLmNwcCAqLywKIAkJCQlGNDVFMTU3MjIxMTJDRTI5MDAzMDdFODIgLyogS2V5Ym9hcmRJbnB1 dFRlc3RzSU9TLm1tICovLAogCQkJCTc1NjA5MTc3MTkyNTlDNTkwMDlFRjA2RSAvKiBNZW1vcnlD YWNoZUFkZEltYWdlVG9DYWNoZUlPUy5tbSAqLywKKwkJCQkwRjM0MDc3NTIzMDM3RkRDMDA2MEEx QTAgLyogT3ZlcmZsb3dTY3JvbGxWaWV3VGVzdHMubW0gKi8sCiAJCQkJRjQ2NEFGOTEyMEJCNjZF QTAwN0Y5QjE4IC8qIFJlbmRlcmluZ1Byb2dyZXNzVGVzdHMubW0gKi8sCiAJCQkJRjRDODc5N0Uy MDU5RDhEMzAwOUNEMDBCIC8qIFNjcm9sbFZpZXdJbnNldFRlc3RzLm1tICovLAogCQkJCTBGRjEx MzREMjJENjg2NzkwMDlBODFEQSAvKiBTY3JvbGxWaWV3U2Nyb2xsYWJpbGl0eVRlc3RzLm1tICov LApAQCAtMzMyNyw2ICszMzM2LDggQEAKIAkJQTFDNEZCNkYxQkFDQ0VGQTAwMzc0MkQwIC8qIFJl c291cmNlcyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJ MEYxNkJFRDcyMzA0QTFEMTAwQjRBMTY3IC8qIGNvbXBvc2l0ZWQuaHRtbCAqLywKKwkJCQkwRjM0 MDc3NzIzMDM4MjU0MDA2MEExQTAgLyogb3ZlcmZsb3ctc2Nyb2xsLmh0bWwgKi8sCiAJCQkJQTFD NEZCNzIxQkFDRDFCNzAwMzc0MkQwIC8qIHBhZ2VzLnBhZ2VzICovLAogCQkJCUNFNkU4MUEzMjBB OTMzQjgwMEUyQzgwRiAvKiBzZXQtdGltZW91dC1mdW5jdGlvbi5odG1sICovLAogCQkJKTsKQEAg LTQ1NzUsNiArNDU4Niw3IEBACiAJCQkJMzdBMjJBQTcxRENBQTI3MjAwQUZCRkM0IC8qIE9ic2Vy dmVkUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHNBZnRlckNyYXNoLm1tIGluIFNvdXJjZXMgKi8sCiAJ CQkJMkQ3MDA1OTkyMUVEQTREMDAwMzQ2M0NCIC8qIE9mZnNjcmVlbldpbmRvdy5tbSBpbiBTb3Vy Y2VzICovLAogCQkJCTdDQ0U3RjI1MUE0MTFBRjYwMDQ0N0M0QyAvKiBPcGVuQW5kQ2xvc2VXaW5k b3cubW0gaW4gU291cmNlcyAqLywKKwkJCQkwRjM0MDc3NjIzMDM3RkRDMDA2MEExQTAgLyogT3Zl cmZsb3dTY3JvbGxWaWV3VGVzdHMubW0gaW4gU291cmNlcyAqLywKIAkJCQlDRUJDQTEyRjFFM0E2 NjAxMDBDNzMyOTMgLyogT3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kubW0gaW4gU291cmNl cyAqLywKIAkJCQkyREEyNTg2RjIyNUM2N0RDMDBCNDVDMUMgLyogT3ZlcnJpZGVWaWV3cG9ydEFy Z3VtZW50cy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDQ0I0REE5MUM4M0FFNzMwMENDNjkxOCAv KiBQYWdlR3JvdXAuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL2lvcy9PdmVyZmxvd1Njcm9sbFZpZXdUZXN0cy5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvaW9zL092ZXJmbG93U2Nyb2xsVmlld1Rlc3RzLm1tCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjBlZmZjOWFiNTYzNGExMWU1NTgyYmE0NDBhNzA3ODZhZmQzNDAzYzQKLS0tIC9kZXYvbnVsbAor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9PdmVyZmxvd1Njcm9sbFZpZXdUZXN0 cy5tbQpAQCAtMCwwICsxLDEwNSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK KyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwor ICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAq IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIK KworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisKKyNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVz LmgiCisjaW1wb3J0ICJUZXN0LmgiCisjaW1wb3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgi CisjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCisjaW1wb3J0ICJVSUtpdFNQSS5oIgorI2ltcG9y dCA8V2ViS2l0L1dLV2ViVmlld1ByaXZhdGUuaD4KKworI2lmIF9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEzMDAwMAorc3RhdGljIE5TU3RyaW5nICpjb25zdCBVSVNjcm9sbFZp ZXdJbmRpY2F0b3JDbGFzcyA9IEAiX1VJU2Nyb2xsVmlld1Njcm9sbEluZGljYXRvciI7CisjZWxz ZQorc3RhdGljIE5TU3RyaW5nICpjb25zdCBVSVNjcm9sbFZpZXdJbmRpY2F0b3JDbGFzcyA9IEAi VUlJbWFnZVZpZXciOworI2VuZGlmCisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworVEVT VChPdmVyZmxvd1Njcm9sbFZpZXdUZXN0cywgQ29udGVudENoYW5nZU1haW50YWluc1Njcm9sbGJh cnMpCit7CisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZp ZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9w dE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAs IDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisK KyAgICBSZXRhaW5QdHI8TlNVUkw+IHRlc3RVUkwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVS TEZvclJlc291cmNlOkAib3ZlcmZsb3ctc2Nyb2xsIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3Vi ZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXTsKKyAgICBbd2ViVmlldyBsb2Fk UmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnRlc3RVUkwuZ2V0KCldXTsKKyAg ICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisgICAgW3dlYlZp ZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworCisgICAgVUlWaWV3ICpjaGlsZFNj cm9sbFZpZXcgPSBbd2ViVmlldyB3a0ZpcnN0U3Vidmlld1dpdGhDbGFzczpOU0NsYXNzRnJvbVN0 cmluZyhAIldLQ2hpbGRTY3JvbGxWaWV3IildOworICAgIEVYUEVDVF9OT1RfTlVMTChjaGlsZFNj cm9sbFZpZXcpOworCisgICAgVUlWaWV3ICpzY3JvbGxiYXIgPSBbY2hpbGRTY3JvbGxWaWV3IHdr Rmlyc3RTdWJ2aWV3V2l0aENsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKFVJU2Nyb2xsVmlld0luZGlj YXRvckNsYXNzKV07CisgICAgRVhQRUNUX05PVF9OVUxMKHNjcm9sbGJhcik7CisKKyAgICBib29s IGNvbnRlbnRDaGFuZ2VkID0gZmFsc2U7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 OkAiY2hhbmdlU2Nyb2xsZXJTdWJ2aWV3cygpIiBjb21wbGV0aW9uSGFuZGxlcjogWyZdIChpZCBy ZXN1bHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIGNvbnRlbnRDaGFuZ2VkID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmNvbnRlbnRDaGFuZ2VkKTsK KyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisKKyAgICBjaGls ZFNjcm9sbFZpZXcgPSBbd2ViVmlldyB3a0ZpcnN0U3Vidmlld1dpdGhDbGFzczpOU0NsYXNzRnJv bVN0cmluZyhAIldLQ2hpbGRTY3JvbGxWaWV3IildOworICAgIEVYUEVDVF9OT1RfTlVMTChjaGls ZFNjcm9sbFZpZXcpOworCisgICAgc2Nyb2xsYmFyID0gW2NoaWxkU2Nyb2xsVmlldyB3a0ZpcnN0 U3Vidmlld1dpdGhDbGFzczpOU0NsYXNzRnJvbVN0cmluZyhVSVNjcm9sbFZpZXdJbmRpY2F0b3JD bGFzcyldOworICAgIEVYUEVDVF9OT1RfTlVMTChzY3JvbGxiYXIpOworfQorCitURVNUKE92ZXJm bG93U2Nyb2xsVmlld1Rlc3RzLCBDb21wb3NpdGluZ0NoYW5nZU1haW50YWluc0N1c3RvbVZpZXcp Cit7CisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5T KFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgw MCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAg ICBSZXRhaW5QdHI8TlNVUkw+IHRlc3RVUkwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZv clJlc291cmNlOkAiY29tcG9zaXRlZCIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9y eTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDp0ZXN0VVJMLmdldCgpXV07CisgICAgW3dlYlZp ZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOworICAgIFt3ZWJWaWV3IHdhaXRG b3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKworICAgIFVJVmlldyAqY29tcG9zaXRpbmdWaWV3 ID0gW3dlYlZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQm91bmRzU2l6ZTpDR1NpemVNYWtlKDIwMCwg MjAwKV07CisgICAgRVhQRUNUX05PVF9OVUxMKGNvbXBvc2l0aW5nVmlldyk7CisKKyAgICBhdXRv IGN1c3RvbVZpZXcgPSBhZG9wdE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVj dE1ha2UoMjAsIDIwLCAyMDAsIDEwMCldKTsKKyAgICBbY29tcG9zaXRpbmdWaWV3IGFkZFN1YnZp ZXc6Y3VzdG9tVmlldy5nZXQoKV07CisKKyAgICBib29sIGNvbnRlbnRDaGFuZ2VkID0gZmFsc2U7 CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYXBwbHlDaGFuZ2UoKSIgY29tcGxl dGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBj b250ZW50Q2hhbmdlZCA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZjb250ZW50Q2hhbmdlZCk7CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRp b25VcGRhdGVdOworCisgICAgRVhQRUNUX05PVF9OVUxMKFtjdXN0b21WaWV3IHN1cGVydmlld10p OworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCisKKyNlbmRpZiAvLyBQTEFURk9S TShJT1NfRkFNSUxZKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0 V0tXZWJWaWV3LmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dlYlZpZXcuaApp bmRleCBmMGZlZDVkOGY4YjQ0MGZiOTRjZTIzZjE0ZWVkNzNlYzc2NmNmZTA0Li5kNzQ1ZDdlYTg2 M2E3ZTlhNTFhNzJhYTkyOGQxM2I2OTIzZDEyNmNjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL2NvY29hL1Rlc3RXS1dlYlZpZXcuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2Nv Y29hL1Rlc3RXS1dlYlZpZXcuaApAQCAtODIsNiArODIsMTMgQEAKIC0gKHZvaWQpYWRkVG9UZXN0 V2luZG93OwogQGVuZAogCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKK0BpbnRlcmZhY2UgVUlW aWV3IChXS1Rlc3RpbmdVSVZpZXdVdGlsaXRpZXMpCistIChVSVZpZXcgKil3a0ZpcnN0U3Vidmll d1dpdGhDbGFzczooQ2xhc3MpdGFyZ2V0Q2xhc3M7CistIChVSVZpZXcgKil3a0ZpcnN0U3Vidmll d1dpdGhCb3VuZHNTaXplOihDR1NpemUpc2l6ZTsKK0BlbmQKKyNlbmRpZgorCiAjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyA6IFVJVmlldwogQGVuZApk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0V0tXZWJWaWV3Lm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0V0tXZWJWaWV3Lm1tCmluZGV4IDU0NmNhNmUy MjJkOWZlYTgxY2U3YmU0ZTJjMmQzOTg1YzViNDRmMGYuLmM0YmFjZDA1M2MzY2YzZTQ3ODQzOTQy OGNiMTM0NDNjYmZhOGM3ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2Ev VGVzdFdLV2ViVmlldy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RXS1dl YlZpZXcubW0KQEAgLTQxMiw3ICs0MTIsOCBAQCAtICh2b2lkKXdhaXRGb3JNZXNzYWdlOihOU1N0 cmluZyAqKW1lc3NhZ2UKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZVdhaXRp bmcpOwogfQogCi0tICh2b2lkKXBlcmZvcm1BZnRlckxvYWRpbmc6KGRpc3BhdGNoX2Jsb2NrX3Qp YWN0aW9ucyB7CistICh2b2lkKXBlcmZvcm1BZnRlckxvYWRpbmc6KGRpc3BhdGNoX2Jsb2NrX3Qp YWN0aW9ucworewogICAgIFRlc3RNZXNzYWdlSGFuZGxlciAqaGFuZGxlciA9IFtbVGVzdE1lc3Nh Z2VIYW5kbGVyIGFsbG9jXSBpbml0XTsKICAgICBbaGFuZGxlciBhZGRNZXNzYWdlOkAibG9hZGVk IiB3aXRoSGFuZGxlcjphY3Rpb25zXTsKIApAQCAtNjM5LDQgKzY0MCwzOSBAQCAtICh2b2lkKXR5 cGVDaGFyYWN0ZXI6KGNoYXIpY2hhcmFjdGVyCiB9CiAKIEBlbmQKLSNlbmRpZgorI2VuZGlmIC8v IFBMQVRGT1JNKE1BQykKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCitAaW1wbGVtZW50YXRp b24gVUlWaWV3IChXS1Rlc3RpbmdVSVZpZXdVdGlsaXRpZXMpCisKKy0gKFVJVmlldyAqKXdrRmly c3RTdWJ2aWV3V2l0aENsYXNzOihDbGFzcyl0YXJnZXRDbGFzcworeworICAgIGZvciAoVUlWaWV3 ICp2aWV3IGluIHNlbGYuc3Vidmlld3MpIHsKKyAgICAgICAgaWYgKFt2aWV3IGlzS2luZE9mQ2xh c3M6dGFyZ2V0Q2xhc3NdKQorICAgICAgICAgICAgcmV0dXJuIHZpZXc7CisgICAgCisgICAgICAg IFVJVmlldyAqZm91bmRTdWJ2aWV3ID0gW3ZpZXcgd2tGaXJzdFN1YnZpZXdXaXRoQ2xhc3M6dGFy Z2V0Q2xhc3NdOworICAgICAgICBpZiAoZm91bmRTdWJ2aWV3KQorICAgICAgICAgICAgcmV0dXJu IGZvdW5kU3VidmlldzsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIG5pbDsKK30KKworLSAoVUlW aWV3ICopd2tGaXJzdFN1YnZpZXdXaXRoQm91bmRzU2l6ZTooQ0dTaXplKXNpemUKK3sKKyAgICBm b3IgKFVJVmlldyAqdmlldyBpbiBzZWxmLnN1YnZpZXdzKSB7CisgICAgICAgIGlmIChDR1NpemVF cXVhbFRvU2l6ZShbdmlldyBib3VuZHNdLnNpemUsIHNpemUpKQorICAgICAgICAgICAgcmV0dXJu IHZpZXc7CisgICAgCisgICAgICAgIFVJVmlldyAqZm91bmRTdWJ2aWV3ID0gW3ZpZXcgd2tGaXJz dFN1YnZpZXdXaXRoQm91bmRzU2l6ZTpzaXplXTsKKyAgICAgICAgaWYgKGZvdW5kU3VidmlldykK KyAgICAgICAgICAgIHJldHVybiBmb3VuZFN1YnZpZXc7CisgICAgfQorICAgIAorICAgIHJldHVy biBuaWw7Cit9CisKK0BlbmQKKworI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9jb21wb3NpdGVkLmh0bWwgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL2lvcy9jb21wb3NpdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGI0NjMxMDVjMzEw Y2Q1YzcxYWFjNjRhMjllMDBlOThlOWVhZjAwNAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvaW9zL2NvbXBvc2l0ZWQuaHRtbApAQCAtMCwwICsxLDQyIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRl bnQ9IndpZHRoPWRldmljZS13aWR0aCI+CisgICAgPHN0eWxlPgorICAgICAgICAqIHsKKyAgICAg ICAgICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisgICAgICAgIH0KKyAgICAgICAgCisgICAg ICAgIC5jb250YWluZXIgeworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICAgICAg aGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAg ICAgICB9CisKKyAgICAgICAgLmJveCB7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAg ICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1 ZTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgYm9keS5jaGFuZ2VkIC5ib3guZGlzYXBw ZWFyIHsKKyAgICAgICAgICAgIGRpc3BsYXk6IG5vbmU7CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIC5jb21wb3NpdGVkIHsKKyAgICAgICAgICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigw KTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rp b24gYXBwbHlDaGFuZ2UoKQorICAgICAgICB7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmNs YXNzTGlzdC5hZGQoJ2NoYW5nZWQnKTsKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIGNvbXBvc2l0ZWQiPgorICAgICAg ICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGRpc2FwcGVhciBib3giPmJveDwvZGl2PgorICAgIDwv ZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9p b3Mvb3ZlcmZsb3ctc2Nyb2xsLmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9vdmVyZmxv dy1zY3JvbGwuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42YjJmYTVkYmZmMDI0MzA3ZDE1YjhlNGExNzRiYjRj NTNiZGQ5OWRkCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3Mvb3Zl cmZsb3ctc2Nyb2xsLmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxoZWFkPgorICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZp Y2Utd2lkdGgiPgorICAgIDxzdHlsZT4KKyAgICAgICAgLnNjcm9sbGVyIHsKKyAgICAgICAgICAg IHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICBi b3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgICAgICAgIG92ZXJmbG93OiBzY3JvbGw7Cisg ICAgICAgIH0KKyAgICAgICAgLmNvbnRlbnQgeworICAgICAgICAgICAgd2lkdGg6IDIwMCU7Cisg ICAgICAgICAgICBoZWlnaHQ6IDIwMCU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5i b3ggeworICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMDBw eDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIC5ib3guYXBwZWFyIHsKKyAgICAgICAgICAgIGRpc3BsYXk6IG5vbmU7Cisg ICAgICAgIH0KKyAgICAgICAgLmNvbnRlbnQuY2hhbmdlZCAuYm94LmFwcGVhciB7CisgICAgICAg ICAgICBkaXNwbGF5OiBibG9jazsKKyAgICAgICAgfQorCisgICAgICAgIC5ib3guZGlzYXBwZWFy IHsKKyAgICAgICAgICAgIGRpc3BsYXk6IGJsb2NrOworICAgICAgICB9CisgICAgICAgIC5jb250 ZW50LmNoYW5nZWQgLmJveC5kaXNhcHBlYXIgeworICAgICAgICAgICAgZGlzcGxheTogbm9uZTsK KyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0ZWQgeworICAgICAgICAgICAg dHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8 c2NyaXB0PgorICAgICAgICBmdW5jdGlvbiBjaGFuZ2VTY3JvbGxlclN1YnZpZXdzKCkKKyAgICAg ICAgeworICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Njcm9sbC1jb250ZW50 JykuY2xhc3NMaXN0LmFkZCgnY2hhbmdlZCcpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIHNjcm9sbGVyIj4KKyAg ICAgICAgPGRpdiBpZD0ic2Nyb2xsLWNvbnRlbnQiIGNsYXNzPSJjb250ZW50Ij4KKyAgICAgICAg ICAgIENvbnRlbnQKKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNvbXBvc2l0ZWQgYm94IGFwcGVh ciI+YXBwZWFyPC9kaXY+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGJveCBk aXNhcHBlYXIiPmRpc2FwcGVhcjwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwv Ym9keT4KKzwvaHRtbD4K