134582 2014-07-02 19:13:25 -0700 [iOS][WK2] Fix small bugs of dynamicViewportSizeUpdate that were causing inaccuracies in the computed target 2014-07-03 15:12:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin bunhere cdumez commit-queue gyuyoung.kim sergio thorton oldest_to_newest 1020154 0 benjamin 2014-07-02 19:13:25 -0700 [iOS][WK2] Fix small bugs of dynamicViewportSizeUpdate that were causing inaccuracies in the computed target 1020162 1 234310 benjamin 2014-07-02 20:22:33 -0700 Created attachment 234310 Patch 1020175 2 234310 thorton 2014-07-02 21:07:42 -0700 Comment on attachment 234310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234310&action=review > Source/WebKit2/ChangeLog:16 > + The first issue is that the unobscured content size was stored on integer coordinates. Because of that, it was "on" should be "in" > Source/WebKit2/ChangeLog:21 > + on floating point. Since ARM64 does all those computation on double in the UIProcess, the value would be quite computation*s* and double*s* > Source/WebKit2/ChangeLog:27 > + valid to have an exposed rect outside the page bounds, that areas is just under the obscured insets. area, not areas 1020381 3 benjamin 2014-07-03 15:12:18 -0700 Committed r170773: <http://trac.webkit.org/changeset/170773> 234310 2014-07-02 20:22:33 -0700 2014-07-02 21:07:42 -0700 Patch bug-134582-20140702202156.patch text/plain 13235 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFkNjJmYjU2MTc2NTc0 MDQ5YzlkNjRhMTg2MWM2Y2I1ZDJkOTRiNS4uZjY4NWQxZWIxYzFlZmQwNjBmNzgxZTBjNTFjNzE4 MGU4NmU0MmRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA3LTAyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g Rml4IHNtYWxsIGJ1Z3Mgb2YgZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSB0aGF0IHdlcmUgY2F1 c2luZyBpbmFjY3VyYWNpZXMgaW4gdGhlIGNvbXB1dGVkIHRhcmdldAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTgyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3 Ojp1bm9ic2N1cmVkQ29udGVudFNpemUpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9TY3JvbGxW aWV3SU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dW5vYnNjdXJlZENvbnRl bnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldFVub2JzY3VyZWRDb250 ZW50U2l6ZSk6CisKIDIwMTQtMDctMDEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFw cGxlLmNvbT4KIAogICAgICAgICBUeXBpbmcgYW4gYXV0b21hdGljIHRleHQgcmVwbGFjZW1lbnQg cGhyYXNlIGFmdGVyIGEgYnIgaW4gY29udGVudGVkaXRhYmxlIGlzIG5vdCByZW5kZXJlZCBhcyBl eHBlY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IGMxZWI3ZDA4MTAwOGMyYjdlMzVkNGIzNjE0ZWExMzUwMDhj NjQzOTMuLmY2MTEwODAyMTFhYjRkNmU3NDQ5ZTAwMjAzOTllOTg1NTBiMzU4ZGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSw0MCBAQAorMjAxNC0wNy0wMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3Vs YWluQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXSzJdIEZpeCBzbWFsbCBidWdzIG9mIGR5 bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUgdGhhdCB3ZXJlIGNhdXNpbmcgaW5hY2N1cmFjaWVzIGlu IHRoZSBjb21wdXRlZCB0YXJnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNDU4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgdHdvIHNtYWxsIGJ1Z3MgdGhhdCB3ZXJlIGNh dXNpbmcgImp1bXBpbmVzcyIgb24gYW5pbWF0ZWQgcmVzaXplOgorICAgICAgICAxKSBUaGUgbmV3 IHNjYWxlIHdhcyBsZXNzIGFjY3VyYXRlIHRoYW4gdGhlIHRhcmdldCBzY2FsZSwgbWFraW5nIHRo ZSBXZWJQcm9jZXNzIGZvcmNlIGEgd29yc2Ugc2NhbGUgb24gdGhlIGNvbnRlbnQuCisgICAgICAg IDIpIFRoZSBjb2RlIHB1dHRpbmcgYmFjayB0aGUgcmVjdHMgaW4gdmlldyB3YXMgaWdub3Jpbmcg dGhlIG9ic2N1cmVkIGluc2V0cywgY29uc3RyYWluaW5nIHRoZSBzY3JvbGwgcG9zaXRpb24gbW9y ZQorICAgICAgICAgICB0aGFuIGl0IHNob3VsZCBiZS4KKworICAgICAgICBUaGUgZmlyc3QgcHJv YmxlbSB3YXMgY2F1c2UgYnkgYSBzZXJpZXMgb2Ygcm91bmRpbmcgaXNzdWVzIGFjY3VtdWxhdGlu ZyB0byB0aGUgZmFjdCB0aGF0ICJzY2FsZSAhPSB0YXJnZXRTY2FsZSIKKyAgICAgICAgd2FzIGFs bW9zdCBuZXZlciB0cnVlLgorCisgICAgICAgIFRoZSBmaXJzdCBpc3N1ZSBpcyB0aGF0IHRoZSB1 bm9ic2N1cmVkIGNvbnRlbnQgc2l6ZSB3YXMgc3RvcmVkIG9uIGludGVnZXIgY29vcmRpbmF0ZXMu IEJlY2F1c2Ugb2YgdGhhdCwgaXQgd2FzCisgICAgICAgIGltcG9zc2libGUgdG8gZGV0ZXJtaW5l IGFjY3VyYXRlbHkgaG93IG11Y2ggY29udGVudCBpcyBpbiB0aGUgdmlldy4KKyAgICAgICAgVGhl IG91dGNvbWUgd2FzIHRoYXQgdmlzaWJsZUhvcml6b250YWxGcmFjdGlvbiB3YXMgdmVyeSBpbmFj Y3VyYXRlIGNvbXBhcmVkIHRvIHdoYXQgdGhlIFVJUHJvY2VzcyBjb21wdXRlZC4KKworICAgICAg ICBBbm90aGVyIGlzc3VlIGFmZmVjdGluZyB0aGUgc2NhbGUgaXMgdGhhdCBzY2FsZUFmdGVyVmll d3BvcnRXaWR0aENoYW5nZSB3YXMgY29tcHV0aW5nIHRoZSB3aWR0aFRvS2VlcEluVmlldworICAg ICAgICBvbiBmbG9hdGluZyBwb2ludC4gU2luY2UgQVJNNjQgZG9lcyBhbGwgdGhvc2UgY29tcHV0 YXRpb24gb24gZG91YmxlIGluIHRoZSBVSVByb2Nlc3MsIHRoZSB2YWx1ZSB3b3VsZCBiZSBxdWl0 ZQorICAgICAgICBkaWZmZXJlbnQgZnJvbSB0aGUgcmVjZWl2ZWQgdGFyZ2V0U2NhbGUuCisKKyAg ICAgICAgRmluYWxseSwgdGhlIGNvZGUgdXNlcyB3aXRoaW5FcHNpbG9uKCkgaW5zdGVhZCBvZiBh IHN0cmljdCBlcXVhbGl0eSB0byByZWR1Y2UgdGhlIGVmZmVjdCBvZiByb3VuZGluZyBlcnJvcnMu CisKKyAgICAgICAgRm9yIHRoZSBzZWNvbmQgaXNzdWUsIHRoZSBwcm9ibGVtIHdhcyB0aGF0IEkg d2FzIGJvdW5kaW5nIHRoZSBleHBvc2VkIHJlY3QgdG8gdGhlIHBhZ2UgYm91bmRzLiBJdCBpcyBj b21wbGV0ZWx5CisgICAgICAgIHZhbGlkIHRvIGhhdmUgYW4gZXhwb3NlZCByZWN0IG91dHNpZGUg dGhlIHBhZ2UgYm91bmRzLCB0aGF0IGFyZWFzIGlzIGp1c3QgdW5kZXIgdGhlIG9ic2N1cmVkIGlu c2V0cy4KKworICAgICAgICBPbiB0aGUgb3RoZXIgaGFuZCwgdGhlIHVub2JzY3VyZWQgcmVjdCBu ZWVkcyB0byBiZSB3aXRoaW4gdGhlIGJvdW5kcyBhcyB3ZSBkbyBub3Qgd2FudCB0byByb3RhdGUg dG8gYSBydWJiZXJiYW5kaW5nCisgICAgICAgIHBvc2l0aW9uLiBUaGUgZml4IGlzIHNpbXBseSB0 byBwdXQgdGhlIHJpZ2h0IHJlY3QgaW50byBib3VuZHMsIGFuZCB0aGUgaG9yaXpvbnRhbC92ZXJ0 aWNhbCBhZGp1c3RlbWVudCBhcHBsaWVzIG9uCisgICAgICAgIGJvdGggcmVjdHMuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJL aXQ6OnNjYWxlQWZ0ZXJWaWV3cG9ydFdpZHRoQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMpOgorCiAyMDE0LTA3LTAyICBCZW5qYW1pbiBQ b3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbaU9TXVtXSzJdIE1ha2Ug aXMgc2FmZS9mYXN0IHRvIHVzZSB0aGUgYW5pbWF0ZWQgcmVzaXplIEFQSSB3aXRob3V0IHJlc2l6 aW5nIGFueXRoaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGVhMTVjYWZmNmZhZDhjMDJjYzgy N2I5NGYyM2Q1ZjhiMDI1YWM2MWQuLjkyMjE3OTg4YzE5Njc4YzUyNzgwMzA0NzcyYjE4OTgwY2M0 Y2I1YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yNTIzLDcgKzI1MjMsNyBAQCBfX1pON1dl YkNvcmUxMENyZWRlbnRpYWxDMUVQMTNfX1NlY0lkZW50aXR5UEs5X19DRkFycmF5TlNfMjFDcmVk ZW50aWFsUGVyc2lzdGVuYwogX19aTjdXZWJDb3JlMTBSZW5kZXJWaWV3MzVyZXN1bWVQYXVzZWRJ bWFnZUFuaW1hdGlvbnNJZk5lZWRlZEV2CiBfX1pON1dlYkNvcmUxMFNjcm9sbFZpZXcxNXNldFNj cm9sbE9mZnNldEVSS05TXzhJbnRQb2ludEUKIF9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzIxc2V0 RXhwb3NlZENvbnRlbnRSZWN0RVJLTlNfOUZsb2F0UmVjdEUKLV9fWk43V2ViQ29yZTEwU2Nyb2xs VmlldzI0c2V0VW5vYnNjdXJlZENvbnRlbnRTaXplRVJLTlNfN0ludFNpemVFCitfX1pON1dlYkNv cmUxMFNjcm9sbFZpZXcyNHNldFVub2JzY3VyZWRDb250ZW50U2l6ZUVSS05TXzlGbG9hdFNpemVF CiBfX1pON1dlYkNvcmUxMFhMaW5rTmFtZXM0aW5pdEV2CiBfX1pON1dlYkNvcmUxMGluU2FtZUxp bmVFUktOU18xNVZpc2libGVQb3NpdGlvbkVTMl8KIF9fWk43V2ViQ29yZTExQmlkaUNvbnRleHQ0 MWNvcHlTdGFja1JlbW92aW5nVW5pY29kZUVtYmVkZGluZ0NvbnRleHRzRXYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuaAppbmRleCBhODI3NTEwZTU2YzMzNWVmNTU0MjFhY2I1MTU3ZmJk MWZkZjA2N2I3Li42MmYwZGYyNzE0ZmE5YzFmNzU5ZDU4NjdhMDJiMWZjMzNkNzEzMTNlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCkBAIC0xODcsNyArMTg3LDggQEAgcHVibGlj OgogCiAgICAgLy8gVGhlIGdpdmVuIHJlY3RzIGFyZSBvbmx5IHVzZWQgaWYgdGhlcmUgaXMgbm8g cGxhdGZvcm0gd2lkZ2V0LgogICAgIHZvaWQgc2V0RXhwb3NlZENvbnRlbnRSZWN0KGNvbnN0IEZs b2F0UmVjdCYpOwotICAgIHZvaWQgc2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKGNvbnN0IEludFNp emUmKTsKKyAgICBjb25zdCBGbG9hdFNpemUmIHVub2JzY3VyZWRDb250ZW50U2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdW5vYnNjdXJlZENvbnRlbnRTaXplOyB9CisgICAgdm9pZCBzZXRVbm9ic2N1 cmVkQ29udGVudFNpemUoY29uc3QgRmxvYXRTaXplJik7CiAKICAgICB2b2lkIHNldEFjdHVhbFNj cm9sbFBvc2l0aW9uKGNvbnN0IEludFBvaW50Jik7CiAgICAgTGVnYWN5VGlsZUNhY2hlKiBsZWdh Y3lUaWxlQ2FjaGUoKTsKQEAgLTQzMSw3ICs0MzIsNyBAQCBwcml2YXRlOgogICAgIC8vIGJldHdl ZW4gZXhwb3NlZCBhbmQgdW5vYnNjdXJlZCBhcmVhcy4gVGhlIHR3byBhdHRyaWJ1dGVzIHNob3Vs ZCBldmVudHVhbGx5IGJlIG1lcmdlZC4KICNpZiBQTEFURk9STShJT1MpCiAgICAgRmxvYXRSZWN0 IG1fZXhwb3NlZENvbnRlbnRSZWN0OwotICAgIEludFNpemUgbV91bm9ic2N1cmVkQ29udGVudFNp emU7CisgICAgRmxvYXRTaXplIG1fdW5vYnNjdXJlZENvbnRlbnRTaXplOwogI2Vsc2UKICAgICBJ bnRSZWN0IG1fZml4ZWRWaXNpYmxlQ29udGVudFJlY3Q7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9TY3JvbGxWaWV3SU9TLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0KaW5kZXggYzU1ZDBiZTA0NzgxNDM4ZWY2 MDJkMTliOGZiY2M5YThlY2Y2ZjE2Ni4uZTBjNjFjM2Q0ZTUxNTAwZTEzOGZmNDNiMDFiMzc4OWFj OTY5ZGRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZp ZXdJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1Mu bW0KQEAgLTEwOCwxMiArMTA4LDEyIEBAIEludFJlY3QgU2Nyb2xsVmlldzo6dW5vYnNjdXJlZENv bnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycykKICAgICB9CiAK ICAgICBpZiAoIW1fdW5vYnNjdXJlZENvbnRlbnRTaXplLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0 dXJuIEludFJlY3QoSW50UG9pbnQobV9zY3JvbGxPZmZzZXQpLCBtX3Vub2JzY3VyZWRDb250ZW50 U2l6ZSk7CisgICAgICAgIHJldHVybiBJbnRSZWN0KEludFBvaW50KG1fc2Nyb2xsT2Zmc2V0KSwg cm91bmRlZEludFNpemUobV91bm9ic2N1cmVkQ29udGVudFNpemUpKTsKIAogICAgIHJldHVybiB1 bm9ic2N1cmVkQ29udGVudFJlY3RJbnRlcm5hbCgpOwogfQogCi12b2lkIFNjcm9sbFZpZXc6OnNl dFVub2JzY3VyZWRDb250ZW50U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQordm9pZCBTY3JvbGxW aWV3OjpzZXRVbm9ic2N1cmVkQ29udGVudFNpemUoY29uc3QgRmxvYXRTaXplJiBzaXplKQogewog ICAgIEFTU0VSVCghcGxhdGZvcm1XaWRnZXQoKSk7CiAgICAgbV91bm9ic2N1cmVkQ29udGVudFNp emUgPSBzaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tCmluZGV4IDY5M2Y2ZDBlNzY4M2M5OTVmZWM3MGZjYmEwYzNiNmY2ODE0 ZmRkNjYuLjYwM2U0ZGQ4NDc4Y2I3Njc5ZTQwNTk4YzU1MjY3Y2M2N2ZiYTc3YWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K QEAgLTE3MCw3ICsxNzAsNyBAQCBzdGF0aWMgZG91YmxlIHNjYWxlQWZ0ZXJWaWV3cG9ydFdpZHRo Q2hhbmdlKGRvdWJsZSBjdXJyZW50U2NhbGUsIGJvb2wgdXNlckhhc0NoYQogICAgIGlmICh1c2Vy SGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3RvcikgewogICAgICAgICAvLyBXaGVuIHRoZSBjb250ZW50 IHNpemUgY2hhbmdlcywgd2Uga2VlcCB0aGUgc2FtZSByZWxhdGl2ZSBob3Jpem9udGFsIGNvbnRl bnQgd2lkdGggaW4gdmlldywgb3RoZXJ3aXNlIHdlIHdvdWxkCiAgICAgICAgIC8vIGVuZCB1cCB6 b29tZWQgdG9vIGZhciBpbiBsYW5kc2NhcGUtPnBvcnRyYWl0LCBhbmQgdG9vIGNsb3NlIGluIHBv cnRyYWl0LT5sYW5kc2NhcGUuCi0gICAgICAgIGZsb2F0IHdpZHRoVG9LZWVwSW5WaWV3ID0gdmlz aWJsZUhvcml6b250YWxGcmFjdGlvbiAqIG5ld0NvbnRlbnRTaXplLndpZHRoKCk7CisgICAgICAg IGRvdWJsZSB3aWR0aFRvS2VlcEluVmlldyA9IHZpc2libGVIb3Jpem9udGFsRnJhY3Rpb24gKiBu ZXdDb250ZW50U2l6ZS53aWR0aCgpOwogICAgICAgICBkb3VibGUgbmV3U2NhbGUgPSB1bm9ic2N1 cmVkV2lkdGhJblNjcm9sbFZpZXdDb29yZGluYXRlcyAvIHdpZHRoVG9LZWVwSW5WaWV3OwogICAg ICAgICBzY2FsZSA9IHN0ZDo6bWF4KHN0ZDo6bWluKG5ld1NjYWxlLCB2aWV3cG9ydENvbmZpZ3Vy YXRpb24ubWF4aW11bVNjYWxlKCkpLCB2aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxl KCkpOwogICAgIH0KQEAgLTIxNjEsOSArMjE2MSw4IEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1pY1Zp ZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25z CiAgICAgZmxvYXQgcmVsYXRpdmVIb3Jpem9udGFsUG9zaXRpb25Jbk5vZGVBdENlbnRlciA9IDA7 CiAgICAgZmxvYXQgcmVsYXRpdmVWZXJ0aWNhbFBvc2l0aW9uSW5Ob2RlQXRDZW50ZXIgPSAwOwog ICAgIHsKLSAgICAgICAgSW50UmVjdCB1bm9ic2N1cmVkQ29udGVudFJlY3QgPSBmcmFtZVZpZXcu dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7Ci0gICAgICAgIHZpc2libGVIb3Jpem9udGFsRnJhY3Rp b24gPSBzdGF0aWNfY2FzdDxmbG9hdD4odW5vYnNjdXJlZENvbnRlbnRSZWN0LndpZHRoKCkpIC8g b2xkQ29udGVudFNpemUud2lkdGgoKTsKLSAgICAgICAgSW50UG9pbnQgdW5vYnNjdXJlZENvbnRl bnRSZWN0Q2VudGVyID0gdW5vYnNjdXJlZENvbnRlbnRSZWN0LmNlbnRlcigpOworICAgICAgICB2 aXNpYmxlSG9yaXpvbnRhbEZyYWN0aW9uID0gZnJhbWVWaWV3LnVub2JzY3VyZWRDb250ZW50U2l6 ZSgpLndpZHRoKCkgLyBvbGRDb250ZW50U2l6ZS53aWR0aCgpOworICAgICAgICBJbnRQb2ludCB1 bm9ic2N1cmVkQ29udGVudFJlY3RDZW50ZXIgPSBmcmFtZVZpZXcudW5vYnNjdXJlZENvbnRlbnRS ZWN0KCkuY2VudGVyKCk7CiAKICAgICAgICAgSGl0VGVzdFJlcXVlc3QgcmVxdWVzdChIaXRUZXN0 UmVxdWVzdDo6UmVhZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVl c3Q6OkRpc2FsbG93U2hhZG93Q29udGVudCk7CiAgICAgICAgIEhpdFRlc3RSZXN1bHQgaGl0VGVz dFJlc3VsdCA9IEhpdFRlc3RSZXN1bHQodW5vYnNjdXJlZENvbnRlbnRSZWN0Q2VudGVyKTsKQEAg LTIxOTksNyArMjE5OCw4IEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0 ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25zCiAgICAgRmxvYXRSZWN0 IG5ld1Vub2JzY3VyZWRDb250ZW50UmVjdCA9IHRhcmdldFVub2JzY3VyZWRSZWN0OwogICAgIEZs b2F0UmVjdCBuZXdFeHBvc2VkQ29udGVudFJlY3QgPSB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3Q7 CiAKLSAgICBpZiAoc2NhbGUgIT0gdGFyZ2V0U2NhbGUpIHsKKyAgICBib29sIHNjYWxlQ2hhbmdl ZCA9ICF3aXRoaW5FcHNpbG9uKHNjYWxlLCB0YXJnZXRTY2FsZSk7CisgICAgaWYgKHNjYWxlQ2hh bmdlZCkgewogICAgICAgICAvLyBUaGUgdGFyZ2V0IHNjYWxlIHRoZSBVSSBpcyB1c2luZyBjYW5u b3QgYmUgcmVhY2hlZCBieSB0aGUgY29udGVudC4gV2UgbmVlZCB0byBjb21wdXRlIG5ldyB0YXJn ZXRzIGJhc2VkCiAgICAgICAgIC8vIG9uIHRoZSB2aWV3cG9ydCBjb25zdHJhaW50IGFuZCByZXBv cnQgZXZlcnl0aGluZyBiYWNrIHRvIHRoZSBVSVByb2Nlc3MuCiAKQEAgLTIyMjIsNyArMjIyMiw3 IEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNp emUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25zCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBuZXdVbm9ic2N1cmVkUmVjdEhlaWdodCArIG9ic2N1cmVkVG9wTWFyZ2lu ICsgb2JzY3VyZWRCb3R0b21NYXJnaW4pOwogICAgIH0KIAotICAgIGlmIChvbGRDb250ZW50U2l6 ZSAhPSBuZXdDb250ZW50U2l6ZSB8fCBzY2FsZSAhPSB0YXJnZXRTY2FsZSkgeworICAgIGlmIChv bGRDb250ZW50U2l6ZSAhPSBuZXdDb250ZW50U2l6ZSB8fCBzY2FsZUNoYW5nZWQpIHsKICAgICAg ICAgLy8gU25hcCB0aGUgbmV3IHVub2JzY3VyZWQgcmVjdCBiYWNrIGludG8gdGhlIGNvbnRlbnQg cmVjdC4KICAgICAgICAgbmV3VW5vYnNjdXJlZENvbnRlbnRSZWN0LnNldFdpZHRoKHN0ZDo6bWlu KHN0YXRpY19jYXN0PGZsb2F0PihuZXdDb250ZW50U2l6ZS53aWR0aCgpKSwgbmV3VW5vYnNjdXJl ZENvbnRlbnRSZWN0LndpZHRoKCkpKTsKICAgICAgICAgbmV3VW5vYnNjdXJlZENvbnRlbnRSZWN0 LnNldEhlaWdodChzdGQ6Om1pbihzdGF0aWNfY2FzdDxmbG9hdD4obmV3Q29udGVudFNpemUuaGVp Z2h0KCkpLCBuZXdVbm9ic2N1cmVkQ29udGVudFJlY3QuaGVpZ2h0KCkpKTsKQEAgLTIyNzgsMTQg KzIyNzgsMTQgQEAgdm9pZCBXZWJQYWdlOjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0 IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUsIGNvbnMKICAgICAgICAgfQogCiAgICAgICAg IGZsb2F0IGhvcml6b250YWxBZGp1c3RtZW50ID0gMDsKLSAgICAgICAgaWYgKG5ld0V4cG9zZWRD b250ZW50UmVjdC5tYXhYKCkgPiBuZXdDb250ZW50U2l6ZS53aWR0aCgpKQorICAgICAgICBpZiAo bmV3VW5vYnNjdXJlZENvbnRlbnRSZWN0Lm1heFgoKSA+IG5ld0NvbnRlbnRTaXplLndpZHRoKCkp CiAgICAgICAgICAgICBob3Jpem9udGFsQWRqdXN0bWVudCAtPSBuZXdVbm9ic2N1cmVkQ29udGVu dFJlY3QubWF4WCgpIC0gbmV3Q29udGVudFNpemUud2lkdGgoKTsKICAgICAgICAgZmxvYXQgdmVy dGljYWxBZGp1c3RtZW50ID0gMDsKLSAgICAgICAgaWYgKG5ld0V4cG9zZWRDb250ZW50UmVjdC5t YXhZKCkgPiBuZXdDb250ZW50U2l6ZS5oZWlnaHQoKSkKKyAgICAgICAgaWYgKG5ld1Vub2JzY3Vy ZWRDb250ZW50UmVjdC5tYXhZKCkgPiBuZXdDb250ZW50U2l6ZS5oZWlnaHQoKSkKICAgICAgICAg ICAgIHZlcnRpY2FsQWRqdXN0bWVudCAtPSBuZXdVbm9ic2N1cmVkQ29udGVudFJlY3QubWF4WSgp IC0gbmV3Q29udGVudFNpemUuaGVpZ2h0KCk7Ci0gICAgICAgIGlmIChuZXdFeHBvc2VkQ29udGVu dFJlY3QueCgpIDwgMCkKKyAgICAgICAgaWYgKG5ld1Vub2JzY3VyZWRDb250ZW50UmVjdC54KCkg PCAwKQogICAgICAgICAgICAgaG9yaXpvbnRhbEFkanVzdG1lbnQgKz0gLSBuZXdVbm9ic2N1cmVk Q29udGVudFJlY3QueCgpOwotICAgICAgICBpZiAobmV3RXhwb3NlZENvbnRlbnRSZWN0LnkoKSA8 IDApCisgICAgICAgIGlmIChuZXdVbm9ic2N1cmVkQ29udGVudFJlY3QueSgpIDwgMCkKICAgICAg ICAgICAgIHZlcnRpY2FsQWRqdXN0bWVudCArPSAtIG5ld1Vub2JzY3VyZWRDb250ZW50UmVjdC55 KCk7CiAKICAgICAgICAgRmxvYXRQb2ludCBhZGp1c3RtZW50RGVsdGEoaG9yaXpvbnRhbEFkanVz dG1lbnQsIHZlcnRpY2FsQWRqdXN0bWVudCk7CkBAIC0yMjk1LDExICsyMjk1LDExIEBAIHZvaWQg V2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIG1pbmlt dW1MYXlvdXRTaXplLCBjb25zCiAKICAgICBmcmFtZVZpZXcuc2V0U2Nyb2xsVmVsb2NpdHkoMCwg MCwgMCwgbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkpOwogCi0gICAgSW50UmVjdCByb3Vu ZGVkVW5vYnNjdXJlZENvbnRlbnRSZWN0ID0gcm91bmRlZEludFJlY3QobmV3VW5vYnNjdXJlZENv bnRlbnRSZWN0KTsKLSAgICBmcmFtZVZpZXcuc2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKHJvdW5k ZWRVbm9ic2N1cmVkQ29udGVudFJlY3Quc2l6ZSgpKTsKKyAgICBJbnRQb2ludCByb3VuZGVkVW5v YnNjdXJlZENvbnRlbnRSZWN0UG9zaXRpb24gPSByb3VuZGVkSW50UG9pbnQobmV3VW5vYnNjdXJl ZENvbnRlbnRSZWN0LmxvY2F0aW9uKCkpOworICAgIGZyYW1lVmlldy5zZXRVbm9ic2N1cmVkQ29u dGVudFNpemUobmV3VW5vYnNjdXJlZENvbnRlbnRSZWN0LnNpemUoKSk7CiAgICAgbV9kcmF3aW5n QXJlYS0+c2V0RXhwb3NlZENvbnRlbnRSZWN0KG5ld0V4cG9zZWRDb250ZW50UmVjdCk7CiAKLSAg ICBzY2FsZVBhZ2Uoc2NhbGUsIHJvdW5kZWRVbm9ic2N1cmVkQ29udGVudFJlY3QubG9jYXRpb24o KSk7CisgICAgc2NhbGVQYWdlKHNjYWxlLCByb3VuZGVkVW5vYnNjdXJlZENvbnRlbnRSZWN0UG9z aXRpb24pOwogCiAgICAgZnJhbWVWaWV3LnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1 cnNpdmUoKTsKICAgICBJbnRSZWN0IGZpeGVkUG9zaXRpb25MYXlvdXRSZWN0ID0gZW5jbG9zaW5n SW50UmVjdChmcmFtZVZpZXcudmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHNSZWN0KCkpOwpAQCAt MjMwNyw3ICsyMzA3LDcgQEAgdm9pZCBXZWJQYWdlOjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRl KGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUsIGNvbnMKIAogICAgIGZyYW1lVmll dy5zZXRDdXN0b21TaXplRm9yUmVzaXplRXZlbnQoZXhwYW5kZWRJbnRTaXplKHRhcmdldFVub2Jz Y3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMuc2l6ZSgpKSk7CiAgICAgc2V0RGV2aWNl T3JpZW50YXRpb24oZGV2aWNlT3JpZW50YXRpb24pOwotICAgIGZyYW1lVmlldy5zZXRTY3JvbGxP ZmZzZXQocm91bmRlZFVub2JzY3VyZWRDb250ZW50UmVjdC5sb2NhdGlvbigpKTsKKyAgICBmcmFt ZVZpZXcuc2V0U2Nyb2xsT2Zmc2V0KHJvdW5kZWRVbm9ic2N1cmVkQ29udGVudFJlY3RQb3NpdGlv bik7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkR5bmFtaWNWaWV3cG9ydFVw ZGF0ZUNoYW5nZWRUYXJnZXQocGFnZVNjYWxlRmFjdG9yKCksIGZyYW1lVmlldy5zY3JvbGxQb3Np dGlvbigpKSk7CiB9CkBAIC0yNDQ1LDggKzI0NDUsNyBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVZp c2libGVDb250ZW50UmVjdHMoY29uc3QgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyYgdmlz aQogICAgIEZsb2F0UmVjdCBhZGp1c3RlZEV4cG9zZWRSZWN0ID0gYWRqdXN0RXhwb3NlZFJlY3RG b3JCb3VuZGVkU2NhbGUoZXhwb3NlZFJlY3QsIHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8u c2NhbGUoKSwgYm91bmRlZFNjYWxlKTsKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRFeHBvc2VkQ29u dGVudFJlY3QoYWRqdXN0ZWRFeHBvc2VkUmVjdCk7CiAKLSAgICBJbnRSZWN0IHJvdW5kZWRVbm9i c2N1cmVkUmVjdCA9IHJvdW5kZWRJbnRSZWN0KHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8u dW5vYnNjdXJlZFJlY3QoKSk7Ci0gICAgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24gPSByb3VuZGVk VW5vYnNjdXJlZFJlY3QubG9jYXRpb24oKTsKKyAgICBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbiA9 IHJvdW5kZWRJbnRQb2ludCh2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLnVub2JzY3VyZWRS ZWN0KCkubG9jYXRpb24oKSk7CiAKICAgICBmbG9hdCBmbG9hdEJvdW5kZWRTY2FsZSA9IGJvdW5k ZWRTY2FsZTsKICAgICBib29sIGhhc1NldFBhZ2VTY2FsZSA9IGZhbHNlOwpAQCAtMjQ3Miw3ICsy NDcxLDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZp c2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIHZpc2kKICAgICBpZiAoc2Nyb2xsUG9zaXRpb24g IT0gZnJhbWVWaWV3LnNjcm9sbFBvc2l0aW9uKCkpCiAgICAgICAgIG1fZHluYW1pY1NpemVVcGRh dGVIaXN0b3J5LmNsZWFyKCk7CiAKLSAgICBmcmFtZVZpZXcuc2V0VW5vYnNjdXJlZENvbnRlbnRT aXplKHJvdW5kZWRVbm9ic2N1cmVkUmVjdC5zaXplKCkpOworICAgIGZyYW1lVmlldy5zZXRVbm9i c2N1cmVkQ29udGVudFNpemUodmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby51bm9ic2N1cmVk UmVjdCgpLnNpemUoKSk7CiAKICAgICBkb3VibGUgaG9yaXpvbnRhbFZlbG9jaXR5ID0gdmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5ob3Jpem9udGFsVmVsb2NpdHkoKTsKICAgICBkb3VibGUg dmVydGljYWxWZWxvY2l0eSA9IHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8udmVydGljYWxW ZWxvY2l0eSgpOwo=