128710 2014-02-12 17:42:39 -0800 <rdar://problem/15994340> WK2: Cannot scroll to the bottom of the page when the keyboard is on the screen 2014-02-14 12:48:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin andersca enrica sam oldest_to_newest 980101 0 benjamin 2014-02-12 17:42:39 -0800 <rdar://problem/15994340> WK2: Cannot scroll to the bottom of the page when the keyboard is on the screen 980103 1 224032 benjamin 2014-02-12 17:44:15 -0800 Created attachment 224032 Patch 980910 2 224032 enrica 2014-02-14 12:40:34 -0800 Comment on attachment 224032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224032&action=review Looks good to me, > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:353 > + // FIXME: We will also need to adjust the unobscured rect by taking into account the keyboard rect and the obsucred insets. typo: obscured > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:360 > + if ([_contentView isAssistingNode]) Maybe you should add a comment explaining that this is the way you figure out that the notification is for this view. > Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm:290 > + // FIXME: We will also need to adjust the unobscured rect by taking into account the keyboard rect and the obsucred insets. Same typo. 980916 3 benjamin 2014-02-14 12:48:10 -0800 Committed r164120: <http://trac.webkit.org/changeset/164120> 224032 2014-02-12 17:44:15 -0800 2014-02-14 12:40:33 -0800 Patch bug-128710-20140212174415.patch text/plain 11307 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzOTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWExZTM5MDM5M2E3MDM3 MTE0N2U2MTZkZDE2ODFmYjEyZTIxNzEwZS4uYWE1NTc4Mzk0N2VkY2ZlOWU4MDI1MTA3NDU5YjFi ZGJjYjlmYjAyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAyLTEyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8xNTk5NDM0MD4gV0syOiBDYW5ub3Qgc2Nyb2xsIHRvIHRoZSBib3R0b20gb2YgdGhlIHBh Z2Ugd2hlbiB0aGUga2V5Ym9hcmQgaXMgb24gdGhlIHNjcmVlbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4NzEwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0tWaWV3L1dLV2ViVmlldyBuZWVkcyB0byBh ZGFwdCB0aGUgVUlTY3JvbGxWaWV3IGluc2V0cyB0byBsZWF2ZSBzb21lIHNwYWNlIGZvciB0aGUg a2V5Ym9hcmQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IGluaXRXaXRoRnJhbWU6Y29uZmlndXJhdGlvbjpdKToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IGRlYWxsb2NdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9rZXli b2FyZENoYW5nZWRXaXRoSW5mbzphZGp1c3RTY3JvbGxWaWV3Ol0pOgorICAgICAgICAoLVtXS1dl YlZpZXcgX2tleWJvYXJkV2lsbENoYW5nZUZyYW1lOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcg X2tleWJvYXJkRGlkQ2hhbmdlRnJhbWU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfa2V5Ym9h cmRXaWxsU2hvdzpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9rZXlib2FyZFdpbGxIaWRlOl0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGlzQXNzaXN0aW5nTm9kZV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dL SW50ZXJhY3Rpb25WaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9T Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgZGVhbGxvY10pOgorICAgICAgICAoLVtXS1ZpZXcgX2Nv bW1vbkluaXRpYWxpemF0aW9uV2l0aENvbnRleHRSZWY6cGFnZUdyb3VwUmVmOnJlbGF0ZWRUb1Bh Z2U6XSk6CisgICAgICAgICgtW1dLVmlldyBfa2V5Ym9hcmRDaGFuZ2VkV2l0aEluZm86YWRqdXN0 U2Nyb2xsVmlldzpdKToKKyAgICAgICAgKC1bV0tWaWV3IF9rZXlib2FyZFdpbGxDaGFuZ2VGcmFt ZTpdKToKKyAgICAgICAgKC1bV0tWaWV3IF9rZXlib2FyZERpZENoYW5nZUZyYW1lOl0pOgorICAg ICAgICAoLVtXS1ZpZXcgX2tleWJvYXJkV2lsbFNob3c6XSk6CisgICAgICAgICgtW1dLVmlldyBf a2V5Ym9hcmRXaWxsSGlkZTpdKToKKwogMjAxNC0wMi0xMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBBZGQgYSBDIEFQSSB0byBnZXQgV2ViQ3J5 cHRvIG1hc3RlciBrZXkgZnJvbSBhIGNsaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCA0MTA5ZWU1MmQ3Yzg5ZWQxZTEwZTg4Yjlj NGFiOWY5N2Q4MzBkMDFiLi45NDc5NzYzOGYzM2JkMzlkMmM2MGZhYWNjYmQ2MTFhZjdmZmVkYWY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQpAQCAtNDcsNiArNDcsMTIgQEAKIAogI2lmIFBMQVRGT1JNKElPUykKICNpbXBvcnQgIldLU2Ny b2xsVmlldy5oIgorI2ltcG9ydCA8VUlLaXQvVUlQZXJpcGhlcmFsSG9zdF9Qcml2YXRlLmg+CisK K0BpbnRlcmZhY2UgVUlTY3JvbGxWaWV3IChVSVNjcm9sbFZpZXdJbnRlcm5hbCkKKy0gKHZvaWQp X2FkanVzdEZvckF1dG9tYXRpY0tleWJvYXJkSW5mbzooTlNEaWN0aW9uYXJ5KilpbmZvIGFuaW1h dGVkOihCT09MKWFuaW1hdGVkIGxhc3RBZGp1c3RtZW50OihDR0Zsb2F0KilsYXN0QWRqdXN0bWVu dDsKK0BlbmQKKwogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpICYmICFQTEFURk9STShJT1Mp CkBAIC02OSw2ICs3NSw3IEBACiAKICAgICBVSUVkZ2VJbnNldHMgX29ic2N1cmVkSW5zZXRzOwog ICAgIGJvb2wgX2lzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHk7CisgICAgQ0dG bG9hdCBfbGFzdEFkanVzdG1lbnRGb3JTY3JvbGxlcjsKICNlbmRpZgogI2lmIFBMQVRGT1JNKE1B QykgJiYgIVBMQVRGT1JNKElPUykKICAgICBSZXRhaW5QdHI8V0tWaWV3PiBfd2tWaWV3OwpAQCAt MTEwLDYgKzExNywxMiBAQAogICAgIFtfc2Nyb2xsVmlldyBhZGRTdWJ2aWV3Ol9jb250ZW50Vmll dy5nZXQoKV07CiAKICAgICBbc2VsZiBfZnJhbWVPckJvdW5kc0NoYW5nZWRdOworCisgICAgTlNO b3RpZmljYXRpb25DZW50ZXIgKmNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0 Q2VudGVyXTsKKyAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9y KF9rZXlib2FyZFdpbGxDaGFuZ2VGcmFtZTopIG5hbWU6VUlLZXlib2FyZFdpbGxDaGFuZ2VGcmFt ZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKF9rZXlib2FyZERpZENoYW5nZUZyYW1lOikgbmFtZTpVSUtleWJv YXJkRGlkQ2hhbmdlRnJhbWVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgW2NlbnRlciBh ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmRXaWxsU2hvdzopIG5h bWU6VUlLZXlib2FyZFdpbGxTaG93Tm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOworICAgIFtjZW50 ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2tleWJvYXJkV2lsbEhpZGU6 KSBuYW1lOlVJS2V5Ym9hcmRXaWxsSGlkZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICNlbmRp ZgogCiAjaWYgUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oSU9TKQpAQCAtMTMxLDYgKzE0NCw5 IEBACiAtICh2b2lkKWRlYWxsb2MKIHsKICAgICBbX3JlbW90ZU9iamVjdFJlZ2lzdHJ5IF9pbnZh bGlkYXRlXTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBk ZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmXTsKKyNlbmRpZgogCiAgICAgW3N1cGVy IGRlYWxsb2NdOwogfQpAQCAtMzMyLDYgKzM0OCw0MiBAQAogICAgIFtfc2Nyb2xsVmlldyBzZXRD b250ZW50T2Zmc2V0OmNvbnRlbnRPZmZzZXRdOwogfQogCistICh2b2lkKV9rZXlib2FyZENoYW5n ZWRXaXRoSW5mbzooTlNEaWN0aW9uYXJ5ICopa2V5Ym9hcmRJbmZvIGFkanVzdFNjcm9sbFZpZXc6 KEJPT0wpYWRqdXN0U2Nyb2xsVmlldworeworICAgIC8vIEZJWE1FOiBXZSB3aWxsIGFsc28gbmVl ZCB0byBhZGp1c3QgdGhlIHVub2JzY3VyZWQgcmVjdCBieSB0YWtpbmcgaW50byBhY2NvdW50IHRo ZSBrZXlib2FyZCByZWN0IGFuZCB0aGUgb2JzdWNyZWQgaW5zZXRzLgorICAgIGlmIChhZGp1c3RT Y3JvbGxWaWV3KQorICAgICAgICBbX3Njcm9sbFZpZXcgX2FkanVzdEZvckF1dG9tYXRpY0tleWJv YXJkSW5mbzprZXlib2FyZEluZm8gYW5pbWF0ZWQ6WUVTIGxhc3RBZGp1c3RtZW50OiZfbGFzdEFk anVzdG1lbnRGb3JTY3JvbGxlcl07Cit9CisKKy0gKHZvaWQpX2tleWJvYXJkV2lsbENoYW5nZUZy YW1lOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgoreworICAgIGlmIChbX2NvbnRlbnRW aWV3IGlzQXNzaXN0aW5nTm9kZV0pCisgICAgICAgIFtzZWxmIF9rZXlib2FyZENoYW5nZWRXaXRo SW5mbzpub3RpZmljYXRpb24udXNlckluZm8gYWRqdXN0U2Nyb2xsVmlldzpZRVNdOworfQorCist ICh2b2lkKV9rZXlib2FyZERpZENoYW5nZUZyYW1lOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNh dGlvbgoreworICAgIFtzZWxmIF9rZXlib2FyZENoYW5nZWRXaXRoSW5mbzpub3RpZmljYXRpb24u dXNlckluZm8gYWRqdXN0U2Nyb2xsVmlldzpOT107Cit9CisKKy0gKHZvaWQpX2tleWJvYXJkV2ls bFNob3c6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgaWYgKFtfY29udGVu dFZpZXcgaXNBc3Npc3RpbmdOb2RlXSkKKyAgICAgICAgW3NlbGYgX2tleWJvYXJkQ2hhbmdlZFdp dGhJbmZvOm5vdGlmaWNhdGlvbi51c2VySW5mbyBhZGp1c3RTY3JvbGxWaWV3OllFU107Cit9CisK Ky0gKHZvaWQpX2tleWJvYXJkV2lsbEhpZGU6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9u Cit7CisgICAgLy8gSWdub3JlIGtleWJvYXJkIHdpbGwgaGlkZSBub3RpZmljYXRpb25zIHNlbnQg ZHVyaW5nIHJvdGF0aW9uLiBUaGV5J3JlIGp1c3QgdGhlcmUgZm9yCisgICAgLy8gYmFja3dhcmRz IGNvbXBhdGliaWxpdHkgcmVhc29ucyBhbmQgcHJvY2Vzc2luZyB0aGUgd2lsbCBoaWRlIG5vdGlm aWNhdGlvbiB3b3VsZAorICAgIC8vIHRlbXBvcmFyaWx5IHNjcmV3IHVwIHRoZSB0aGUgdW5vYnNj dXJlZCB2aWV3IGFyZWEuCisgICAgaWYgKFtbVUlQZXJpcGhlcmFsSG9zdCBzaGFyZWRJbnN0YW5j ZV0gcm90YXRpb25TdGF0ZV0pCisgICAgICAgIHJldHVybjsKKworICAgIFtzZWxmIF9rZXlib2Fy ZENoYW5nZWRXaXRoSW5mbzpub3RpZmljYXRpb24udXNlckluZm8gYWRqdXN0U2Nyb2xsVmlldzpZ RVNdOworfQorCisKICNlbmRpZgogCiAjcHJhZ21hIG1hcmsgT1MgWC1zcGVjaWZpYyBtZXRob2Rz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRW aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3LmgK aW5kZXggMTE3NzVlZTllNjUwMDBhMTU1MDc4NWFmYTNkM2EyZGQ3ZmQxMzJjYS4uZmJiMmNkYjA0 YjcxMjQ3ZjRmNWU2OTVmY2VkMTg1MTk1NDY5NTYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcuaApAQCAtNDksMTEgKzQ5LDEyIEBAIGNs YXNzIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOwogV0tfQVBJX0NMQVNTCiBAaW50ZXJmYWNl IFdLQ29udGVudFZpZXcgOiBVSVZpZXcKIAotQHByb3BlcnR5IChyZWFkb25seSwgbm9uYXRvbWlj KSBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgKmJyb3dzaW5nQ29udGV4dENvbnRyb2xsZXI7 CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFdLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlciAqYnJvd3NpbmdDb250ZXh0Q29udHJvbGxlcjsKIAogQHByb3BlcnR5IChub25hdG9taWMs IGFzc2lnbikgaWQgPFdLQ29udGVudFZpZXdEZWxlZ2F0ZT4gZGVsZWdhdGU7CiAKLUBwcm9wZXJ0 eSAocmVhZG9ubHkpIFdLUGFnZVJlZiBfcGFnZVJlZjsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBy ZWFkb25seSkgV0tQYWdlUmVmIF9wYWdlUmVmOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5KSBCT09MIGlzQXNzaXN0aW5nTm9kZTsKIAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnJh bWU6KENHUmVjdClmcmFtZSBjb25maWd1cmF0aW9uOihXS1dlYlZpZXdDb25maWd1cmF0aW9uICop Y29uZmlndXJhdGlvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9z L1dLQ29udGVudFZpZXcubW0KaW5kZXggOGE4MGZlOGMyOTkwOTYwN2M4YzE4ZDJiM2ZjYTllMGFl YjVlM2RjOC4uOGIxZTg2MzAxYzIxMTM0YTgwM2VkMzdkN2ZiOWRkMzE2NGM4YmE1NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBA IC0xNzEsNiArMTcxLDExIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAgcmV0dXJuIHRv QVBJKF9wYWdlLmdldCgpKTsKIH0KIAorLSAoQk9PTClpc0Fzc2lzdGluZ05vZGUKK3sKKyAgICBy ZXR1cm4gW19pbnRlcmFjdGlvblZpZXcgaXNFZGl0YWJsZV07Cit9CisKIC0gKHZvaWQpc2V0TWlu aW11bVNpemU6KENHU2l6ZSlzaXplCiB7CiAgICAgX3BhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFNp emUoSW50U2l6ZShzaXplKSwgSW50U2l6ZSgpLCBJbnRTaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tJbnRlcmFjdGlvblZpZXcuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLSW50ZXJhY3Rpb25WaWV3LmgKaW5kZXggMzgz ZmQ3ODU5Yjg0MWIyMzJjYWVlMGFkZWI0MzcyNDI0MGRkZjhlZi4uNjlhZDZjMjJkODg3NDc3ZjZk ZGNhMDJiNjM5ZDZhZDczYzUxZmFiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tJbnRlcmFjdGlvblZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2lvcy9XS0ludGVyYWN0aW9uVmlldy5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMiwgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTUwLDYgKzUwLDggQEAgc3Ry dWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOwogCiBAaW50ZXJmYWNlIFdLSW50 ZXJhY3Rpb25WaWV3IDogVUlWaWV3PFVJR2VzdHVyZVJlY29nbml6ZXJEZWxlZ2F0ZSwgVUlXZWJU b3VjaEV2ZW50c0dlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGUsIFVJVGV4dElucHV0UHJpdmF0ZSwg VUlXZWJGb3JtQWNjZXNzb3J5RGVsZWdhdGUsIFVJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbD4K IAorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBCT09MIGlzRWRpdGFibGU7CisKIC0g KHZvaWQpc2V0U2Nyb2xsVmlldzooVUlXZWJTY3JvbGxWaWV3ICopc2Nyb2xsVmlldzsKIC0gKHZv aWQpc2V0UGFnZTooUGFzc1JlZlB0cjxXZWJLaXQ6OldlYlBhZ2VQcm94eT4pcGFnZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tCmluZGV4IDY2ZWZj MDJjNWNkM2Y2NTkxYjEzMjJlNjE3ZTU5NzlmOGU1OTlhMGMuLjdkZWRkYjRjNjMxMTUxMmY4MDJk ODZlZWEyMWYzOGZlODQwN2Q0MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvaW9zL1dLVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2lvcy9XS1ZpZXdJT1MubW0KQEAgLTM1LDYgKzM1LDcgQEAKICNpbXBvcnQgIldLU2Nyb2xsVmll dy5oIgogI2ltcG9ydCAiV0tBUElDYXN0LmgiCiAjaW1wb3J0IDxVSUtpdC9VSUltYWdlX1ByaXZh dGUuaD4KKyNpbXBvcnQgPFVJS2l0L1VJUGVyaXBoZXJhbEhvc3RfUHJpdmF0ZS5oPgogI2ltcG9y dCA8VUlLaXQvVUlTY3JlZW4uaD4KICNpbXBvcnQgPFVJS2l0L1VJU2Nyb2xsVmlld19Qcml2YXRl Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVdpbmRvd19Qcml2YXRlLmg+CkBAIC00Niw2ICs0NywxMCBA QCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogLSAodm9pZClfc2V0RG9jdW1lbnRTY2FsZTooQ0dG bG9hdCluZXdTY2FsZTsKIEBlbmQKIAorQGludGVyZmFjZSBVSVNjcm9sbFZpZXcgKFVJU2Nyb2xs Vmlld0ludGVybmFsKQorLSAodm9pZClfYWRqdXN0Rm9yQXV0b21hdGljS2V5Ym9hcmRJbmZvOihO U0RpY3Rpb25hcnkqKWluZm8gYW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQgbGFzdEFkanVzdG1lbnQ6 KENHRmxvYXQqKWxhc3RBZGp1c3RtZW50OworQGVuZAorCiBAaW1wbGVtZW50YXRpb24gV0tWaWV3 IHsKICAgICBSZXRhaW5QdHI8V0tTY3JvbGxWaWV3PiBfc2Nyb2xsVmlldzsKICAgICBSZXRhaW5Q dHI8V0tDb250ZW50Vmlldz4gX2NvbnRlbnRWaWV3OwpAQCAtNjAsNiArNjUsNyBAQCB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogCiAgICAgVUlFZGdlSW5zZXRzIF9vYnNjdXJlZEluc2V0czsKICAg ICBib29sIF9pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5OworICAgIENHRmxv YXQgX2xhc3RBZGp1c3RtZW50Rm9yU2Nyb2xsZXI7CiB9CiAKIC0gKGlkKWluaXRXaXRoQ29kZXI6 KE5TQ29kZXIgKiljb2RlcgpAQCAtODMsNiArODksMTIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKICAgICByZXR1cm4gc2VsZjsKIH0KIAorLSAodm9pZClkZWFsbG9jCit7CisgICAgW1tOU05v dGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmXTsKKyAg ICBbc3VwZXIgZGVhbGxvY107Cit9CisKIC0gKHZvaWQpc2V0RnJhbWU6KENHUmVjdClmcmFtZQog ewogICAgIENHUmVjdCBvbGRGcmFtZSA9IFtzZWxmIGZyYW1lXTsKQEAgLTIzNCw2ICsyNDYsMTIg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKICAgICBbX3Njcm9sbFZpZXcgYWRkU3Vidmlldzpf Y29udGVudFZpZXcuZ2V0KCldOwogCiAgICAgW3NlbGYgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXTsK KworICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpjZW50ZXIgPSBbTlNOb3RpZmljYXRpb25DZW50 ZXIgZGVmYXVsdENlbnRlcl07CisgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9y OkBzZWxlY3Rvcihfa2V5Ym9hcmRXaWxsQ2hhbmdlRnJhbWU6KSBuYW1lOlVJS2V5Ym9hcmRXaWxs Q2hhbmdlRnJhbWVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgW2NlbnRlciBhZGRPYnNl cnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmREaWRDaGFuZ2VGcmFtZTopIG5h bWU6VUlLZXlib2FyZERpZENoYW5nZUZyYW1lTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOworICAg IFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2tleWJvYXJkV2ls bFNob3c6KSBuYW1lOlVJS2V5Ym9hcmRXaWxsU2hvd05vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsK KyAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9rZXlib2Fy ZFdpbGxIaWRlOikgbmFtZTpVSUtleWJvYXJkV2lsbEhpZGVOb3RpZmljYXRpb24gb2JqZWN0Om5p bF07CiB9CiAKIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCkBAIC0yNjcsNiArMjg1LDQx IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAgcmV0dXJuIGltYWdlLkNHSW1hZ2U7CiB9 CiAKKy0gKHZvaWQpX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOihOU0RpY3Rpb25hcnkgKilrZXli b2FyZEluZm8gYWRqdXN0U2Nyb2xsVmlldzooQk9PTClhZGp1c3RTY3JvbGxWaWV3Cit7CisgICAg Ly8gRklYTUU6IFdlIHdpbGwgYWxzbyBuZWVkIHRvIGFkanVzdCB0aGUgdW5vYnNjdXJlZCByZWN0 IGJ5IHRha2luZyBpbnRvIGFjY291bnQgdGhlIGtleWJvYXJkIHJlY3QgYW5kIHRoZSBvYnN1Y3Jl ZCBpbnNldHMuCisgICAgaWYgKGFkanVzdFNjcm9sbFZpZXcpCisgICAgICAgIFtfc2Nyb2xsVmll dyBfYWRqdXN0Rm9yQXV0b21hdGljS2V5Ym9hcmRJbmZvOmtleWJvYXJkSW5mbyBhbmltYXRlZDpZ RVMgbGFzdEFkanVzdG1lbnQ6Jl9sYXN0QWRqdXN0bWVudEZvclNjcm9sbGVyXTsKK30KKworLSAo dm9pZClfa2V5Ym9hcmRXaWxsQ2hhbmdlRnJhbWU6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0 aW9uCit7CisgICAgaWYgKFtfY29udGVudFZpZXcgaXNBc3Npc3RpbmdOb2RlXSkKKyAgICAgICAg W3NlbGYgX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlvbi51c2VySW5mbyBhZGp1 c3RTY3JvbGxWaWV3OllFU107Cit9CisKKy0gKHZvaWQpX2tleWJvYXJkRGlkQ2hhbmdlRnJhbWU6 KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgW3NlbGYgX2tleWJvYXJkQ2hh bmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlvbi51c2VySW5mbyBhZGp1c3RTY3JvbGxWaWV3Ok5PXTsK K30KKworLSAodm9pZClfa2V5Ym9hcmRXaWxsU2hvdzooTlNOb3RpZmljYXRpb24gKilub3RpZmlj YXRpb24KK3sKKyAgICBpZiAoW19jb250ZW50VmlldyBpc0Fzc2lzdGluZ05vZGVdKQorICAgICAg ICBbc2VsZiBfa2V5Ym9hcmRDaGFuZ2VkV2l0aEluZm86bm90aWZpY2F0aW9uLnVzZXJJbmZvIGFk anVzdFNjcm9sbFZpZXc6WUVTXTsKK30KKworLSAodm9pZClfa2V5Ym9hcmRXaWxsSGlkZTooTlNO b3RpZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICAvLyBJZ25vcmUga2V5Ym9hcmQgd2ls bCBoaWRlIG5vdGlmaWNhdGlvbnMgc2VudCBkdXJpbmcgcm90YXRpb24uIFRoZXkncmUganVzdCB0 aGVyZSBmb3IKKyAgICAvLyBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eSByZWFzb25zIGFuZCBwcm9j ZXNzaW5nIHRoZSB3aWxsIGhpZGUgbm90aWZpY2F0aW9uIHdvdWxkCisgICAgLy8gdGVtcG9yYXJp bHkgc2NyZXcgdXAgdGhlIHRoZSB1bm9ic2N1cmVkIHZpZXcgYXJlYS4KKyAgICBpZiAoW1tVSVBl cmlwaGVyYWxIb3N0IHNoYXJlZEluc3RhbmNlXSByb3RhdGlvblN0YXRlXSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgW3NlbGYgX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlvbi51 c2VySW5mbyBhZGp1c3RTY3JvbGxWaWV3OllFU107Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0 aW9uIFdLVmlldyAoUHJpdmF0ZSkK