131567 2014-04-11 15:52:58 -0700 Need WK2 API to disable rubber-banding 2014-04-11 16:52:55 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin sam simon.fraser thorton oldest_to_newest 1000076 0 bdakin 2014-04-11 15:52:58 -0700 We need WK2 API to disable rubber-banding. <rdar://problem/15364278> 1000078 1 229171 bdakin 2014-04-11 15:57:56 -0700 Created attachment 229171 Patch 1000098 2 229171 simon.fraser 2014-04-11 16:16:10 -0700 Comment on attachment 229171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229171&action=review > Source/WebKit2/UIProcess/API/C/WKPage.h:185 > +WK_EXPORT bool WKPageVerticalRubberBandingIsDisabled(WKPageRef); > +WK_EXPORT void WKPageDisableVerticalRubberBanding(WKPageRef, bool disableVerticalRubberBanding); > +WK_EXPORT bool WKPageHorizontalRubberBandingIsDisabled(WKPageRef); > +WK_EXPORT void WKPageDisableHorizontalRubberBanding(WKPageRef, bool disableHorizontalRubberBanding); It would be slightly cleaner to have the API in positive terms (enabled, not disabled) I think. > Source/WebKit2/WebProcess/WebPage/WebPage.h:363 > + void disableVerticalRubberBanding(bool); > + void disableHorizontalRubberBanding(bool); I think setDisabled would be better terminology (or setEnabled if you want a positive term). 1000116 3 bdakin 2014-04-11 16:52:55 -0700 Thanks, Simon! I switch the the positive terminology and the 'set' language. http://trac.webkit.org/changeset/167172 229171 2014-04-11 15:57:56 -0700 2014-04-11 16:16:09 -0700 Patch for-review.txt text/plain 15493 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzE2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTA0LTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIFdLMiBBUEkgdG8gZGlzYWJs ZSBydWJiZXItYmFuZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMxNTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUGFnZSB3aWxsIG5vdyBzdG9yZSBhIHZlcnRpY2FsIGFuZCBob3Jpem9udGFsIFNj cm9sbEVsYXN0aWNpdHkgaW4gY2FzZSB0aGUgQVBJIGhhcyAKKyAgICAgICAgYmVlbiBjYWxsZWQg YmVmb3JlIHRoZSBGcmFtZVZpZXcgZXZlbiBleGlzdHMuCisKKyAgICAgICAgTmV3IFBhZ2UgZnVu Y3Rpb25zLgorICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCisgICAgICAgIFVzZSBQYWdl4oCZ cyBjYWNoZWQgU2Nyb2xsRWxhc3RpY2l0eS4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OkZyYW1lVmlldyk6CisKKyAgICAgICAgSWYg dGhlcmUgaXMgYWxyZWFkeSBhIEZyYW1lVmlldywgdGhlbiBhc3NpZ24gaXQgdGhlIG5ldyBTY3Jv bGxFbGFzdGljaXR5LgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldFZlcnRpY2FsU2Nyb2xs RWxhc3RpY2l0eSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRIb3Jpem9udGFsU2Nyb2xs RWxhc3RpY2l0eSk6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlOjp2ZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHkpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6 aG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkpOgorCiAyMDE0LTA0LTExICBCZW0gSm9uZXMtQmV5 ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCiAgICAgICAgIENsZWFyIHNpYmxpbmcgZmxvYXRzIHdo aWxlIHNwbGl0dGluZyBpbmxpbmUgZmxvdwpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlz aW9uIDE2NzEzNikKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNv cHkpCkBAIC0xMDcyLDYgKzEwNzIsOCBAQCBfX1pON1dlYkNvcmU0UGFnZTI0c2Nyb2xsaW5nU3Rh dGVUcmVlQXNUCiBfX1pON1dlYkNvcmU0UGFnZTI1c3VzcGVuZFNjcmlwdGVkQW5pbWF0aW9uc0V2 CiBfX1pON1dlYkNvcmU0UGFnZTI3ZW5hYmxlTGVnYWN5UHJpdmF0ZUJyb3dzaW5nRWIKIF9fWk43 V2ViQ29yZTRQYWdlMjdpbnZhbGlkYXRlU3R5bGVzRm9yQWxsTGlua3NFdgorX19aTjdXZWJDb3Jl NFBhZ2UyN3NldFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eUVOU18xNlNjcm9sbEVsYXN0aWNpdHlF CitfX1pON1dlYkNvcmU0UGFnZTI5c2V0SG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHlFTlNfMTZT Y3JvbGxFbGFzdGljaXR5RQogX19aTjdXZWJDb3JlNFBhZ2UzMnNldE1lbW9yeUNhY2hlQ2xpZW50 Q2FsbHNFbmFibGVkRWIKIF9fWk43V2ViQ29yZTRQYWdlMzNzeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnNBc1RleHRFdgogX19aTjdXZWJDb3JlNFBhZ2UzNXJlc3VtZUFjdGl2ZURPTU9iamVjdHNB bmRBbmltYXRpb25zRXYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9u IDE2NzEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTkzLDggKzE5Myw4IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lJiBmcmFt ZSkKICAgICBpbml0KCk7CiAKICAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkgewotICAgICAg ICBTY3JvbGxhYmxlQXJlYTo6c2V0VmVydGljYWxTY3JvbGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0 aWNpdHlBbGxvd2VkKTsKLSAgICAgICAgU2Nyb2xsYWJsZUFyZWE6OnNldEhvcml6b250YWxTY3Jv bGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0aWNpdHlBbGxvd2VkKTsKKyAgICAgICAgU2Nyb2xsYWJs ZUFyZWE6OnNldFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eShtX2ZyYW1lLT5wYWdlKCkgPyBtX2Zy YW1lLT5wYWdlKCktPnZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSgpIDogU2Nyb2xsRWxhc3RpY2l0 eUFsbG93ZWQpOworICAgICAgICBTY3JvbGxhYmxlQXJlYTo6c2V0SG9yaXpvbnRhbFNjcm9sbEVs YXN0aWNpdHkobV9mcmFtZS0+cGFnZSgpID8gbV9mcmFtZS0+cGFnZSgpLT5ob3Jpem9udGFsU2Ny b2xsRWxhc3RpY2l0eSgpIDogU2Nyb2xsRWxhc3RpY2l0eUFsbG93ZWQpOwogICAgIH0KIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCShyZXZpc2lvbiAxNjcxMzYpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjEsNiArMTYxLDggQEAgUGFnZTo6 UGFnZShQYWdlQ2xpZW50cyYgcGFnZUNsaWVudHMpCiAgICAgLCBtX2RldmljZVNjYWxlRmFjdG9y KDEpCiAgICAgLCBtX3RvcENvbnRlbnRJbnNldCgwKQogICAgICwgbV9zdXBwcmVzc1Njcm9sbGJh ckFuaW1hdGlvbnMoZmFsc2UpCisgICAgLCBtX3ZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eShTY3Jv bGxFbGFzdGljaXR5QWxsb3dlZCkKKyAgICAsIG1faG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHko U2Nyb2xsRWxhc3RpY2l0eUFsbG93ZWQpCiAgICAgLCBtX2RpZExvYWRVc2VyU3R5bGVTaGVldChm YWxzZSkKICAgICAsIG1fdXNlclN0eWxlU2hlZXRNb2RpZmljYXRpb25UaW1lKDApCiAgICAgLCBt X2dyb3VwKDApCkBAIC04MDEsNiArODAzLDI4IEBAIHZvaWQgUGFnZTo6bG9ja0FsbE92ZXJsYXlT Y3JvbGxiYXJzVG9IaWQKICAgICAgICAgfQogICAgIH0KIH0KKyAgICAKK3ZvaWQgUGFnZTo6c2V0 VmVydGljYWxTY3JvbGxFbGFzdGljaXR5KFNjcm9sbEVsYXN0aWNpdHkgZWxhc3RpY2l0eSkKK3sK KyAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHkgPT0gZWxhc3RpY2l0eSkKKyAgICAg ICAgcmV0dXJuOworICAgIAorICAgIG1fdmVydGljYWxTY3JvbGxFbGFzdGljaXR5ID0gZWxhc3Rp Y2l0eTsKKyAgICAKKyAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbWFpbkZyYW1lKCkudmlldygp KQorICAgICAgICB2aWV3LT5zZXRWZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHkoZWxhc3RpY2l0eSk7 Cit9CisgICAgCit2b2lkIFBhZ2U6OnNldEhvcml6b250YWxTY3JvbGxFbGFzdGljaXR5KFNjcm9s bEVsYXN0aWNpdHkgZWxhc3RpY2l0eSkKK3sKKyAgICBpZiAobV9ob3Jpem9udGFsU2Nyb2xsRWxh c3RpY2l0eSA9PSBlbGFzdGljaXR5KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgbV9ob3Jp em9udGFsU2Nyb2xsRWxhc3RpY2l0eSA9IGVsYXN0aWNpdHk7CisgICAgCisgICAgaWYgKEZyYW1l VmlldyogdmlldyA9IG1haW5GcmFtZSgpLnZpZXcoKSkKKyAgICAgICAgdmlldy0+c2V0SG9yaXpv bnRhbFNjcm9sbEVsYXN0aWNpdHkoZWxhc3RpY2l0eSk7Cit9CiAKIHZvaWQgUGFnZTo6c2V0UGFn aW5hdGlvbihjb25zdCBQYWdpbmF0aW9uJiBwYWdpbmF0aW9uKQogewpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmgJKHJldmlzaW9uIDE2NzEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiUGFnaW5hdGlvbi5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtU2NyZWVuLmgiCiAjaW5jbHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSAi U2Nyb2xsVHlwZXMuaCIKICNpbmNsdWRlICJTZXNzaW9uSUQuaCIKICNpbmNsdWRlICJTdXBwbGVt ZW50YWJsZS5oIgogI2luY2x1ZGUgIlZpZXdTdGF0ZS5oIgpAQCAtMjg0LDcgKzI4NSwxMyBAQCBw dWJsaWM6CiAgICAgYm9vbCBzaG91bGRTdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoKSBjb25z dCB7IHJldHVybiBtX3N1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9uczsgfQogICAgIHZvaWQgc2V0 U2hvdWxkU3VwcHJlc3NTY3JvbGxiYXJBbmltYXRpb25zKGJvb2wgc3VwcHJlc3NBbmltYXRpb25z KTsKICAgICB2b2lkIGxvY2tBbGxPdmVybGF5U2Nyb2xsYmFyc1RvSGlkZGVuKGJvb2wgbG9ja092 ZXJsYXlTY3JvbGxiYXJzKTsKKyAgICAKKyAgICB2b2lkIHNldFZlcnRpY2FsU2Nyb2xsRWxhc3Rp Y2l0eShTY3JvbGxFbGFzdGljaXR5KTsKKyAgICBTY3JvbGxFbGFzdGljaXR5IHZlcnRpY2FsU2Ny b2xsRWxhc3RpY2l0eSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFNjcm9sbEVsYXN0aWNp dHk+KG1fdmVydGljYWxTY3JvbGxFbGFzdGljaXR5KTsgfQogCisgICAgdm9pZCBzZXRIb3Jpem9u dGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGljaXR5KTsKKyAgICBTY3JvbGxFbGFzdGlj aXR5IGhvcml6b250YWxTY3JvbGxFbGFzdGljaXR5KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nh c3Q8U2Nyb2xsRWxhc3RpY2l0eT4obV9ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eSk7IH0KKyAg ICAKICAgICAvLyBQYWdlIGFuZCBGcmFtZVZpZXcgYm90aCBzdG9yZSBhIFBhZ2luYXRpb24gdmFs dWUuIFBhZ2U6OnBhZ2luYXRpb24oKSBpcyBzZXQgb25seSBieSBBUEksCiAgICAgLy8gYW5kIEZy YW1lVmlldzo6cGFnaW5hdGlvbigpIGlzIHNldCBvbmx5IGJ5IENTUy4gUGFnZTo6cGFnaW5hdGlv bigpIHdpbGwgYWZmZWN0IGFsbAogICAgIC8vIEZyYW1lVmlld3MgaW4gdGhlIHBhZ2UgY2FjaGUs IGJ1dCBGcmFtZVZpZXc6OnBhZ2luYXRpb24oKSBvbmx5IGFmZmVjdHMgdGhlIGN1cnJlbnQKQEAg LTQ5NSw2ICs1MDIsOSBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fdG9wQ29udGVudEluc2V0Owog CiAgICAgYm9vbCBtX3N1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9uczsKKyAgICAKKyAgICB1bnNp Z25lZCBtX3ZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSA6IDI7IC8vIFNjcm9sbEVsYXN0aWNpdHkK KyAgICB1bnNpZ25lZCBtX2hvcml6b250YWxTY3JvbGxFbGFzdGljaXR5IDogMjsgLy8gU2Nyb2xs RWxhc3RpY2l0eSAgICAKIAogICAgIFBhZ2luYXRpb24gbV9wYWdpbmF0aW9uOwogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjcxNjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwzMSBAQAorMjAxNC0wNC0xMSAgQmV0aCBEYWtpbiAgPGJk YWtpbkBhcHBsZS5jb20+CisKKyAgICAgICAgTmVlZCBXSzIgQVBJIHRvIGRpc2FibGUgcnViYmVy LWJhbmRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMTU2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5ldyBBUEkgYWxsb3dzIHRoZSBjbGllbnQgdG8gZGlzYWJsZSBob3Jpem9udGFsIG9yIHZlcnRp Y2FsIHJ1YmJlci1iYW5kaW5nLiBCeSAKKyAgICAgICAgZGVmYXVsdCwgcnViYmVyLWJhbmRpbmcg aXMgYWxsb3dlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAg ICAgKFdLUGFnZVZlcnRpY2FsUnViYmVyQmFuZGluZ0lzRGlzYWJsZWQpOgorICAgICAgICAoV0tQ YWdlRGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZyk6CisgICAgICAgIChXS1BhZ2VIb3Jpem9u dGFsUnViYmVyQmFuZGluZ0lzRGlzYWJsZWQpOgorICAgICAgICAoV0tQYWdlRGlzYWJsZUhvcml6 b250YWxSdWJiZXJCYW5kaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5Ojp2ZXJ0aWNhbFJ1YmJlckJhbmRpbmdJc0Rpc2FibGVkKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRpbmcpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omhvcml6b250YWxSdWJiZXJCYW5kaW5nSXNEaXNh YmxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 ZGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OmRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbjoKKwogMjAxNC0wNC0xMCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNv bT4KIAogICAgICAgICBbV0syXSBEaXNwYXRjaCB0byBtYWluIHRocmVhZCdzIHJ1biBsb29wIHRv IGhhbmRsZSBjb29raWUgcmVxdWVzdHMuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTY3MTM2KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNyw2ICszMzcsOCBA QCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwCiAgICAgLCBtX3J1YmJl ckJhbmRzQXRSaWdodCh0cnVlKQogICAgICwgbV9ydWJiZXJCYW5kc0F0VG9wKHRydWUpCiAgICAg LCBtX3J1YmJlckJhbmRzQXRCb3R0b20odHJ1ZSkKKyAgICAsIG1fZGlzYWJsZVZlcnRpY2FsUnVi YmVyQmFuZGluZyhmYWxzZSkKKyAgICAsIG1fZGlzYWJsZUhvcml6b250YWxSdWJiZXJCYW5kaW5n KGZhbHNlKQogICAgICwgbV9iYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoZmFsc2UpCiAgICAg LCBtX3Nob3VsZFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdHMoZmFsc2UpCiAgICAgLCBtX3BhZ2VD b3VudCgwKQpAQCAtMTg1Nyw2ICsxODU5LDQwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRSdWJi ZXJCYW5kc0F0Qm90dG8KIHsKICAgICBtX3J1YmJlckJhbmRzQXRCb3R0b20gPSBydWJiZXJCYW5k c0F0Qm90dG9tOwogfQorICAgIAordm9pZCBXZWJQYWdlUHJveHk6OmRpc2FibGVWZXJ0aWNhbFJ1 YmJlckJhbmRpbmcoYm9vbCBkaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKQoreworICAgIGlm IChkaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nID09IG1fZGlzYWJsZVZlcnRpY2FsUnViYmVy QmFuZGluZykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9kaXNhYmxlVmVydGljYWxSdWJiZXJC YW5kaW5nID0gZGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZzsKKworICAgIGlmICghaXNWYWxp ZCgpKQorICAgICAgICByZXR1cm47CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpEaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKGRpc2FibGVWZXJ0aWNhbFJ1YmJlckJh bmRpbmcpLCBtX3BhZ2VJRCk7Cit9CisgICAgCitib29sIFdlYlBhZ2VQcm94eTo6dmVydGljYWxS dWJiZXJCYW5kaW5nSXNEaXNhYmxlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZGlzYWJsZVZl cnRpY2FsUnViYmVyQmFuZGluZzsKK30KKyAgICAKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaXNhYmxl SG9yaXpvbnRhbFJ1YmJlckJhbmRpbmcoYm9vbCBkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRp bmcpCit7CisgICAgaWYgKGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZyA9PSBtX2Rpc2Fi bGVIb3Jpem9udGFsUnViYmVyQmFuZGluZykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9kaXNh YmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRpbmcgPSBkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRp bmc7CisKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlzYWJsZUhvcml6b250YWxSdWJiZXJCYW5kaW5n KGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZyksIG1fcGFnZUlEKTsKK30KKyAgICAKK2Jv b2wgV2ViUGFnZVByb3h5Ojpob3Jpem9udGFsUnViYmVyQmFuZGluZ0lzRGlzYWJsZWQoKSBjb25z dAoreworICAgIHJldHVybiBtX2Rpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZzsKK30KIAog dm9pZCBXZWJQYWdlUHJveHk6OnNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sIGJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE2NzEzNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzY4LDcgKzc2OCwxMiBA QCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFNob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENvbnRy b2woYm9vbCBzaG91bGRVc2VJbXBsaWNpdFJ1YmJlckJhbmRDb250cm9sKSB7IG1fc2hvdWxkVXNl SW1wbGljaXRSdWJiZXJCYW5kQ29udHJvbCA9IHNob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENv bnRyb2w7IH0KICAgICBib29sIHNob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENvbnRyb2woKSBj b25zdCB7IHJldHVybiBtX3Nob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENvbnRyb2w7IH0KLQor ICAgICAgICAKKyAgICB2b2lkIGRpc2FibGVWZXJ0aWNhbFJ1YmJlckJhbmRpbmcoYm9vbCk7Cisg ICAgYm9vbCB2ZXJ0aWNhbFJ1YmJlckJhbmRpbmdJc0Rpc2FibGVkKCkgY29uc3Q7CisgICAgdm9p ZCBkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRpbmcoYm9vbCk7CisgICAgYm9vbCBob3Jpem9u dGFsUnViYmVyQmFuZGluZ0lzRGlzYWJsZWQoKSBjb25zdDsKKyAgICAgICAgCiAgICAgdm9pZCBz ZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoYm9vbCk7CiAgICAgYm9vbCBiYWNrZ3JvdW5k RXh0ZW5kc0JleW9uZFBhZ2UoKSBjb25zdDsKIApAQCAtMTYwOCw2ICsxNjEzLDkgQEAgcHJpdmF0 ZToKICAgICBib29sIG1fcnViYmVyQmFuZHNBdFJpZ2h0OwogICAgIGJvb2wgbV9ydWJiZXJCYW5k c0F0VG9wOwogICAgIGJvb2wgbV9ydWJiZXJCYW5kc0F0Qm90dG9tOworICAgICAgICAKKyAgICBi b29sIG1fZGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZzsKKyAgICBib29sIG1fZGlzYWJsZUhv cml6b250YWxSdWJiZXJCYW5kaW5nOwogCiAgICAgYm9vbCBtX2JhY2tncm91bmRFeHRlbmRzQmV5 b25kUGFnZTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5j cHAJKHJldmlzaW9uIDE2NzEzNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjEsNiArNTIxLDI2IEBAIHZvaWQgV0tQYWdl U2V0UnViYmVyQmFuZHNBdEJvdHRvbShXS1BhZ2UKICAgICB0b0ltcGwocGFnZVJlZiktPnNldFJ1 YmJlckJhbmRzQXRCb3R0b20ocnViYmVyQmFuZHNBdEJvdHRvbSk7CiB9CiAKK2Jvb2wgV0tQYWdl VmVydGljYWxSdWJiZXJCYW5kaW5nSXNEaXNhYmxlZChXS1BhZ2VSZWYgcGFnZVJlZikKK3sKKyAg ICByZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT52ZXJ0aWNhbFJ1YmJlckJhbmRpbmdJc0Rpc2FibGVk KCk7Cit9CisKK3ZvaWQgV0tQYWdlRGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZyhXS1BhZ2VS ZWYgcGFnZVJlZiwgYm9vbCBkaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKQoreworICAgIHRv SW1wbChwYWdlUmVmKS0+ZGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZyhkaXNhYmxlVmVydGlj YWxSdWJiZXJCYW5kaW5nKTsKK30KKworYm9vbCBXS1BhZ2VIb3Jpem9udGFsUnViYmVyQmFuZGlu Z0lzRGlzYWJsZWQoV0tQYWdlUmVmIHBhZ2VSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdl UmVmKS0+aG9yaXpvbnRhbFJ1YmJlckJhbmRpbmdJc0Rpc2FibGVkKCk7Cit9CisKK3ZvaWQgV0tQ YWdlRGlzYWJsZUhvcml6b250YWxSdWJiZXJCYW5kaW5nKFdLUGFnZVJlZiBwYWdlUmVmLCBib29s IGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZykKK3sKKyAgICB0b0ltcGwocGFnZVJlZikt PmRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZyhkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJh bmRpbmcpOworfQorCiB2b2lkIFdLUGFnZVNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShX S1BhZ2VSZWYgcGFnZVJlZiwgYm9vbCBiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpCiB7CiAg ICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoYmFja2dy b3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmgJKHJldmlzaW9uIDE2NzEzNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTY1LDcgKzE2NSwxMSBAQCBXS19F WFBPUlQgYm9vbCBXS1BhZ2VJc1Bpbm5lZFRvTGVmdFNpZGUoCiBXS19FWFBPUlQgYm9vbCBXS1Bh Z2VJc1Bpbm5lZFRvUmlnaHRTaWRlKFdLUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCBib29sIFdL UGFnZUlzUGlubmVkVG9Ub3BTaWRlKFdLUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCBib29sIFdL UGFnZUlzUGlubmVkVG9Cb3R0b21TaWRlKFdLUGFnZVJlZiBwYWdlKTsKLQorICAgIAorLy8gVGhp cyBBUEkgaXMgcG9vcmx5IG5hbWVkLiBFdmVuIHdoZW4gdGhlc2UgdmFsdWVzIGFyZSBzZXQgdG8g ZmFsc2UsIHJ1YmJlci1iYW5kaW5nIHdpbGwKKy8vIHN0aWxsIGJlIGFsbG93ZWQgdG8gb2NjdXIg YXQgdGhlIGVuZCBvZiBhIG1vbWVudHVtIHNjcm9sbC4gVGhlc2UgdmFsdWVzIGFyZSB1c2VkIGFs b25nCisvLyB3aXRoIHBpbiBzdGF0ZSB0byBkZXRlcm1pbmUgaWYgd2hlZWwgZXZlbnRzIHNob3Vs ZCBiZSBoYW5kbGVkIGluIHRoZSB3ZWIgcHJvY2VzcyBvciBpZgorLy8gdGhleSBzaG91bGQgYmUg cGFzc2VkIHVwIHRvIHRoZSBjbGllbnQuCiBXS19FWFBPUlQgYm9vbCBXS1BhZ2VSdWJiZXJCYW5k c0F0TGVmdChXS1BhZ2VSZWYpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0UnViYmVyQmFuZHNB dExlZnQoV0tQYWdlUmVmLCBib29sIHJ1YmJlckJhbmRzQXRMZWZ0KTsKIFdLX0VYUE9SVCBib29s IFdLUGFnZVJ1YmJlckJhbmRzQXRSaWdodChXS1BhZ2VSZWYpOwpAQCAtMTc0LDcgKzE3OCwxMiBA QCBXS19FWFBPUlQgYm9vbCBXS1BhZ2VSdWJiZXJCYW5kc0F0VG9wKFdLCiBXS19FWFBPUlQgdm9p ZCBXS1BhZ2VTZXRSdWJiZXJCYW5kc0F0VG9wKFdLUGFnZVJlZiwgYm9vbCBydWJiZXJCYW5kc0F0 VG9wKTsKIFdLX0VYUE9SVCBib29sIFdLUGFnZVJ1YmJlckJhbmRzQXRCb3R0b20oV0tQYWdlUmVm KTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVNldFJ1YmJlckJhbmRzQXRCb3R0b20oV0tQYWdlUmVm LCBib29sIHJ1YmJlckJhbmRzQXRCb3R0b20pOwotCisgICAgCitXS19FWFBPUlQgYm9vbCBXS1Bh Z2VWZXJ0aWNhbFJ1YmJlckJhbmRpbmdJc0Rpc2FibGVkKFdLUGFnZVJlZik7CitXS19FWFBPUlQg dm9pZCBXS1BhZ2VEaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKFdLUGFnZVJlZiwgYm9vbCBk aXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKTsKK1dLX0VYUE9SVCBib29sIFdLUGFnZUhvcml6 b250YWxSdWJiZXJCYW5kaW5nSXNEaXNhYmxlZChXS1BhZ2VSZWYpOworV0tfRVhQT1JUIHZvaWQg V0tQYWdlRGlzYWJsZUhvcml6b250YWxSdWJiZXJCYW5kaW5nKFdLUGFnZVJlZiwgYm9vbCBkaXNh YmxlSG9yaXpvbnRhbFJ1YmJlckJhbmRpbmcpOworICAgIAogV0tfRVhQT1JUIHZvaWQgV0tQYWdl U2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKFdLUGFnZVJlZiwgYm9vbCBiYWNrZ3JvdW5k RXh0ZW5kc0JleW9uZFBhZ2UpOwogV0tfRVhQT1JUIGJvb2wgV0tQYWdlQmFja2dyb3VuZEV4dGVu ZHNCZXlvbmRQYWdlKFdLUGFnZVJlZik7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE2NzEzNikKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTM5OCw2ICsxMzk4LDE2IEBAIHZvaWQgV2ViUGFnZTo6c2V0U3VwcHJlc3NTY3JvbGxiYXJBbmlt YXQKIHsKICAgICBtX3BhZ2UtPnNldFNob3VsZFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9ucyhz dXBwcmVzc0FuaW1hdGlvbnMpOwogfQorICAgIAordm9pZCBXZWJQYWdlOjpkaXNhYmxlVmVydGlj YWxSdWJiZXJCYW5kaW5nKGJvb2wgZGlzYWJsZVZlcnRpY2FsUnViYmVyQmFuZGluZykKK3sKKyAg ICBtX3BhZ2UtPnNldFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eShkaXNhYmxlVmVydGljYWxSdWJi ZXJCYW5kaW5nID8gU2Nyb2xsRWxhc3RpY2l0eU5vbmUgOiBTY3JvbGxFbGFzdGljaXR5QWxsb3dl ZCk7Cit9CisgICAgCit2b2lkIFdlYlBhZ2U6OmRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGlu Zyhib29sIGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZykKK3sKKyAgICBtX3BhZ2UtPnNl dEhvcml6b250YWxTY3JvbGxFbGFzdGljaXR5KGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGlu ZyA/IFNjcm9sbEVsYXN0aWNpdHlOb25lIDogU2Nyb2xsRWxhc3RpY2l0eUFsbG93ZWQpOworfQog CiB2b2lkIFdlYlBhZ2U6OnNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sIGJhY2tn cm91bmRFeHRlbmRzQmV5b25kUGFnZSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTY3MTM2KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzU4LDcg KzM1OCwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBsaXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKHVp bnQzMl90IC8qIExheW91dE1pbGVzdG9uZXMgKi8pOwogCiAgICAgdm9pZCBzZXRTdXBwcmVzc1Nj cm9sbGJhckFuaW1hdGlvbnMoYm9vbCk7Ci0KKyAgICAKKyAgICB2b2lkIGRpc2FibGVWZXJ0aWNh bFJ1YmJlckJhbmRpbmcoYm9vbCk7CisgICAgdm9pZCBkaXNhYmxlSG9yaXpvbnRhbFJ1YmJlckJh bmRpbmcoYm9vbCk7CisgICAgCiAgICAgdm9pZCBzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBh Z2UoYm9vbCk7CiAKICAgICB2b2lkIHNldFBhZ2luYXRpb25Nb2RlKHVpbnQzMl90IC8qIFdlYkNv cmU6OlBhZ2luYXRpb246Ok1vZGUgKi8pOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE2NzEz NikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsNiArMTczLDkgQEAgbWVzc2FnZXMgLT4gV2ViUGFn ZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgTGlzdGVuRm9yTGF5b3V0TWlsZXN0b25lcyh1aW50MzJf dCBtaWxlc3RvbmVzKQogICAgIFNldFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9ucyhib29sIHN1 cHByZXNzQW5pbWF0aW9ucykKIAorICAgIERpc2FibGVWZXJ0aWNhbFJ1YmJlckJhbmRpbmcoYm9v bCBkaXNhYmxlVmVydGljYWxSdWJiZXJCYW5kaW5nKQorICAgIERpc2FibGVIb3Jpem9udGFsUnVi YmVyQmFuZGluZyhib29sIGRpc2FibGVIb3Jpem9udGFsUnViYmVyQmFuZGluZykKKwogICAgIFNl dEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sIGJhY2tncm91bmRFeHRlbmRzQmV5b25k UGFnZSkKIAogICAgIFNldFBhZ2luYXRpb25Nb2RlKHVpbnQzMl90IG1vZGUpCg==