169398 2017-03-08 18:14:55 -0800 WKWebView should automatically respect insets from the view controller hierarchy 2017-03-09 08:26:56 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin dino simon.fraser wenson_hsieh oldest_to_newest 1285152 0 thorton 2017-03-08 18:14:55 -0800 WKWebView should automatically respect insets from the view controller hierarchy 1285153 1 303879 thorton 2017-03-08 18:15:27 -0800 Created attachment 303879 Patch 1285239 2 303879 simon.fraser 2017-03-08 22:31:41 -0800 Comment on attachment 303879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303879&action=review > Source/WebKit2/Platform/spi/ios/UIKitSPI.h:871 > +// These should move above when possible. This comment doesn't add anything. 1285241 3 303898 thorton 2017-03-08 22:33:04 -0800 Created attachment 303898 Patch 1285248 4 303900 thorton 2017-03-08 23:58:19 -0800 Created attachment 303900 Patch 1285322 5 thorton 2017-03-09 08:26:56 -0800 http://trac.webkit.org/changeset/213643 303879 2017-03-08 18:15:27 -0800 2017-03-08 22:32:58 -0800 Patch bug-169398-20170308181526.patch text/plain 5455 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ0ZDkxOTcxYjJhZWU2 ZmZmOWM0YjFmMTYyOTkwOTg5MTE0Y2UzNy4uMTQyMDJhNTlhMmNiNDgzMzAzZDZlNmFiYjZmNTMy NjM0MTZkNWJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTAzLTA4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFdLV2ViVmlldyBz aG91bGQgYXV0b21hdGljYWxseSByZXNwZWN0IGluc2V0cyBmcm9tIHRoZSB2aWV3IGNvbnRyb2xs ZXIgaGllcmFyY2h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjkzOTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjE3NTkzPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL2lv cy9VSUtpdFNQSS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2luaXRpYWxpemVXaXRoQ29uZmlndXJhdGlvbjpdKToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb21wdXRlZENvbnRlbnRJbnNldF0pOgorICAgICAgICAo YWN0aXZlTWluaW11bUxheW91dFNpemUpOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2ZyYW1lT3JC b3VuZHNDaGFuZ2VkXSk6CisgICAgICAgIEZhY3RvciBpbnNldHMgZnJvbSBhYm92ZSB1cyBpbiB0 aGUgdmlldyBjb250cm9sbGVyIGhpZXJhcmNoeSBpbnRvIG91cgorICAgICAgICBjb250ZW50IGlu c2V0cyAoYW5kIGxheW91dCBzaXplKSBhdXRvbWF0aWNhbGx5LgorCiAyMDE3LTAzLTA4ICBBbGV4 ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdCBzaG91bGQg bm90IGV4cG9ydCBkeWxkIGluc3RhbGwgbmFtZSBoaW50cyBvbiB3YXRjaE9TIGFuZCB0dk9TCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmggYi9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggMGNkODU4NDU0 ODA5YzlmNDkyYzAwMTQyNmI4MzcxZDE1NGExMTljMy4uOGQ0MDEzYmRhZjJkYWM3NjE3Y2YyMGYz YjdkNDUwNGUwNWExYzkzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3Bp L2lvcy9VSUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlL aXRTUEkuaApAQCAtODY4LDYgKzg2OCwxNiBAQCB0eXBlZGVmIGVudW0gewogLSAoVUlSZXNwb25k ZXIgKilmaXJzdFJlc3BvbmRlcjsKIEBlbmQKIAorLy8gVGhlc2Ugc2hvdWxkIG1vdmUgYWJvdmUg d2hlbiBwb3NzaWJsZS4KK0BpbnRlcmZhY2UgVUlWaWV3ICgpCistICh2b2lkKXNhZmVBcmVhSW5z ZXRzRGlkQ2hhbmdlOworQGVuZAorCitAaW50ZXJmYWNlIFVJU2Nyb2xsVmlldyAoKQorQHByb3Bl cnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0RWRnZXNTY3JvbGxpbmdDb250ZW50SW50b1NhZmVB cmVhOikgVUlSZWN0RWRnZSBfZWRnZXNTY3JvbGxpbmdDb250ZW50SW50b1NhZmVBcmVhOworQHBy b3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUVkZ2VJbnNldHMgX3N5c3RlbUNvbnRlbnRJ bnNldDsKK0BlbmQKKwogV1RGX0VYVEVSTl9DX0JFR0lOCiAKIEJPT0wgVUlLZXlib2FyZEVuYWJs ZWRJbnB1dE1vZGVzQWxsb3dPbmVUb01hbnlTaG9ydGN1dHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYTY5ODZkMmVmYmVlZjli NGMzOTBjMWRhODU5YWMxYTM0YmQxMjUzYi4uMzEwZWU0NmE1YzVhYzU0MzY4NGE0MWQ1Y2FkOTYw ODJhODY2YWZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KQEAgLTUwOCw2ICs1MDgsOSBAQCAtICh2b2lkKV9pbml0aWFsaXplV2l0aENv bmZpZ3VyYXRpb246KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCiAgICAg W19zY3JvbGxWaWV3IHNldEludGVybmFsRGVsZWdhdGU6c2VsZl07CiAgICAgW19zY3JvbGxWaWV3 IHNldEJvdW5jZXNab29tOllFU107CiAKKyAgICBpZiAoW19zY3JvbGxWaWV3IHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3NldEVkZ2VzU2Nyb2xsaW5nQ29udGVudEludG9TYWZlQXJlYTop XSkKKyAgICAgICAgW19zY3JvbGxWaWV3IF9zZXRFZGdlc1Njcm9sbGluZ0NvbnRlbnRJbnRvU2Fm ZUFyZWE6VUlSZWN0RWRnZUFsbF07CisKICAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9zY3JvbGxWaWV3 LmdldCgpXTsKIAogICAgIHN0YXRpYyB1aW50MzJfdCBwcm9ncmFtU0RLVmVyc2lvbiA9IGR5bGRf Z2V0X3Byb2dyYW1fc2RrX3ZlcnNpb24oKTsKQEAgLTEzNDMsNyArMTM0NiwxMiBAQCAtIChVSUVk Z2VJbnNldHMpX2NvbXB1dGVkQ29udGVudEluc2V0CiAgICAgaWYgKF9oYXZlU2V0T2JzY3VyZWRJ bnNldHMpCiAgICAgICAgIHJldHVybiBfb2JzY3VyZWRJbnNldHM7CiAKLSAgICByZXR1cm4gW19z Y3JvbGxWaWV3IGNvbnRlbnRJbnNldF07CisgICAgVUlFZGdlSW5zZXRzIGluc2V0cyA9IFtfc2Ny b2xsVmlldyBjb250ZW50SW5zZXRdOworCisgICAgaWYgKFtfc2Nyb2xsVmlldyByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF9zeXN0ZW1Db250ZW50SW5zZXQpXSkKKyAgICAgICAgaW5zZXRz ID0gVUlFZGdlSW5zZXRzQWRkKGluc2V0cywgW19zY3JvbGxWaWV3IF9zeXN0ZW1Db250ZW50SW5z ZXRdLCBVSVJlY3RFZGdlQWxsKTsKKworICAgIHJldHVybiBpbnNldHM7CiB9CiAKIC0gKHZvaWQp X3Byb2Nlc3NEaWRFeGl0CkBAIC0yMTk2LDYgKzIyMDQsMTkgQEAgLSAodm9pZClfZW5jbG9zaW5n U2Nyb2xsZXJTY3JvbGxpbmdFbmRlZDooTlNUaW1lciAqKXRpbWVyCiAgICAgX2VuY2xvc2luZ1Nj cm9sbFZpZXdTY3JvbGxUaW1lciA9IG5pbDsKIH0KIAorc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6 ZSBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IENHUmVj dCYgYm91bmRzKQoreworICAgIGlmICh3ZWJWaWV3LT5fb3ZlcnJpZGVzTWluaW11bUxheW91dFNp emUpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUod2ViVmlldy0+X21pbmltdW1M YXlvdXRTaXplT3ZlcnJpZGUpOworCisgICAgaWYgKFt3ZWJWaWV3LT5fc2Nyb2xsVmlldyByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zeXN0ZW1Db250ZW50SW5zZXQpXSkgeworICAgICAg ICBVSUVkZ2VJbnNldHMgc3lzdGVtQ29udGVudEluc2V0ID0gW3dlYlZpZXctPl9zY3JvbGxWaWV3 IF9zeXN0ZW1Db250ZW50SW5zZXRdOworICAgICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXpl KFVJRWRnZUluc2V0c0luc2V0UmVjdChDR1JlY3RNYWtlKDAsIDAsIGJvdW5kcy5zaXplLndpZHRo LCBib3VuZHMuc2l6ZS5oZWlnaHQpLCBzeXN0ZW1Db250ZW50SW5zZXQpLnNpemUpOworICAgIH0K KworICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpOworfQorCiAtICh2 b2lkKV9mcmFtZU9yQm91bmRzQ2hhbmdlZAogewogICAgIENHUmVjdCBib3VuZHMgPSBzZWxmLmJv dW5kczsKQEAgLTIyMDMsNyArMjIyNCw3IEBAIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2Vk CiAKICAgICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gRHluYW1pY1ZpZXdwb3J0 VXBkYXRlTW9kZTo6Tm90UmVzaXppbmcpIHsKICAgICAgICAgaWYgKCFfb3ZlcnJpZGVzTWluaW11 bUxheW91dFNpemUpCi0gICAgICAgICAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9u TWluaW11bUxheW91dFNpemUoV2ViQ29yZTo6RmxvYXRTaXplKGJvdW5kcy5zaXplKSk7CisgICAg ICAgICAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUo YWN0aXZlTWluaW11bUxheW91dFNpemUoc2VsZiwgc2VsZi5ib3VuZHMpKTsKICAgICAgICAgaWYg KCFfb3ZlcnJpZGVzTWF4aW11bVVub2JzY3VyZWRTaXplKQogICAgICAgICAgICAgX3BhZ2UtPnNl dE1heGltdW1Vbm9ic2N1cmVkU2l6ZShXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpKTsK ICAgICAgICAgCkBAIC0yMjM5LDYgKzIyNjAsMTQgQEAgLSAoQk9PTClfc2Nyb2xsVmlld0lzUnVi YmVyQmFuZGluZwogICAgIHJldHVybiAhcG9pbnRzRXF1YWxJbkRldmljZVBpeGVscyhjb250ZW50 T2Zmc2V0LCBib3VuZGVkT2Zmc2V0LCBkZXZpY2VTY2FsZUZhY3Rvcik7CiB9CiAKKy0gKHZvaWQp c2FmZUFyZWFJbnNldHNEaWRDaGFuZ2UKK3sKKyAgICBpZiAoW3N1cGVyIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3Ioc2FmZUFyZWFJbnNldHNEaWRDaGFuZ2UpXSkKKyAgICAgICAgW3N1cGVy IHNhZmVBcmVhSW5zZXRzRGlkQ2hhbmdlXTsKKworICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVD b250ZW50UmVjdFVwZGF0ZV07Cit9CisKIC0gKHZvaWQpX3NjaGVkdWxlVmlzaWJsZUNvbnRlbnRS ZWN0VXBkYXRlCiB7CiAgICAgLy8gRm9yIHZpc2libGUgcmVjdCB1cGRhdGVzIG5vdCBhc3NvY2lh dGVkIHdpdGggYSBzcGVjaWZpYyBVSVNjcm9sbFZpZXcsIGp1c3QgY29uc2lkZXIgb3VyIG93biBz Y3JvbGxlci4KQEAgLTM2NTksMTEgKzM2ODgsNiBAQCAtICh2b2lkKV9raWxsV2ViQ29udGVudFBy b2Nlc3NBbmRSZXNldFN0YXRlCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi1zdGF0aWMgV2ViQ29y ZTo6RmxvYXRTaXplIGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplKFdLV2ViVmlldyAqd2ViVmlldywg Y29uc3QgQ0dSZWN0JiBib3VuZHMpCi17Ci0gICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZSh3 ZWJWaWV3LT5fb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUgPyB3ZWJWaWV3LT5fbWluaW11bUxh eW91dFNpemVPdmVycmlkZSA6IGJvdW5kcy5zaXplKTsKLX0KLQogc3RhdGljIFdlYkNvcmU6OkZs b2F0U2l6ZSBhY3RpdmVNYXhpbXVtVW5vYnNjdXJlZFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBj b25zdCBDR1JlY3QmIGJvdW5kcykKIHsKICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKHdl YlZpZXctPl9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUgPyB3ZWJWaWV3LT5fbWF4aW11 bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUgOiBib3VuZHMuc2l6ZSk7Cg== 303898 2017-03-08 22:33:04 -0800 2017-03-08 23:58:16 -0800 Patch bug-169398-20170308223304.patch text/plain 5839 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ0ZDkxOTcxYjJhZWU2 ZmZmOWM0YjFmMTYyOTkwOTg5MTE0Y2UzNy4uZTA3ZjVjOWEyYWFkNTkwOGI1MjZkZTM1YjBlNDY4 ZGZkMmE3YzRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTAzLTA4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFdLV2ViVmlldyBz aG91bGQgYXV0b21hdGljYWxseSByZXNwZWN0IGluc2V0cyBmcm9tIHRoZSB2aWV3IGNvbnRyb2xs ZXIgaGllcmFyY2h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjkzOTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjE3NTkzPgorCisgICAgICAg IFJldmlld2VkIGJ5IERlYW4gSmFja3Nvbi4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3Mv VUlLaXRTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9pbml0aWFsaXplV2l0aENvbmZpZ3VyYXRpb246XSk6Cisg ICAgICAgICgtW1dLV2ViVmlldyBfY29tcHV0ZWRDb250ZW50SW5zZXRdKToKKyAgICAgICAgKGFj dGl2ZU1pbmltdW1MYXlvdXRTaXplKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9mcmFtZU9yQm91 bmRzQ2hhbmdlZF0pOgorICAgICAgICBGYWN0b3IgaW5zZXRzIGZyb20gYWJvdmUgdXMgaW4gdGhl IHZpZXcgY29udHJvbGxlciBoaWVyYXJjaHkgaW50byBvdXIKKyAgICAgICAgY29udGVudCBpbnNl dHMgKGFuZCBsYXlvdXQgc2l6ZSkgYXV0b21hdGljYWxseS4KKwogMjAxNy0wMy0wOCAgQWxleGV5 IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQgc2hvdWxkIG5v dCBleHBvcnQgZHlsZCBpbnN0YWxsIG5hbWUgaGludHMgb24gd2F0Y2hPUyBhbmQgdHZPUwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDBjZDg1ODQ1NDgw OWM5ZjQ5MmMwMDE0MjZiODM3MWQxNTRhMTE5YzMuLjE4OWY0MjI0MWNhMjQyMTc0NTI0ZjEzZDI0 ZjBmYTk4Nzk5Yzg0ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9p b3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmgKQEAgLTg1Niw2ICs4NTYsMTIgQEAgdHlwZWRlZiBlbnVtIHsKICsgKGluc3RhbmNldHlw ZSlhY3Rpb25XaXRoVGl0bGU6KE5TU3RyaW5nICopdGl0bGUgaGFuZGxlcjoodm9pZCAoXikoVUlW aWV3Q29udHJvbGxlclByZXZpZXdBY3Rpb24gKmFjdGlvbiwgVUlWaWV3Q29udHJvbGxlciAqcHJl dmlld1ZpZXdDb250cm9sbGVyKSloYW5kbGVyOwogQGVuZAogCitXVEZfRVhURVJOX0NfQkVHSU4K KworZXh0ZXJuIFVJRWRnZUluc2V0cyBVSUVkZ2VJbnNldHNBZGQoVUlFZGdlSW5zZXRzLCBVSUVk Z2VJbnNldHMsIFVJUmVjdEVkZ2UpOworCitXVEZfRVhURVJOX0NfRU5ECisKICNlbmRpZiAvLyBV U0UoQVBQTEVfSU5URVJOQUxfU0RLKQogCiBAaW50ZXJmYWNlIFVJVmlldyAoSVBJKQpAQCAtODY4 LDYgKzg3NCwxNiBAQCB0eXBlZGVmIGVudW0gewogLSAoVUlSZXNwb25kZXIgKilmaXJzdFJlc3Bv bmRlcjsKIEBlbmQKIAorLy8gVGhlc2Ugc2hvdWxkIG1vdmUgYWJvdmUgd2hlbiBwb3NzaWJsZS4K K0BpbnRlcmZhY2UgVUlWaWV3ICgpCistICh2b2lkKXNhZmVBcmVhSW5zZXRzRGlkQ2hhbmdlOwor QGVuZAorCitAaW50ZXJmYWNlIFVJU2Nyb2xsVmlldyAoKQorQHByb3BlcnR5IChub25hdG9taWMs IHNldHRlcj1fc2V0RWRnZXNTY3JvbGxpbmdDb250ZW50SW50b1NhZmVBcmVhOikgVUlSZWN0RWRn ZSBfZWRnZXNTY3JvbGxpbmdDb250ZW50SW50b1NhZmVBcmVhOworQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWRvbmx5KSBVSUVkZ2VJbnNldHMgX3N5c3RlbUNvbnRlbnRJbnNldDsKK0BlbmQKKwog V1RGX0VYVEVSTl9DX0JFR0lOCiAKIEJPT0wgVUlLZXlib2FyZEVuYWJsZWRJbnB1dE1vZGVzQWxs b3dPbmVUb01hbnlTaG9ydGN1dHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYTY5ODZkMmVmYmVlZjliNGMzOTBjMWRhODU5YWMx YTM0YmQxMjUzYi4uMzEwZWU0NmE1YzVhYzU0MzY4NGE0MWQ1Y2FkOTYwODJhODY2YWZkMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTUwOCw2ICs1MDgsOSBAQCAtICh2b2lkKV9pbml0aWFsaXplV2l0aENvbmZpZ3VyYXRpb246KFdL V2ViVmlld0NvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCiAgICAgW19zY3JvbGxWaWV3IHNl dEludGVybmFsRGVsZWdhdGU6c2VsZl07CiAgICAgW19zY3JvbGxWaWV3IHNldEJvdW5jZXNab29t OllFU107CiAKKyAgICBpZiAoW19zY3JvbGxWaWV3IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoX3NldEVkZ2VzU2Nyb2xsaW5nQ29udGVudEludG9TYWZlQXJlYTopXSkKKyAgICAgICAgW19z Y3JvbGxWaWV3IF9zZXRFZGdlc1Njcm9sbGluZ0NvbnRlbnRJbnRvU2FmZUFyZWE6VUlSZWN0RWRn ZUFsbF07CisKICAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9zY3JvbGxWaWV3LmdldCgpXTsKIAogICAg IHN0YXRpYyB1aW50MzJfdCBwcm9ncmFtU0RLVmVyc2lvbiA9IGR5bGRfZ2V0X3Byb2dyYW1fc2Rr X3ZlcnNpb24oKTsKQEAgLTEzNDMsNyArMTM0NiwxMiBAQCAtIChVSUVkZ2VJbnNldHMpX2NvbXB1 dGVkQ29udGVudEluc2V0CiAgICAgaWYgKF9oYXZlU2V0T2JzY3VyZWRJbnNldHMpCiAgICAgICAg IHJldHVybiBfb2JzY3VyZWRJbnNldHM7CiAKLSAgICByZXR1cm4gW19zY3JvbGxWaWV3IGNvbnRl bnRJbnNldF07CisgICAgVUlFZGdlSW5zZXRzIGluc2V0cyA9IFtfc2Nyb2xsVmlldyBjb250ZW50 SW5zZXRdOworCisgICAgaWYgKFtfc2Nyb2xsVmlldyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF9zeXN0ZW1Db250ZW50SW5zZXQpXSkKKyAgICAgICAgaW5zZXRzID0gVUlFZGdlSW5zZXRz QWRkKGluc2V0cywgW19zY3JvbGxWaWV3IF9zeXN0ZW1Db250ZW50SW5zZXRdLCBVSVJlY3RFZGdl QWxsKTsKKworICAgIHJldHVybiBpbnNldHM7CiB9CiAKIC0gKHZvaWQpX3Byb2Nlc3NEaWRFeGl0 CkBAIC0yMTk2LDYgKzIyMDQsMTkgQEAgLSAodm9pZClfZW5jbG9zaW5nU2Nyb2xsZXJTY3JvbGxp bmdFbmRlZDooTlNUaW1lciAqKXRpbWVyCiAgICAgX2VuY2xvc2luZ1Njcm9sbFZpZXdTY3JvbGxU aW1lciA9IG5pbDsKIH0KIAorc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6ZSBhY3RpdmVNaW5pbXVt TGF5b3V0U2l6ZShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IENHUmVjdCYgYm91bmRzKQorewor ICAgIGlmICh3ZWJWaWV3LT5fb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUpCisgICAgICAgIHJl dHVybiBXZWJDb3JlOjpGbG9hdFNpemUod2ViVmlldy0+X21pbmltdW1MYXlvdXRTaXplT3ZlcnJp ZGUpOworCisgICAgaWYgKFt3ZWJWaWV3LT5fc2Nyb2xsVmlldyByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9zeXN0ZW1Db250ZW50SW5zZXQpXSkgeworICAgICAgICBVSUVkZ2VJbnNldHMg c3lzdGVtQ29udGVudEluc2V0ID0gW3dlYlZpZXctPl9zY3JvbGxWaWV3IF9zeXN0ZW1Db250ZW50 SW5zZXRdOworICAgICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKFVJRWRnZUluc2V0c0lu c2V0UmVjdChDR1JlY3RNYWtlKDAsIDAsIGJvdW5kcy5zaXplLndpZHRoLCBib3VuZHMuc2l6ZS5o ZWlnaHQpLCBzeXN0ZW1Db250ZW50SW5zZXQpLnNpemUpOworICAgIH0KKworICAgIHJldHVybiBX ZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpOworfQorCiAtICh2b2lkKV9mcmFtZU9yQm91 bmRzQ2hhbmdlZAogewogICAgIENHUmVjdCBib3VuZHMgPSBzZWxmLmJvdW5kczsKQEAgLTIyMDMs NyArMjIyNCw3IEBAIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCiAKICAgICBpZiAoX2R5 bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gRHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90 UmVzaXppbmcpIHsKICAgICAgICAgaWYgKCFfb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUpCi0g ICAgICAgICAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNp emUoV2ViQ29yZTo6RmxvYXRTaXplKGJvdW5kcy5zaXplKSk7CisgICAgICAgICAgICBfcGFnZS0+ c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoYWN0aXZlTWluaW11bUxh eW91dFNpemUoc2VsZiwgc2VsZi5ib3VuZHMpKTsKICAgICAgICAgaWYgKCFfb3ZlcnJpZGVzTWF4 aW11bVVub2JzY3VyZWRTaXplKQogICAgICAgICAgICAgX3BhZ2UtPnNldE1heGltdW1Vbm9ic2N1 cmVkU2l6ZShXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpKTsKICAgICAgICAgCkBAIC0y MjM5LDYgKzIyNjAsMTQgQEAgLSAoQk9PTClfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZwogICAg IHJldHVybiAhcG9pbnRzRXF1YWxJbkRldmljZVBpeGVscyhjb250ZW50T2Zmc2V0LCBib3VuZGVk T2Zmc2V0LCBkZXZpY2VTY2FsZUZhY3Rvcik7CiB9CiAKKy0gKHZvaWQpc2FmZUFyZWFJbnNldHNE aWRDaGFuZ2UKK3sKKyAgICBpZiAoW3N1cGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io c2FmZUFyZWFJbnNldHNEaWRDaGFuZ2UpXSkKKyAgICAgICAgW3N1cGVyIHNhZmVBcmVhSW5zZXRz RGlkQ2hhbmdlXTsKKworICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0 ZV07Cit9CisKIC0gKHZvaWQpX3NjaGVkdWxlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlCiB7CiAg ICAgLy8gRm9yIHZpc2libGUgcmVjdCB1cGRhdGVzIG5vdCBhc3NvY2lhdGVkIHdpdGggYSBzcGVj aWZpYyBVSVNjcm9sbFZpZXcsIGp1c3QgY29uc2lkZXIgb3VyIG93biBzY3JvbGxlci4KQEAgLTM2 NTksMTEgKzM2ODgsNiBAQCAtICh2b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRSZXNldFN0 YXRlCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi1zdGF0aWMgV2ViQ29yZTo6RmxvYXRTaXplIGFj dGl2ZU1pbmltdW1MYXlvdXRTaXplKFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgQ0dSZWN0JiBi b3VuZHMpCi17Ci0gICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZSh3ZWJWaWV3LT5fb3ZlcnJp ZGVzTWluaW11bUxheW91dFNpemUgPyB3ZWJWaWV3LT5fbWluaW11bUxheW91dFNpemVPdmVycmlk ZSA6IGJvdW5kcy5zaXplKTsKLX0KLQogc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6ZSBhY3RpdmVN YXhpbXVtVW5vYnNjdXJlZFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBDR1JlY3QmIGJv dW5kcykKIHsKICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKHdlYlZpZXctPl9vdmVycmlk ZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUgPyB3ZWJWaWV3LT5fbWF4aW11bVVub2JzY3VyZWRTaXpl T3ZlcnJpZGUgOiBib3VuZHMuc2l6ZSk7Cg== 303900 2017-03-08 23:58:19 -0800 2017-03-08 23:58:19 -0800 Patch bug-169398-20170308235819.patch text/plain 5617 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ0ZDkxOTcxYjJhZWU2 ZmZmOWM0YjFmMTYyOTkwOTg5MTE0Y2UzNy4uZTA3ZjVjOWEyYWFkNTkwOGI1MjZkZTM1YjBlNDY4 ZGZkMmE3YzRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTAzLTA4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFdLV2ViVmlldyBz aG91bGQgYXV0b21hdGljYWxseSByZXNwZWN0IGluc2V0cyBmcm9tIHRoZSB2aWV3IGNvbnRyb2xs ZXIgaGllcmFyY2h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjkzOTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjE3NTkzPgorCisgICAgICAg IFJldmlld2VkIGJ5IERlYW4gSmFja3Nvbi4KKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3Mv VUlLaXRTUEkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9pbml0aWFsaXplV2l0aENvbmZpZ3VyYXRpb246XSk6Cisg ICAgICAgICgtW1dLV2ViVmlldyBfY29tcHV0ZWRDb250ZW50SW5zZXRdKToKKyAgICAgICAgKGFj dGl2ZU1pbmltdW1MYXlvdXRTaXplKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9mcmFtZU9yQm91 bmRzQ2hhbmdlZF0pOgorICAgICAgICBGYWN0b3IgaW5zZXRzIGZyb20gYWJvdmUgdXMgaW4gdGhl IHZpZXcgY29udHJvbGxlciBoaWVyYXJjaHkgaW50byBvdXIKKyAgICAgICAgY29udGVudCBpbnNl dHMgKGFuZCBsYXlvdXQgc2l6ZSkgYXV0b21hdGljYWxseS4KKwogMjAxNy0wMy0wOCAgQWxleGV5 IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQgc2hvdWxkIG5v dCBleHBvcnQgZHlsZCBpbnN0YWxsIG5hbWUgaGludHMgb24gd2F0Y2hPUyBhbmQgdHZPUwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDBjZDg1ODQ1NDgw OWM5ZjQ5MmMwMDE0MjZiODM3MWQxNTRhMTE5YzMuLjhkNDAxM2JkYWYyZGFjNzYxN2NmMjBmM2I3 ZDQ1MDRlMDVhMWM5M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9p b3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmgKQEAgLTg2OCw2ICs4NjgsMTYgQEAgdHlwZWRlZiBlbnVtIHsKIC0gKFVJUmVzcG9uZGVy ICopZmlyc3RSZXNwb25kZXI7CiBAZW5kCiAKKy8vIFRoZXNlIHNob3VsZCBtb3ZlIGFib3ZlIHdo ZW4gcG9zc2libGUuCitAaW50ZXJmYWNlIFVJVmlldyAoKQorLSAodm9pZClzYWZlQXJlYUluc2V0 c0RpZENoYW5nZTsKK0BlbmQKKworQGludGVyZmFjZSBVSVNjcm9sbFZpZXcgKCkKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldEVkZ2VzU2Nyb2xsaW5nQ29udGVudEludG9TYWZlQXJl YTopIFVJUmVjdEVkZ2UgX2VkZ2VzU2Nyb2xsaW5nQ29udGVudEludG9TYWZlQXJlYTsKK0Bwcm9w ZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgVUlFZGdlSW5zZXRzIF9zeXN0ZW1Db250ZW50SW5z ZXQ7CitAZW5kCisKIFdURl9FWFRFUk5fQ19CRUdJTgogCiBCT09MIFVJS2V5Ym9hcmRFbmFibGVk SW5wdXRNb2Rlc0FsbG93T25lVG9NYW55U2hvcnRjdXRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGE2OTg2ZDJlZmJlZWY5YjRj MzkwYzFkYTg1OWFjMWEzNGJkMTI1M2IuLjkzZDIzNmYwMTkxZmZlMjhhZDZjMDQxM2MyZGJlMmZk NTc2ZTFjNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCkBAIC01MDgsNiArNTA4LDkgQEAgLSAodm9pZClfaW5pdGlhbGl6ZVdpdGhDb25m aWd1cmF0aW9uOihXS1dlYlZpZXdDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgogICAgIFtf c2Nyb2xsVmlldyBzZXRJbnRlcm5hbERlbGVnYXRlOnNlbGZdOwogICAgIFtfc2Nyb2xsVmlldyBz ZXRCb3VuY2VzWm9vbTpZRVNdOwogCisgICAgaWYgKFtfc2Nyb2xsVmlldyByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9zZXRFZGdlc1Njcm9sbGluZ0NvbnRlbnRJbnRvU2FmZUFyZWE6KV0p CisgICAgICAgIFtfc2Nyb2xsVmlldyBfc2V0RWRnZXNTY3JvbGxpbmdDb250ZW50SW50b1NhZmVB cmVhOlVJUmVjdEVkZ2VBbGxdOworCiAgICAgW3NlbGYgYWRkU3Vidmlldzpfc2Nyb2xsVmlldy5n ZXQoKV07CiAKICAgICBzdGF0aWMgdWludDMyX3QgcHJvZ3JhbVNES1ZlcnNpb24gPSBkeWxkX2dl dF9wcm9ncmFtX3Nka192ZXJzaW9uKCk7CkBAIC0xMzQzLDcgKzEzNDYsMTcgQEAgLSAoVUlFZGdl SW5zZXRzKV9jb21wdXRlZENvbnRlbnRJbnNldAogICAgIGlmIChfaGF2ZVNldE9ic2N1cmVkSW5z ZXRzKQogICAgICAgICByZXR1cm4gX29ic2N1cmVkSW5zZXRzOwogCi0gICAgcmV0dXJuIFtfc2Ny b2xsVmlldyBjb250ZW50SW5zZXRdOworICAgIFVJRWRnZUluc2V0cyBpbnNldHMgPSBbX3Njcm9s bFZpZXcgY29udGVudEluc2V0XTsKKworICAgIGlmIChbX3Njcm9sbFZpZXcgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihfc3lzdGVtQ29udGVudEluc2V0KV0pIHsKKyAgICAgICAgVUlFZGdl SW5zZXRzIHN5c3RlbUluc2V0cyA9IFtfc2Nyb2xsVmlldyBfc3lzdGVtQ29udGVudEluc2V0XTsK KyAgICAgICAgaW5zZXRzLnRvcCArPSBzeXN0ZW1JbnNldHMudG9wOworICAgICAgICBpbnNldHMu Ym90dG9tICs9IHN5c3RlbUluc2V0cy5ib3R0b207CisgICAgICAgIGluc2V0cy5sZWZ0ICs9IHN5 c3RlbUluc2V0cy5sZWZ0OworICAgICAgICBpbnNldHMucmlnaHQgKz0gc3lzdGVtSW5zZXRzLnJp Z2h0OworICAgIH0KKworICAgIHJldHVybiBpbnNldHM7CiB9CiAKIC0gKHZvaWQpX3Byb2Nlc3NE aWRFeGl0CkBAIC0yMTk2LDYgKzIyMDksMTkgQEAgLSAodm9pZClfZW5jbG9zaW5nU2Nyb2xsZXJT Y3JvbGxpbmdFbmRlZDooTlNUaW1lciAqKXRpbWVyCiAgICAgX2VuY2xvc2luZ1Njcm9sbFZpZXdT Y3JvbGxUaW1lciA9IG5pbDsKIH0KIAorc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6ZSBhY3RpdmVN aW5pbXVtTGF5b3V0U2l6ZShXS1dlYlZpZXcgKndlYlZpZXcsIGNvbnN0IENHUmVjdCYgYm91bmRz KQoreworICAgIGlmICh3ZWJWaWV3LT5fb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUpCisgICAg ICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUod2ViVmlldy0+X21pbmltdW1MYXlvdXRTaXpl T3ZlcnJpZGUpOworCisgICAgaWYgKFt3ZWJWaWV3LT5fc2Nyb2xsVmlldyByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9zeXN0ZW1Db250ZW50SW5zZXQpXSkgeworICAgICAgICBVSUVkZ2VJ bnNldHMgc3lzdGVtQ29udGVudEluc2V0ID0gW3dlYlZpZXctPl9zY3JvbGxWaWV3IF9zeXN0ZW1D b250ZW50SW5zZXRdOworICAgICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKFVJRWRnZUlu c2V0c0luc2V0UmVjdChDR1JlY3RNYWtlKDAsIDAsIGJvdW5kcy5zaXplLndpZHRoLCBib3VuZHMu c2l6ZS5oZWlnaHQpLCBzeXN0ZW1Db250ZW50SW5zZXQpLnNpemUpOworICAgIH0KKworICAgIHJl dHVybiBXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpOworfQorCiAtICh2b2lkKV9mcmFt ZU9yQm91bmRzQ2hhbmdlZAogewogICAgIENHUmVjdCBib3VuZHMgPSBzZWxmLmJvdW5kczsKQEAg LTIyMDMsNyArMjIyOSw3IEBAIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCiAKICAgICBp ZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gRHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9k ZTo6Tm90UmVzaXppbmcpIHsKICAgICAgICAgaWYgKCFfb3ZlcnJpZGVzTWluaW11bUxheW91dFNp emUpCi0gICAgICAgICAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxh eW91dFNpemUoV2ViQ29yZTo6RmxvYXRTaXplKGJvdW5kcy5zaXplKSk7CisgICAgICAgICAgICBf cGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoYWN0aXZlTWlu aW11bUxheW91dFNpemUoc2VsZiwgc2VsZi5ib3VuZHMpKTsKICAgICAgICAgaWYgKCFfb3ZlcnJp ZGVzTWF4aW11bVVub2JzY3VyZWRTaXplKQogICAgICAgICAgICAgX3BhZ2UtPnNldE1heGltdW1V bm9ic2N1cmVkU2l6ZShXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpKTsKICAgICAgICAg CkBAIC0yMjM5LDYgKzIyNjUsMTQgQEAgLSAoQk9PTClfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGlu ZwogICAgIHJldHVybiAhcG9pbnRzRXF1YWxJbkRldmljZVBpeGVscyhjb250ZW50T2Zmc2V0LCBi b3VuZGVkT2Zmc2V0LCBkZXZpY2VTY2FsZUZhY3Rvcik7CiB9CiAKKy0gKHZvaWQpc2FmZUFyZWFJ bnNldHNEaWRDaGFuZ2UKK3sKKyAgICBpZiAoW3N1cGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Ioc2FmZUFyZWFJbnNldHNEaWRDaGFuZ2UpXSkKKyAgICAgICAgW3N1cGVyIHNhZmVBcmVh SW5zZXRzRGlkQ2hhbmdlXTsKKworICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVj dFVwZGF0ZV07Cit9CisKIC0gKHZvaWQpX3NjaGVkdWxlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl CiB7CiAgICAgLy8gRm9yIHZpc2libGUgcmVjdCB1cGRhdGVzIG5vdCBhc3NvY2lhdGVkIHdpdGgg YSBzcGVjaWZpYyBVSVNjcm9sbFZpZXcsIGp1c3QgY29uc2lkZXIgb3VyIG93biBzY3JvbGxlci4K QEAgLTM2NTksMTEgKzM2OTMsNiBAQCAtICh2b2lkKV9raWxsV2ViQ29udGVudFByb2Nlc3NBbmRS ZXNldFN0YXRlCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi1zdGF0aWMgV2ViQ29yZTo6RmxvYXRT aXplIGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplKFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgQ0dS ZWN0JiBib3VuZHMpCi17Ci0gICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZSh3ZWJWaWV3LT5f b3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUgPyB3ZWJWaWV3LT5fbWluaW11bUxheW91dFNpemVP dmVycmlkZSA6IGJvdW5kcy5zaXplKTsKLX0KLQogc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6ZSBh Y3RpdmVNYXhpbXVtVW5vYnNjdXJlZFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBDR1Jl Y3QmIGJvdW5kcykKIHsKICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKHdlYlZpZXctPl9v dmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUgPyB3ZWJWaWV3LT5fbWF4aW11bVVub2JzY3Vy ZWRTaXplT3ZlcnJpZGUgOiBib3VuZHMuc2l6ZSk7Cg==