157107 2016-04-27 16:39:06 -0700 [iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable 2016-05-06 18:46:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez commit-queue sabouhallawa simon.fraser thorton oldest_to_newest 1188011 0 simon.fraser 2016-04-27 16:39:06 -0700 [iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable 1188012 1 277547 simon.fraser 2016-04-27 16:42:43 -0700 Created attachment 277547 Patch 1188013 2 simon.fraser 2016-04-27 16:43:08 -0700 rdar://problem/25943577 1188014 3 commit-queue 2016-04-27 16:44:21 -0700 Attachment 277547 did not pass style-queue: ERROR: Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h:60: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1188015 4 277547 thorton 2016-04-27 16:44:55 -0700 Comment on attachment 277547 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277547&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1956 > ++ (BOOL)scrollViewCanScroll:(UIScrollView *)scrollView why is this not just a static C function? 1188017 5 simon.fraser 2016-04-27 16:51:41 -0700 https://trac.webkit.org/r200161 1189878 6 cdumez 2016-05-03 15:19:36 -0700 Reverted r199259 and r200161 for reason: Seems to have caused a ~1.2% PLT regression on iOS Committed r200390: <http://trac.webkit.org/changeset/200390> 1190857 7 simon.fraser 2016-05-06 18:46:48 -0700 This got re-landed in http://trac.webkit.org/r200470 277547 2016-04-27 16:42:43 -0700 2016-04-27 16:44:55 -0700 Patch bug-157107-20160427164313.patch text/plain 14031 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmUzOTRmZmFiNjY0ODky YmFiMDlmZDUzMDhjY2UwNzFhYjIyNzFmNC4uMzgzOTA2OTkzM2YyNzcyNTBhZmExMTQwNDQ4NjFk YzAxMWMzOGJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA0LTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBX aGVuIGRldGVybWluaW5nIHRpbGUgc2l6ZSwgY2hlY2sgd2hldGhlciBhbmNlc3RvciBVSVNjcm9s bFZpZXdzIGFyZSBhY3R1YWxseSBzY3JvbGxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTcxMDcKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjU5 NDM1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW5hbWUgImVuY2xvc2VkSW5TY3JvbGxWaWV3IiB0byAiZW5jbG9zZWRJblNjcm9sbGFibGVBbmNl c3RvclZpZXciIGV2ZXJ5d2hlcmUuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmFkanVzdFRpbGVkQmFja2luZ1Njcm9sbGFiaWxp dHkpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZW5j bG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6 c2V0RW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZTo6ZW5jbG9zZWRJblNjcm9sbFZpZXcpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 UGFnZTo6c2V0RW5jbG9zZWRJblNjcm9sbFZpZXcpOiBEZWxldGVkLgorCiAyMDE2LTA0LTI1ICBK ZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdFBsYXliYWNr U2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50IHNob3VsZCBpbml0aWFsaXplIHRoZSBpbnRlcmZhY2Ug YWRkZWQgYnkgc2V0V2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlKCkgd2l0aCBpbml0aWFsIGRh dGEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCA4YmQ0Mjc1NGEyZjVkNDdlMjU2MWMyYjc3OWQxMDRjMjg2NTE5NDFl Li5kYTJiNTk3ZmI5OTRkMTcxMzIwZWViZTdiYWEwZGMxMGE0M2Q5MjVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzUgQEAKKzIwMTYtMDQtMjcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFdoZW4gZGV0ZXJtaW5pbmcgdGlsZSBzaXpl LCBjaGVjayB3aGV0aGVyIGFuY2VzdG9yIFVJU2Nyb2xsVmlld3MgYXJlIGFjdHVhbGx5IHNjcm9s bGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NzEwNworICAgICAgICByZGFyOi8vcHJvYmxlbS8yNTk0MzU3NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgV2Ugc2hvdWxkIG9ubHkgZmFs bCBiYWNrIHRvIDUxMng1MTIgdGlsZXMgaWYgdGhlIFdLV2ViVmlldyBoYXMgYSBVSVNjcm9sbFZp ZXcgYW5jZXN0b3IsCisgICAgICAgIGFuZCB0aGF0IFVJU2Nyb2xsVmlldyBhY3R1YWxseSBzY3Jv bGxzLiBUaGlzIGF2b2lkcyBmYWxsaW5nIGJhY2sgdG8gc21hbGwgdGlsZXMgaW4KKyAgICAgICAg TW9iaWxlU2FmYXJpLgorCisgICAgICAgIFJlbmFtZSAiZW5jbG9zZWRJblNjcm9sbFZpZXciIHRv ICJlbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldyIgZXZlcnl3aGVyZS4KKworICAgICAg ICAqIFNoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmNwcDoKKyAgICAgICAgKFdl YktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5jb2RlKToKKyAgICAgICAgKFdl YktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZGVjb2RlKToKKyAgICAgICAgKiBT aGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5oOgorICAgICAgICAoV2ViS2l0OjpW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv KToKKyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5jbG9z ZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcpOgorICAgICAgICAoV2ViS2l0OjpvcGVyYXRvcj09 KToKKyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5jbG9z ZWRJblNjcm9sbFZpZXcpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tOgorICAgICAgICAoK1tXS1dlYlZpZXcgc2Nyb2xsVmlld0NhblNjcm9sbDpd KToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVDb250ZW50UmVjdHNXaXRoU3RhdGU6XSk6 CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRp ZFVwZGF0ZVZpc2libGVSZWN0OnVub2JzY3VyZWRSZWN0OnVub2JzY3VyZWRSZWN0SW5TY3JvbGxW aWV3Q29vcmRpbmF0ZXM6b2JzY3VyZWRJbnNldDpzY2FsZTptaW5pbXVtU2NhbGU6aW5TdGFibGVT dGF0ZTppc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5OmVuY2xvc2VkSW5TY3Jv bGxhYmxlQW5jZXN0b3JWaWV3Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZFVwZGF0 ZVZpc2libGVSZWN0OnVub2JzY3VyZWRSZWN0OnVub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29v cmRpbmF0ZXM6b2JzY3VyZWRJbnNldDpzY2FsZTptaW5pbXVtU2NhbGU6aW5TdGFibGVTdGF0ZTpp c0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5OmVuY2xvc2VkSW5TY3JvbGxWaWV3 Ol0pOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 cyk6CisKIDIwMTYtMDQtMjUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBDcmFzaCB1bmRlciAtW1dLV2ViVmlldyBfbWF5QXV0b21hdGljYWxseVNob3dWaWRlb1Bp Y3R1cmVJblBpY3R1cmVdICsgMzIgKFdLV2ViVmlldy5tbTozMDkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKaW5kZXggN2E5YzNjYTAxNTZkMGE2OTNjZTY0ZTNlOTA4NzU2MjE4NTY5NTFlZS4u N2RjODI4NDNkYjVjZmY4YTgzYjc1ZDc1OGUzYzdhMmZjNDM5YTg1MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcApAQCAtMjQ4Nyw3ICsyNDg3LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmFkanVz dFRpbGVkQmFja2luZ1Njcm9sbGFiaWxpdHkoKQogCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIGlm IChQYWdlKiBwYWdlID0gZnJhbWUoKS5wYWdlKCkpCi0gICAgICAgIGNsaXBwZWRCeUFuY2VzdG9y VmlldyB8PSBwYWdlLT5lbmNsb3NlZEluU2Nyb2xsVmlldygpOworICAgICAgICBjbGlwcGVkQnlB bmNlc3RvclZpZXcgfD0gcGFnZS0+ZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcoKTsK ICNlbmRpZgogCiAgICAgaWYgKGRlbGVnYXRlc1Njcm9sbGluZygpKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmlu ZGV4IDY0NDUzNDNlZDI4MzhiYmNmZmE5ZTMwMTNkMDEwYTc3Mjc0YjFiODguLmM1Njk4NDBhYmQ0 ZDNiZDdiZjg1ZTY1OWE2MGNlMjFiOTk1ZGJlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0yOTksOCAr Mjk5LDggQEAgcHVibGljOgogICAgIEZsb2F0U2l6ZSBvYnNjdXJlZEluc2V0KCkgY29uc3QgeyBy ZXR1cm4gbV9vYnNjdXJlZEluc2V0OyB9CiAgICAgdm9pZCBzZXRPYnNjdXJlZEluc2V0KEZsb2F0 U2l6ZSBpbnNldCkgeyBtX29ic2N1cmVkSW5zZXQgPSBpbnNldDsgfQogICAgIAotICAgIGJvb2wg ZW5jbG9zZWRJblNjcm9sbFZpZXcoKSBjb25zdCB7IHJldHVybiBtX2VuY2xvc2VkSW5TY3JvbGxW aWV3OyB9Ci0gICAgdm9pZCBzZXRFbmNsb3NlZEluU2Nyb2xsVmlldyhib29sIGYpIHsgbV9lbmNs b3NlZEluU2Nyb2xsVmlldyA9IGY7IH0KKyAgICBib29sIGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5j ZXN0b3JWaWV3KCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9y VmlldzsgfQorICAgIHZvaWQgc2V0RW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcoYm9v bCBmKSB7IG1fZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcgPSBmOyB9CiAjZW5kaWYK IAogI2lmIEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQpAQCAtNjEyLDcgKzYxMiw3IEBAIHBy aXZhdGU6CiAjaWYgUExBVEZPUk0oSU9TKQogICAgIC8vIFRoaXMgaXMgb25seSB1c2VkIGZvciBo aXN0b3J5IHNjcm9sbCBwb3NpdGlvbiByZXN0b3JhdGlvbi4KICAgICBGbG9hdFNpemUgbV9vYnNj dXJlZEluc2V0OwotICAgIGJvb2wgbV9lbmNsb3NlZEluU2Nyb2xsVmlldyB7IGZhbHNlIH07Cisg ICAgYm9vbCBtX2VuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3IHsgZmFsc2UgfTsKICNl bmRpZgogCiAjaWYgRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5jcHAKaW5kZXgg NTUyNThlY2Y1Mzk1MTRhZjY5NWZiMGRkMjRjNDA1NmQ5ZDg0OWM5MS4uZTkzZWI2YmE3NmIwOTFl MWFiNzM1MzRkYmQ1NzNhZjQwNmFjNDY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmNwcApAQCAtNDYsNyArNDYsNyBA QCB2b2lkIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm86OmVuY29kZShJUEM6OkFyZ3VtZW50 RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IG1faW5TdGFibGVTdGF0ZTsK ICAgICBlbmNvZGVyIDw8IG1faXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTsK ICAgICBlbmNvZGVyIDw8IG1fYWxsb3dTaHJpbmtUb0ZpdDsKLSAgICBlbmNvZGVyIDw8IG1fZW5j bG9zZWRJblNjcm9sbFZpZXc7CisgICAgZW5jb2RlciA8PCBtX2VuY2xvc2VkSW5TY3JvbGxhYmxl QW5jZXN0b3JWaWV3OwogfQogCiBib29sIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm86OmRl Y29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgVmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlSW5mbyYgcmVzdWx0KQpAQCAtNzksNyArNzksNyBAQCBib29sIFZpc2libGVDb250ZW50UmVj dFVwZGF0ZUluZm86OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgVmlzaWJs ZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQu bV9hbGxvd1Nocmlua1RvRml0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0Lm1fZW5jbG9zZWRJblNjcm9sbFZpZXcpKQorICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0Lm1fZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5oCmluZGV4IDY4 NDcwMjdkODc2OTcyMTc3MTIxZWQ5ZjBkOGIzZmY3ZjBhODdiODUuLmQ1OWQzY2FkZjYxOTE2OGRk NmQxMTYyOGEwNGI3YWM5OGQ4MjhlNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uaApAQCAtNDEsNyArNDEsNyBAQCBwdWJs aWM6CiAKICAgICBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKGNvbnN0IFdlYkNvcmU6OkZs b2F0UmVjdCYgZXhwb3NlZENvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVu b2JzY3VyZWRDb250ZW50UmVjdCwKICAgICAgICAgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1 bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9h dFJlY3QmIGN1c3RvbUZpeGVkUG9zaXRpb25SZWN0LAotICAgICAgICBjb25zdCBXZWJDb3JlOjpG bG9hdFNpemUmIG9ic2N1cmVkSW5zZXQsIGRvdWJsZSBzY2FsZSwgYm9vbCBpblN0YWJsZVN0YXRl LCBib29sIGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHksIGJvb2wgYWxsb3dT aHJpbmtUb0ZpdCwgYm9vbCBlbmNsb3NlZEluU2Nyb2xsVmlldywKKyAgICAgICAgY29uc3QgV2Vi Q29yZTo6RmxvYXRTaXplJiBvYnNjdXJlZEluc2V0LCBkb3VibGUgc2NhbGUsIGJvb2wgaW5TdGFi bGVTdGF0ZSwgYm9vbCBpc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5LCBib29s IGFsbG93U2hyaW5rVG9GaXQsIGJvb2wgZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcs CiAgICAgICAgIGRvdWJsZSB0aW1lc3RhbXAsIGRvdWJsZSBob3Jpem9udGFsVmVsb2NpdHksIGRv dWJsZSB2ZXJ0aWNhbFZlbG9jaXR5LCBkb3VibGUgc2NhbGVDaGFuZ2VSYXRlLCB1aW50NjRfdCBs YXN0TGF5ZXJUcmVlVHJhbnNhY3Rpb25JZCkKICAgICAgICAgOiBtX2V4cG9zZWRDb250ZW50UmVj dChleHBvc2VkQ29udGVudFJlY3QpCiAgICAgICAgICwgbV91bm9ic2N1cmVkQ29udGVudFJlY3Qo dW5vYnNjdXJlZENvbnRlbnRSZWN0KQpAQCAtNTcsNyArNTcsNyBAQCBwdWJsaWM6CiAgICAgICAg ICwgbV9pblN0YWJsZVN0YXRlKGluU3RhYmxlU3RhdGUpCiAgICAgICAgICwgbV9pc0NoYW5naW5n T2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5KGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVy YWN0aXZlbHkpCiAgICAgICAgICwgbV9hbGxvd1Nocmlua1RvRml0KGFsbG93U2hyaW5rVG9GaXQp Ci0gICAgICAgICwgbV9lbmNsb3NlZEluU2Nyb2xsVmlldyhlbmNsb3NlZEluU2Nyb2xsVmlldykK KyAgICAgICAgLCBtX2VuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3KGVuY2xvc2VkSW5T Y3JvbGxhYmxlQW5jZXN0b3JWaWV3KQogICAgIHsKICAgICB9CiAKQEAgLTcxLDcgKzcxLDcgQEAg cHVibGljOgogICAgIGJvb2wgaW5TdGFibGVTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5TdGFi bGVTdGF0ZTsgfQogICAgIGJvb2wgaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVs eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVs eTsgfQogICAgIGJvb2wgYWxsb3dTaHJpbmtUb0ZpdCgpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dT aHJpbmtUb0ZpdDsgfQotICAgIGJvb2wgZW5jbG9zZWRJblNjcm9sbFZpZXcoKSBjb25zdCB7IHJl dHVybiBtX2VuY2xvc2VkSW5TY3JvbGxWaWV3OyB9CisgICAgYm9vbCBlbmNsb3NlZEluU2Nyb2xs YWJsZUFuY2VzdG9yVmlldygpIGNvbnN0IHsgcmV0dXJuIG1fZW5jbG9zZWRJblNjcm9sbGFibGVB bmNlc3RvclZpZXc7IH0KIAogICAgIGRvdWJsZSB0aW1lc3RhbXAoKSBjb25zdCB7IHJldHVybiBt X3RpbWVzdGFtcDsgfQogICAgIGRvdWJsZSBob3Jpem9udGFsVmVsb2NpdHkoKSBjb25zdCB7IHJl dHVybiBtX2hvcml6b250YWxWZWxvY2l0eTsgfQpAQCAtOTgsNyArOTgsNyBAQCBwcml2YXRlOgog ICAgIGJvb2wgbV9pblN0YWJsZVN0YXRlIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNDaGFuZ2lu Z09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2FsbG93 U2hyaW5rVG9GaXQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9lbmNsb3NlZEluU2Nyb2xsVmlldyB7 IGZhbHNlIH07CisgICAgYm9vbCBtX2VuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3IHsg ZmFsc2UgfTsKIH07CiAKIGlubGluZSBib29sIG9wZXJhdG9yPT0oY29uc3QgVmlzaWJsZUNvbnRl bnRSZWN0VXBkYXRlSW5mbyYgYSwgY29uc3QgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyYg YikKQEAgLTExNCw3ICsxMTQsNyBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFZpc2li bGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIGEsIGNvbnN0IFZpc2libGVDb250ZQogICAgICAgICAm JiBhLnNjYWxlQ2hhbmdlUmF0ZSgpID09IGIuc2NhbGVDaGFuZ2VSYXRlKCkKICAgICAgICAgJiYg YS5pblN0YWJsZVN0YXRlKCkgPT0gYi5pblN0YWJsZVN0YXRlKCkKICAgICAgICAgJiYgYS5hbGxv d1Nocmlua1RvRml0KCkgPT0gYi5hbGxvd1Nocmlua1RvRml0KCkKLSAgICAgICAgJiYgYS5lbmNs b3NlZEluU2Nyb2xsVmlldygpID09IGIuZW5jbG9zZWRJblNjcm9sbFZpZXcoKTsKKyAgICAgICAg JiYgYS5lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldygpID09IGIuZW5jbG9zZWRJblNj cm9sbGFibGVBbmNlc3RvclZpZXcoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDBl ZDc1M2VlY2U0OTI5OGM1ZWIxMDFlYTFiZWUzMWY3N2Q1MzAyODcuLjEyN2JhOWFjYTYwZjg3YTc5 NzNkMDhkOGFlMmVjZjAwOTM1N2JhMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0xOTUzLDYgKzE5NTMsMTkgQEAgLSAodm9pZClf dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0QWZ0ZXJTY3JvbGxJblZpZXc6KFVJU2Nyb2xsVmlldyAq KXNjcm9sbFZpZXcKICAgICBbc2VsZiBfdXBkYXRlQ29udGVudFJlY3RzV2l0aFN0YXRlOmlzU3Rh YmxlU3RhdGVdOwogfQogCisrIChCT09MKXNjcm9sbFZpZXdDYW5TY3JvbGw6KFVJU2Nyb2xsVmll dyAqKXNjcm9sbFZpZXcKK3sKKyAgICBpZiAoIXNjcm9sbFZpZXcpCisgICAgICAgIHJldHVybiBO TzsKKworICAgIFVJRWRnZUluc2V0cyBjb250ZW50SW5zZXQgPSBzY3JvbGxWaWV3LmNvbnRlbnRJ bnNldDsKKyAgICBDR1NpemUgY29udGVudFNpemUgPSBzY3JvbGxWaWV3LmNvbnRlbnRTaXplOwor ICAgIENHU2l6ZSBib3VuZHNTaXplID0gc2Nyb2xsVmlldy5ib3VuZHMuc2l6ZTsKKworICAgIHJl dHVybiAoY29udGVudFNpemUud2lkdGggKyBjb250ZW50SW5zZXQubGVmdCArIGNvbnRlbnRJbnNl dC5yaWdodCkgPiBib3VuZHNTaXplLndpZHRoCisgICAgICAgIHx8IChjb250ZW50U2l6ZS5oZWln aHQgKyBjb250ZW50SW5zZXQudG9wICsgY29udGVudEluc2V0LmJvdHRvbSkgPiBib3VuZHNTaXpl LmhlaWdodDsKK30KKwogLSAodm9pZClfdXBkYXRlQ29udGVudFJlY3RzV2l0aFN0YXRlOihCT09M KWluU3RhYmxlU3RhdGUKIHsKICAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3 XSkgewpAQCAtMjAwOSw3ICsyMDIyLDcgQEAgLSAodm9pZClfdXBkYXRlQ29udGVudFJlY3RzV2l0 aFN0YXRlOihCT09MKWluU3RhYmxlU3RhdGUKICAgICAgICAgc2NhbGU6c2NhbGVGYWN0b3IgbWlu aW11bVNjYWxlOltfc2Nyb2xsVmlldyBtaW5pbXVtWm9vbVNjYWxlXQogICAgICAgICBpblN0YWJs ZVN0YXRlOmluU3RhYmxlU3RhdGUKICAgICAgICAgaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50 ZXJhY3RpdmVseTpfaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseQotICAgICAg ICBlbmNsb3NlZEluU2Nyb2xsVmlldzpbc2VsZiBfc2Nyb2xsZXJdICE9IG5pbF07CisgICAgICAg IGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3OltXS1dlYlZpZXcgc2Nyb2xsVmlld0Nh blNjcm9sbDpbc2VsZiBfc2Nyb2xsZXJdXV07CiB9CiAKIC0gKHZvaWQpX2RpZEZpbmlzaExvYWRG b3JNYWluRnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 LmgKaW5kZXggMTJkZjU1N2IyODU1ZDMyMjY2NDFiNWQwZGI4MTI2NjMyOWUyZWU1MS4uMWY1ZTUz MDdhYWFhMDQwMTFkZmVkZDk3YzUyOTE2NzY0Y2NiZTBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKQEAgLTcyLDcgKzcyLDcgQEAgY2xhc3MgV2Vi UHJvY2Vzc1Bvb2w7CiAgICAgc2NhbGU6KENHRmxvYXQpc2NhbGUgbWluaW11bVNjYWxlOihDR0Zs b2F0KW1pbmltdW1TY2FsZQogICAgIGluU3RhYmxlU3RhdGU6KEJPT0wpaXNTdGFibGVTdGF0ZQog ICAgIGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHk6KEJPT0wpaXNDaGFuZ2lu Z09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseQotICAgIGVuY2xvc2VkSW5TY3JvbGxWaWV3OihC T09MKWVuY2xvc2VkSW5TY3JvbGxWaWV3OworICAgIGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0 b3JWaWV3OihCT09MKWVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3OwogCiAtICh2b2lk KWRpZEZpbmlzaFNjcm9sbGluZzsKIC0gKHZvaWQpZGlkSW50ZXJydXB0U2Nyb2xsaW5nOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDkwMjVm YzAzMDgwYTc0NDg5MmI1Njg1MWU0MDFmNjEzOGQ5ODJkZTcuLmMxYWQxMWE2YTFiYzMzOGEzNGJh ZWYyY2M5NjVkYTNiZjY2ZmQzZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXcubW0KQEAgLTM1Niw3ICszNTYsNyBAQCAtICh2b2lkKXVwZGF0ZUZpeGVk Q2xpcHBpbmdWaWV3OihGbG9hdFJlY3QpZml4ZWRQb3NpdGlvblJlY3RGb3JVSQogfQogCiAtICh2 b2lkKWRpZFVwZGF0ZVZpc2libGVSZWN0OihDR1JlY3QpdmlzaWJsZVJlY3QgdW5vYnNjdXJlZFJl Y3Q6KENHUmVjdCl1bm9ic2N1cmVkUmVjdCB1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3Jk aW5hdGVzOihDR1JlY3QpdW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGluYXRlcwotICAg IG9ic2N1cmVkSW5zZXQ6KENHU2l6ZSlvYnNjdXJlZEluc2V0IHNjYWxlOihDR0Zsb2F0KXpvb21T Y2FsZSBtaW5pbXVtU2NhbGU6KENHRmxvYXQpbWluaW11bVNjYWxlIGluU3RhYmxlU3RhdGU6KEJP T0wpaXNTdGFibGVTdGF0ZSBpc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5OihC T09MKWlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkgZW5jbG9zZWRJblNjcm9s bFZpZXc6KEJPT0wpZW5jbG9zZWRJblNjcm9sbFZpZXcKKyAgICBvYnNjdXJlZEluc2V0OihDR1Np emUpb2JzY3VyZWRJbnNldCBzY2FsZTooQ0dGbG9hdCl6b29tU2NhbGUgbWluaW11bVNjYWxlOihD R0Zsb2F0KW1pbmltdW1TY2FsZSBpblN0YWJsZVN0YXRlOihCT09MKWlzU3RhYmxlU3RhdGUgaXND aGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTooQk9PTClpc0NoYW5naW5nT2JzY3Vy ZWRJbnNldHNJbnRlcmFjdGl2ZWx5IGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3OihC T09MKWVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3CiB7CiAgICAgYXV0byBkcmF3aW5n QXJlYSA9IF9wYWdlLT5kcmF3aW5nQXJlYSgpOwogICAgIGlmICghZHJhd2luZ0FyZWEpCkBAIC0z ODEsNyArMzgxLDcgQEAgLSAodm9pZClkaWRVcGRhdGVWaXNpYmxlUmVjdDooQ0dSZWN0KXZpc2li bGVSZWN0IHVub2JzY3VyZWRSZWN0OihDR1JlY3QpdW5vYnNjdXIKICAgICAgICAgaXNTdGFibGVT dGF0ZSwKICAgICAgICAgaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseSwKICAg ICAgICAgX3dlYlZpZXcuX2FsbG93c1ZpZXdwb3J0U2hyaW5rVG9GaXQsCi0gICAgICAgIGVuY2xv c2VkSW5TY3JvbGxWaWV3LAorICAgICAgICBlbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmll dywKICAgICAgICAgdGltZXN0YW1wLAogICAgICAgICB2ZWxvY2l0eURhdGEuaG9yaXpvbnRhbFZl bG9jaXR5LAogICAgICAgICB2ZWxvY2l0eURhdGEudmVydGljYWxWZWxvY2l0eSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRl eCBmZGViODA2ZjRlOGY3Y2MzMDdlNzhmYjFhOGZmOTUzMjIzMDUyNTgyLi5hZDVlYjQ4MjlmZjcy MjlhMjA2N2VhMjEyMDk3NDU2MmZiY2JhZjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0yOTY3LDcgKzI5NjcsNyBA QCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMoY29uc3QgVmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mbyYgdmlzaQogCiAgICAgZnJhbWVWaWV3LnNldFVub2JzY3VyZWRD b250ZW50U2l6ZSh2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLnVub2JzY3VyZWRDb250ZW50 UmVjdCgpLnNpemUoKSk7CiAgICAgbV9wYWdlLT5zZXRPYnNjdXJlZEluc2V0KHZpc2libGVDb250 ZW50UmVjdFVwZGF0ZUluZm8ub2JzY3VyZWRJbnNldCgpKTsKLSAgICBtX3BhZ2UtPnNldEVuY2xv c2VkSW5TY3JvbGxWaWV3KHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uZW5jbG9zZWRJblNj cm9sbFZpZXcoKSk7CisgICAgbV9wYWdlLT5zZXRFbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9y Vmlldyh2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmVuY2xvc2VkSW5TY3JvbGxhYmxlQW5j ZXN0b3JWaWV3KCkpOwogCiAgICAgZG91YmxlIGhvcml6b250YWxWZWxvY2l0eSA9IHZpc2libGVD b250ZW50UmVjdFVwZGF0ZUluZm8uaG9yaXpvbnRhbFZlbG9jaXR5KCk7CiAgICAgZG91YmxlIHZl cnRpY2FsVmVsb2NpdHkgPSB2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLnZlcnRpY2FsVmVs b2NpdHkoKTsK