132759 2014-05-09 16:54:42 -0700 [iOS WK2] Fixed elements can go outside the document on pinching 2014-05-09 17:12:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser benjamin simon.fraser oldest_to_newest 1008139 0 simon.fraser 2014-05-09 16:54:42 -0700 [iOS WK2] Fixed elements can go outside the document on pinching 1008140 1 231197 simon.fraser 2014-05-09 16:57:57 -0700 Created attachment 231197 Patch 1008141 2 simon.fraser 2014-05-09 16:58:32 -0700 <rdar://problem/16870835> 1008145 3 231197 benjamin 2014-05-09 17:05:24 -0700 Comment on attachment 231197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231197&action=review > Source/WebKit2/UIProcess/ios/WKContentView.mm:295 > +static inline float adjustedUnexposedEdge(float documentEdge, float exposedRectEdge, float factor) maybe adjustedUnexposedEdge -> adjustedUnexposedMinEdge 1008153 4 simon.fraser 2014-05-09 17:12:17 -0700 https://trac.webkit.org/r168560 231197 2014-05-09 16:57:57 -0700 2014-05-09 17:05:23 -0700 Patch bug-132759-20140509165735.patch text/plain 9507 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmU3N2EyYTRmM2M5MWY1 OGY5NzM1MmRjOTgzNGYzOTE3MDUyZjdkNy4uOTE2Zjk4N2EwNjA1ZTg4Y2JjNzkyMTdjYjU4MTE3 NGRjN2JhZTVhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA1LTA5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBG aXhlZCBlbGVtZW50cyBjYW4gZ28gb3V0c2lkZSB0aGUgZG9jdW1lbnQgb24gcGluY2hpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjc1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQ29u c3RyYWluIHRoZSByZWN0IHVzZWQgdG8gcG9zaXRpb24gZml4ZWQgcG9zaXRpb24gb2JqZWN0cyB3 aGVuIHBpbmNoaW5nICh3aGVuCisgICAgICAgIHRoZSBzY2FsZSBnb2VzIGJlbG93IHRoZSBtaW5p bXVtU2NhbGUpLiBEbyBzbyBpbiBzdWNoIGEgd2F5IHRoYXQgdGhlcmUncyBhIHNtb290aAorICAg ICAgICB0cmFuc2l0aW9uIGJldHdlZW4gcnViYmVyLWJhbmRpbmcgYW5kIHBpbmNoaW5nLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dL V2ViVmlldyBfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmRdKTogVXNlIGEgbmljZXIgZm9ybSBm b3Igc3RkOjptYXg8Pi4KKyAgICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzXSk6IFBhc3MgdGhlIG1pbmltdW0gc2NhbGUuCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9pb3MvV0tWaWV3SU9TLm1tOgorICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVZpc2libGVDb250 ZW50UmVjdHNdKTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAo YWRqdXN0ZWRVbmV4cG9zZWRFZGdlKTogSGVscGVyIHRvIGFkanVzdCB0aGUgbGVmdC90b3AuCisg ICAgICAgIChhZGp1c3RlZFVuZXhwb3NlZE1heEVkZ2UpOiBIZWxwZXIgdG8gYWRqdXN0IHRoZSBy aWdodC9ib3R0b20uCisgICAgICAgIChmaXhlZFBvc2l0aW9uUmVjdEZyb21FeHBvc2VkUmVjdCk6 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZGlkVXBkYXRlVmlzaWJsZVJlY3Q6dW5vYnNjdXJl ZFJlY3Q6c2NhbGU6bWluaW11bVNjYWxlOmluU3RhYmxlU3RhdGU6XSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgZGlkVXBkYXRlVmlzaWJsZVJlY3Q6dW5vYnNjdXJlZFJlY3Q6c2NhbGU6aW5T dGFibGVTdGF0ZTpdKTogRGVsZXRlZC4KKwogMjAxNC0wNS0wOSAgR29yZG9uIFNoZXJpZGFuICA8 Z29yZG9uX3NoZXJpZGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHBvc2UgZnVuY3Rpb25zIG5l Y2Vzc2FyeSBmb3IgY29weWluZyBmYXZpY29uIGJldHdlZW4gSWNvbkRhdGFiYXNlcy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMmVk Nzc1NzM3MmQzZThmYzdiMjAzYjE1MDU3YjAzZDNhYWE3ODlkMC4uMGEyNTYzMDU5NjM3MGNkNjg0 ZDY0YjdkYzcxZjMwNWYyMjcxOGYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTQ0Nyw3ICs0NDcsNyBAQCAtICh2b2lkKV91cGRh dGVTY3JvbGxWaWV3QmFja2dyb3VuZAogICAgIENHRmxvYXQgbWluaW11bVpvb21TY2FsZSA9IFtf c2Nyb2xsVmlldyBtaW5pbXVtWm9vbVNjYWxlXTsKICAgICBpZiAoem9vbVNjYWxlIDwgbWluaW11 bVpvb21TY2FsZSkgewogICAgICAgICBDR0Zsb2F0IHNsb3BlID0gMTI7Ci0gICAgICAgIENHRmxv YXQgb3BhY2l0eSA9IHN0ZDo6bWF4KDEgLSBzbG9wZSAqIChtaW5pbXVtWm9vbVNjYWxlIC0gem9v bVNjYWxlKSwgc3RhdGljX2Nhc3Q8Q0dGbG9hdD4oMCkpOworICAgICAgICBDR0Zsb2F0IG9wYWNp dHkgPSBzdGQ6Om1heDxDR0Zsb2F0PigxIC0gc2xvcGUgKiAobWluaW11bVpvb21TY2FsZSAtIHpv b21TY2FsZSksIDApOwogICAgICAgICBjZ0NvbG9yID0gYWRvcHRDRihDR0NvbG9yQ3JlYXRlQ29w eVdpdGhBbHBoYShjZ0NvbG9yLmdldCgpLCBvcGFjaXR5KSk7CiAgICAgfQogICAgIFJldGFpblB0 cjxVSUNvbG9yKj4gdWlCYWNrZ3JvdW5kQ29sb3IgPSBhZG9wdE5TKFtbVUlDb2xvciBhbGxvY10g aW5pdFdpdGhDR0NvbG9yOmNnQ29sb3IuZ2V0KCldKTsKQEAgLTc3OSw3ICs3NzksNyBAQCAtICh2 b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgQ0dGbG9hdCBzY2FsZUZhY3RvciA9 IGNvbnRlbnRab29tU2NhbGUoc2VsZik7CiAKICAgICBCT09MIGlzU3RhYmxlU3RhdGUgPSAhKF9p c0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5IHx8IFtfc2Nyb2xsVmlldyBpc0Ry YWdnaW5nXSB8fCBbX3Njcm9sbFZpZXcgaXNEZWNlbGVyYXRpbmddIHx8IFtfc2Nyb2xsVmlldyBp c1pvb21pbmddIHx8IFtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10gfHwgW19zY3JvbGxWaWV3 IF9pc0FuaW1hdGluZ1pvb21dKTsKLSAgICBbX2NvbnRlbnRWaWV3IGRpZFVwZGF0ZVZpc2libGVS ZWN0OnZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgdW5vYnNjdXJlZFJlY3Q6dW5vYnNj dXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyBzY2FsZTpzY2FsZUZhY3RvciBpblN0YWJsZVN0 YXRlOmlzU3RhYmxlU3RhdGVdOworICAgIFtfY29udGVudFZpZXcgZGlkVXBkYXRlVmlzaWJsZVJl Y3Q6dmlzaWJsZVJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyB1bm9ic2N1cmVkUmVjdDp1bm9ic2N1 cmVkUmVjdEluQ29udGVudENvb3JkaW5hdGVzIHNjYWxlOnNjYWxlRmFjdG9yIG1pbmltdW1TY2Fs ZTpbX3Njcm9sbFZpZXcgbWluaW11bVpvb21TY2FsZV0gaW5TdGFibGVTdGF0ZTppc1N0YWJsZVN0 YXRlXTsKIH0KIAogLSAodm9pZClfa2V5Ym9hcmRDaGFuZ2VkV2l0aEluZm86KE5TRGljdGlvbmFy eSAqKWtleWJvYXJkSW5mbyBhZGp1c3RTY3JvbGxWaWV3OihCT09MKWFkanVzdFNjcm9sbFZpZXcK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLVmlld0lPUy5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLVmlld0lPUy5tbQppbmRleCBh Nzc1MzU5MjZlMTI3NWIyYjU4MjVhMTIwOTk3YTBhOTEzMGJjMjdmLi5jNDg2ZWE4Nzk1NzE4NWEy NThmOTFkNDRiOTZlYTY4NWU2YjM4YmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9pb3MvV0tWaWV3SU9TLm1tCkBAIC0yNjEsOSArMjYxLDcgQEAgLSAodm9pZClfdXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0cwogICAgIENHUmVjdCB1bm9ic2N1cmVkUmVjdCA9IFVJRWRnZUlu c2V0c0luc2V0UmVjdChmdWxsVmlld1JlY3QsIF9vYnNjdXJlZEluc2V0cyk7CiAgICAgQ0dSZWN0 IHVub2JzY3VyZWRSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0UmVjdDp1 bm9ic2N1cmVkUmVjdCB0b1ZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsKIAotICAgIENHRmxvYXQg c2NhbGVGYWN0b3IgPSBbX3Njcm9sbFZpZXcgem9vbVNjYWxlXTsKLQotICAgIFtfY29udGVudFZp ZXcgZGlkVXBkYXRlVmlzaWJsZVJlY3Q6dmlzaWJsZVJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyB1 bm9ic2N1cmVkUmVjdDp1bm9ic2N1cmVkUmVjdEluQ29udGVudENvb3JkaW5hdGVzIHNjYWxlOnNj YWxlRmFjdG9yIGluU3RhYmxlU3RhdGU6WUVTXTsKKyAgICBbX2NvbnRlbnRWaWV3IGRpZFVwZGF0 ZVZpc2libGVSZWN0OnZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgdW5vYnNjdXJlZFJl Y3Q6dW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyBzY2FsZTpbX3Njcm9sbFZpZXcg em9vbVNjYWxlXSBtaW5pbXVtU2NhbGU6W19zY3JvbGxWaWV3IG1pbmltdW1ab29tU2NhbGVdIGlu U3RhYmxlU3RhdGU6WUVTXTsKIH0KIAogLSAodm9pZClfa2V5Ym9hcmRDaGFuZ2VkV2l0aEluZm86 KE5TRGljdGlvbmFyeSAqKWtleWJvYXJkSW5mbyBhZGp1c3RTY3JvbGxWaWV3OihCT09MKWFkanVz dFNjcm9sbFZpZXcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 LmgKaW5kZXggYjM4YjEwNDczNmVhYjNkZTdiNDk1OGQ5ZjZlNTVkNDMzZTM0NmE4NC4uMGY2NDg4 OTY0Y2Q4MzNmZTg4YWQ5YmNmNjZhZGE1ODg1NjZkNWViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKQEAgLTYwLDcgKzYwLDcgQEAgc3RydWN0IFdl YlBhZ2VDb25maWd1cmF0aW9uOwogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KENHUmVj dClmcmFtZSBjb250ZXh0OihXZWJLaXQ6OldlYkNvbnRleHQmKWNvbnRleHQgY29uZmlndXJhdGlv bjooV2ViS2l0OjpXZWJQYWdlQ29uZmlndXJhdGlvbil3ZWJQYWdlQ29uZmlndXJhdGlvbiB3ZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3OwogCiAtICh2b2lkKXNldE1pbmltdW1TaXplOihDR1Np emUpc2l6ZTsKLS0gKHZvaWQpZGlkVXBkYXRlVmlzaWJsZVJlY3Q6KENHUmVjdCl2aXNpYmxlUmVj dCB1bm9ic2N1cmVkUmVjdDooQ0dSZWN0KXVub2JzY3VyZWRSZWN0IHNjYWxlOihDR0Zsb2F0KXNj YWxlIGluU3RhYmxlU3RhdGU6KEJPT0wpaXNTdGFibGVTdGF0ZTsKKy0gKHZvaWQpZGlkVXBkYXRl VmlzaWJsZVJlY3Q6KENHUmVjdCl2aXNpYmxlUmVjdCB1bm9ic2N1cmVkUmVjdDooQ0dSZWN0KXVu b2JzY3VyZWRSZWN0IHNjYWxlOihDR0Zsb2F0KXNjYWxlIG1pbmltdW1TY2FsZTooQ0dGbG9hdClt aW5pbXVtU2NhbGUgaW5TdGFibGVTdGF0ZTooQk9PTClpc1N0YWJsZVN0YXRlOwogCiAtICh2b2lk KWRpZEZpbmlzaFNjcm9sbGluZzsKIC0gKHZvaWQpZGlkWm9vbVRvU2NhbGU6KENHRmxvYXQpc2Nh bGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5k ZXggNmM3YjE1MTUwMDU5NzEyODkzNDFlMDI2OTEyODM2NWZlMTllOTRjYi4uMGFmNTM5Y2MwMTgx NjBhZmI4ZDdkNTM5OTYyNjc3NDA1ZmM2MzQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtMjkyLDEyICsyOTIsNDEgQEAgLSAodm9pZClz ZXRTaG93aW5nSW5zcGVjdG9ySW5kaWNhdGlvbjooQk9PTClzaG93CiAgICAgfQogfQogCi1zdGF0 aWMgaW5saW5lIEZsb2F0UmVjdCBmaXhlZFBvc2l0aW9uUmVjdEZyb21FeHBvc2VkUmVjdChDR1Jl Y3QgdW5vYnNjdXJlZFJlY3QsIENHU2l6ZSBkb2N1bWVudFNpemUsIENHRmxvYXQgc2NhbGUpCitz dGF0aWMgaW5saW5lIGZsb2F0IGFkanVzdGVkVW5leHBvc2VkRWRnZShmbG9hdCBkb2N1bWVudEVk Z2UsIGZsb2F0IGV4cG9zZWRSZWN0RWRnZSwgZmxvYXQgZmFjdG9yKQogewotICAgIHJldHVybiBG cmFtZVZpZXc6OnJlY3RGb3JWaWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0cyhlbmNsb3NpbmdMYXlv dXRSZWN0KHVub2JzY3VyZWRSZWN0KSwgcm91bmRlZExheW91dFNpemUoRmxvYXRTaXplKGRvY3Vt ZW50U2l6ZSkpLCBzY2FsZSwgZmFsc2UsIFN0aWNrVG9WaWV3cG9ydEJvdW5kcyk7CisgICAgaWYg KGV4cG9zZWRSZWN0RWRnZSA8IGRvY3VtZW50RWRnZSkKKyAgICAgICAgcmV0dXJuIGRvY3VtZW50 RWRnZSAtIGZhY3RvciAqIChkb2N1bWVudEVkZ2UgLSBleHBvc2VkUmVjdEVkZ2UpOworICAgIAor ICAgIHJldHVybiBleHBvc2VkUmVjdEVkZ2U7Cit9CisKK3N0YXRpYyBpbmxpbmUgZmxvYXQgYWRq dXN0ZWRVbmV4cG9zZWRNYXhFZGdlKGZsb2F0IGRvY3VtZW50RWRnZSwgZmxvYXQgZXhwb3NlZFJl Y3RFZGdlLCBmbG9hdCBmYWN0b3IpCit7CisgICAgaWYgKGV4cG9zZWRSZWN0RWRnZSA+IGRvY3Vt ZW50RWRnZSkKKyAgICAgICAgcmV0dXJuIGRvY3VtZW50RWRnZSArIGZhY3RvciAqIChleHBvc2Vk UmVjdEVkZ2UgLSBkb2N1bWVudEVkZ2UpOworICAgIAorICAgIHJldHVybiBleHBvc2VkUmVjdEVk Z2U7Cit9CisKK3N0YXRpYyBpbmxpbmUgRmxvYXRSZWN0IGZpeGVkUG9zaXRpb25SZWN0RnJvbUV4 cG9zZWRSZWN0KENHUmVjdCB1bm9ic2N1cmVkUmVjdCwgQ0dTaXplIGRvY3VtZW50U2l6ZSwgQ0dG bG9hdCBzY2FsZSwgQ0dGbG9hdCBtaW5pbXVtU2NhbGUpCit7CisgICAgRmxvYXRSZWN0IGNvbnN0 cmFpbmVkVW5vYnNjdXJlZFJlY3QgPSB1bm9ic2N1cmVkUmVjdDsKKyAgICBGbG9hdFJlY3QgZG9j dW1lbnRSZWN0ID0gRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKGRvY3VtZW50U2l6 ZSkpOworICAgIAorICAgIGlmIChzY2FsZSA8IG1pbmltdW1TY2FsZSkgeworICAgICAgICBjb25z dCBDR0Zsb2F0IHNsb3BlID0gMTI7CisgICAgICAgIENHRmxvYXQgZmFjdG9yID0gc3RkOjptYXg8 Q0dGbG9hdD4oMSAtIHNsb3BlICogKG1pbmltdW1TY2FsZSAtIHNjYWxlKSwgMCk7CisgICAgICAg ICAgICAKKyAgICAgICAgY29uc3RyYWluZWRVbm9ic2N1cmVkUmVjdC5zZXRYKGFkanVzdGVkVW5l eHBvc2VkRWRnZShkb2N1bWVudFJlY3QueCgpLCBjb25zdHJhaW5lZFVub2JzY3VyZWRSZWN0Lngo KSwgZmFjdG9yKSk7CisgICAgICAgIGNvbnN0cmFpbmVkVW5vYnNjdXJlZFJlY3Quc2V0WShhZGp1 c3RlZFVuZXhwb3NlZEVkZ2UoZG9jdW1lbnRSZWN0LnkoKSwgY29uc3RyYWluZWRVbm9ic2N1cmVk UmVjdC55KCksIGZhY3RvcikpOworICAgICAgICBjb25zdHJhaW5lZFVub2JzY3VyZWRSZWN0LnNl dFdpZHRoKGFkanVzdGVkVW5leHBvc2VkTWF4RWRnZShkb2N1bWVudFJlY3QubWF4WCgpLCBjb25z dHJhaW5lZFVub2JzY3VyZWRSZWN0Lm1heFgoKSwgZmFjdG9yKSAtIGNvbnN0cmFpbmVkVW5vYnNj dXJlZFJlY3QueCgpKTsKKyAgICAgICAgY29uc3RyYWluZWRVbm9ic2N1cmVkUmVjdC5zZXRIZWln aHQoYWRqdXN0ZWRVbmV4cG9zZWRNYXhFZGdlKGRvY3VtZW50UmVjdC5tYXhZKCksIGNvbnN0cmFp bmVkVW5vYnNjdXJlZFJlY3QubWF4WSgpLCBmYWN0b3IpIC0gY29uc3RyYWluZWRVbm9ic2N1cmVk UmVjdC55KCkpOworICAgIH0KKyAgICAKKyAgICByZXR1cm4gRnJhbWVWaWV3OjpyZWN0Rm9yVmll d3BvcnRDb25zdHJhaW5lZE9iamVjdHMoZW5jbG9zaW5nTGF5b3V0UmVjdChjb25zdHJhaW5lZFVu b2JzY3VyZWRSZWN0KSwgcm91bmRlZExheW91dFNpemUoRmxvYXRTaXplKGRvY3VtZW50U2l6ZSkp LCBzY2FsZSwgZmFsc2UsIFN0aWNrVG9WaWV3cG9ydEJvdW5kcyk7CiB9CiAKLS0gKHZvaWQpZGlk VXBkYXRlVmlzaWJsZVJlY3Q6KENHUmVjdCl2aXNpYmxlUmVjdCB1bm9ic2N1cmVkUmVjdDooQ0dS ZWN0KXVub2JzY3VyZWRSZWN0IHNjYWxlOihDR0Zsb2F0KXpvb21TY2FsZSBpblN0YWJsZVN0YXRl OihCT09MKWlzU3RhYmxlU3RhdGUKKy0gKHZvaWQpZGlkVXBkYXRlVmlzaWJsZVJlY3Q6KENHUmVj dCl2aXNpYmxlUmVjdCB1bm9ic2N1cmVkUmVjdDooQ0dSZWN0KXVub2JzY3VyZWRSZWN0IHNjYWxl OihDR0Zsb2F0KXpvb21TY2FsZSBtaW5pbXVtU2NhbGU6KENHRmxvYXQpbWluaW11bVNjYWxlIGlu U3RhYmxlU3RhdGU6KEJPT0wpaXNTdGFibGVTdGF0ZQogewogICAgIGRvdWJsZSB0aW1lc3RhbXAg PSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKICAgICBIaXN0b3JpY2FsVmVsb2NpdHlE YXRhOjpWZWxvY2l0eURhdGEgdmVsb2NpdHlEYXRhOwpAQCAtMzE0LDExICszNDMsMTEgQEAgLSAo dm9pZClkaWRVcGRhdGVWaXNpYmxlUmVjdDooQ0dSZWN0KXZpc2libGVSZWN0IHVub2JzY3VyZWRS ZWN0OihDR1JlY3QpdW5vYnNjdXIKICAgICAgICAgZmlsdGVyZWRTY2FsZSA9IF9wYWdlLT5kaXNw bGF5ZWRDb250ZW50U2NhbGUoKTsKICAgICB9CiAKLSAgICBGbG9hdFJlY3QgY3VzdG9tRml4ZWRQ b3NpdGlvblJlY3QgPSBmaXhlZFBvc2l0aW9uUmVjdEZyb21FeHBvc2VkUmVjdCh1bm9ic2N1cmVk UmVjdCwgW3NlbGYgYm91bmRzXS5zaXplLCB6b29tU2NhbGUpOworICAgIEZsb2F0UmVjdCBjdXN0 b21GaXhlZFBvc2l0aW9uUmVjdCA9IGZpeGVkUG9zaXRpb25SZWN0RnJvbUV4cG9zZWRSZWN0KHVu b2JzY3VyZWRSZWN0LCBbc2VsZiBib3VuZHNdLnNpemUsIHpvb21TY2FsZSwgbWluaW11bVNjYWxl KTsKICAgICBfcGFnZS0+dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhWaXNpYmxlQ29udGVudFJl Y3RVcGRhdGVJbmZvKF9wYWdlLT5uZXh0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQoKSwgdmlz aWJsZVJlY3QsIHVub2JzY3VyZWRSZWN0LCBjdXN0b21GaXhlZFBvc2l0aW9uUmVjdCwgZmlsdGVy ZWRTY2FsZSwgaXNTdGFibGVTdGF0ZSwgdGltZXN0YW1wLCB2ZWxvY2l0eURhdGEuaG9yaXpvbnRh bFZlbG9jaXR5LCB2ZWxvY2l0eURhdGEudmVydGljYWxWZWxvY2l0eSwgdmVsb2NpdHlEYXRhLnNj YWxlQ2hhbmdlUmF0ZSkpOwogICAgIAogICAgIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJv eHkqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJv eHkoKTsKLSAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dmlld3BvcnRDaGFuZ2VkVmlhRGVsZWdh dGVkU2Nyb2xsaW5nKHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5yb290U2Nyb2xsaW5nTm9kZUlEKCks IHVub2JzY3VyZWRSZWN0LCB6b29tU2NhbGUpOworICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT52 aWV3cG9ydENoYW5nZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcoc2Nyb2xsaW5nQ29vcmRpbmF0b3It PnJvb3RTY3JvbGxpbmdOb2RlSUQoKSwgY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QsIHpvb21TY2Fs ZSk7CiAKICAgICBpZiAoYXV0byBkcmF3aW5nQXJlYSA9IF9wYWdlLT5kcmF3aW5nQXJlYSgpKQog ICAgICAgICBkcmF3aW5nQXJlYS0+dXBkYXRlRGVidWdJbmRpY2F0b3IoKTsK