111373 2013-03-04 16:05:55 -0800 [BlackBerry] Clean up animated scroll/zoom code in WebPagePrivate 2013-03-05 04:55:42 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anlo anlo dglazkov mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 846963 0 anlo 2013-03-04 16:05:55 -0800 Rename some functions & variables to reflect that they are used for both block zoom and generic zoom/scroll animations. Have WebPageClient pass the final scale and position to WebPage when animation finishes, rather than keeping those values as instance variables in WebPagePrivate. 846976 1 191338 anlo 2013-03-04 16:12:47 -0800 Created attachment 191338 Patch 847145 2 191338 webkit.review.bot 2013-03-04 18:11:29 -0800 Comment on attachment 191338 Patch Attachment 191338 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16958018 New failing tests: inspector/debugger/watch-expressions-panel-switch.html 847559 3 191338 rwlbuis 2013-03-05 04:35:17 -0800 Comment on attachment 191338 Patch LGTM. 847566 4 191338 webkit.review.bot 2013-03-05 04:55:38 -0800 Comment on attachment 191338 Patch Clearing flags on attachment: 191338 Committed r144750: <http://trac.webkit.org/changeset/144750> 847567 5 webkit.review.bot 2013-03-05 04:55:42 -0800 All reviewed patches have been landed. Closing bug. 191338 2013-03-04 16:12:47 -0800 2013-03-05 04:55:37 -0800 Patch bug-111373-20130304190855.patch text/plain 14683 anlo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA3MTM1ZDc4MDcxZTg3NDUzYWU1N2FmZmFhZThkZjAxOTU3NjQ4YTQ0Li43Y2E5MDI2OTQ1 MTI2ZGY0YmUwYWNmMjlhYTExZjNmNDgxODgxYTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMy0wMy0wNCAgQW5kcmV3IExvICA8YW5sb0ByaW0u Y29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBDbGVhbiB1cCBhbmltYXRlZCBzY3JvbGwvem9v bSBjb2RlIGluIFdlYlBhZ2VQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTEzNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IEpha29iIFBldHNvdml0cy4K KyAgICAgICAgSW50ZXJuYWwgUFIgMjg1NDY4LgorCisgICAgICAgIEhhdmUgV2ViUGFnZUNsaWVu dCBwYXNzIHRoZSBmaW5hbCBzY2FsZSBhbmQgcG9zaXRpb24gdG8gV2ViUGFnZSB3aGVuIGEgem9v bS9zY3JvbGwKKyAgICAgICAgYW5pbWF0aW9uIGZpbmlzaGVzLCByYXRoZXIgdGhhbiBrZWVwaW5n IHRob3NlIHZhbHVlcyBhcyBpbnN0YW5jZSB2YXJpYWJsZXMgaW4KKyAgICAgICAgV2ViUGFnZVBy aXZhdGUuCisKKyAgICAgICAgUmVuYW1lIHNvbWUgZnVuY3Rpb25zICYgdmFyaWFibGVzIHRvIHJl ZmxlY3QgdGhhdCB0aGV5IGFyZSB1c2VkIGZvciBib3RoIGJsb2NrIHpvb20KKyAgICAgICAgYW5k IGdlbmVyaWMgem9vbS9zY3JvbGwgYW5pbWF0aW9ucy4KKworICAgICAgICAqIEFwaS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OldlYlBh Z2VQcml2YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6 Onpvb21BbmltYXRpb25GaW5pc2hlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oldl YlBhZ2U6Onpvb21BbmltYXRpb25GaW5pc2hlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OldlYlBhZ2VQcml2YXRlOjpyZXNldEJsb2NrWm9vbSk6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2U6OmJsb2NrWm9vbSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OldlYlBhZ2VQcml2YXRlOjphbmltYXRlVG9TY2FsZUFuZERvY3VtZW50U2Nyb2xsUG9zaXRp b24pOgorICAgICAgICAqIEFwaS9XZWJQYWdlLmg6CisgICAgICAgICogQXBpL1dlYlBhZ2VDbGll bnQuaDoKKyAgICAgICAgKiBBcGkvV2ViUGFnZV9wLmg6CisgICAgICAgIChXZWJQYWdlUHJpdmF0 ZSk6CisKIDIwMTMtMDItMjcgIEFuZHJldyBMbyAgPGFubG9AcmltLmNvbT4KIAogICAgICAgICBb QmxhY2tCZXJyeV0gTmVlZCBXZWJQYWdlIEFQSSBmb3IgYW5pbWF0aW5nIHNjcm9sbCBwb3NpdGlv biAmIHpvb20gY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAK aW5kZXggYjVmNDkzODRmYjhjZjkyMGYwNzA2M2E2ZGU5ZjcwNDU2NmE2NTRhNy4uMjMxZDdiMTcz YzIxMDMxYzc4NjliOWFmNmQzZjU5ZjRjZGJmYTU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC00MDQsMTIgKzQwNCwxMCBAQCBXZWJQYWdlUHJpdmF0ZTo6 V2ViUGFnZVByaXZhdGUoV2ViUGFnZSogd2ViUGFnZSwgV2ViUGFnZUNsaWVudCogY2xpZW50LCBj b25zdCBJbgogICAgICwgbV9taW5pbXVtU2NhbGUoLTEuMCkKICAgICAsIG1fbWF4aW11bVNjYWxl KC0xLjApCiAgICAgLCBtX2ZvcmNlUmVzcGVjdFZpZXdwb3J0QXJndW1lbnRzKGZhbHNlKQotICAg ICwgbV9maW5hbEFuaW1hdGlvblNjYWxlKDEuMCkKICAgICAsIG1fYW5jaG9ySW5Ob2RlUmVjdFJh dGlvKC0xLCAtMSkKICAgICAsIG1fY3VycmVudEJsb2NrWm9vbU5vZGUoMCkKICAgICAsIG1fY3Vy cmVudEJsb2NrWm9vbUFkanVzdGVkTm9kZSgwKQogICAgICwgbV9zaG91bGRSZWZsb3dCbG9jayhm YWxzZSkKLSAgICAsIG1fc2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9Db250ZW50RWRnZSh0cnVl KQogICAgICwgbV9sYXN0VXNlckV2ZW50VGltZXN0YW1wKDAuMCkKICAgICAsIG1fcGx1Z2luTW91 c2VCdXR0b25QcmVzc2VkKGZhbHNlKQogICAgICwgbV9wbHVnaW5NYXlPcGVuTmV3VGFiKGZhbHNl KQpAQCAtMjk4OSwxMiArMjk4NywxMiBAQCBJbnRSZWN0IFdlYlBhZ2VQcml2YXRlOjpibG9ja1pv b21SZWN0Rm9yTm9kZShOb2RlKiBub2RlKQogCiAvLyBUaGlzIGZ1bmN0aW9uIHNob3VsZCBub3Qg YmUgY2FsbGVkIGRpcmVjdGx5LgogLy8gSXQgaXMgY2FsbGVkIGFmdGVyIHRoZSBhbmltYXRpb24g ZW5kcyAoc2VlIGFib3ZlKS4KLXZvaWQgV2ViUGFnZVByaXZhdGU6Onpvb21CbG9jaygpCit2b2lk IFdlYlBhZ2VQcml2YXRlOjp6b29tQW5pbWF0aW9uRmluaXNoZWQoZG91YmxlIGZpbmFsQW5pbWF0 aW9uU2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGZpbmFsQW5pbWF0aW9uRG9jdW1l bnRTY3JvbGxQb3NpdGlvbiwgYm9vbCBzaG91bGRDb25zdHJhaW5TY3JvbGxpbmdUb0NvbnRlbnRF ZGdlKQogewogICAgIGlmICghbV9tYWluRnJhbWUpCiAgICAgICAgIHJldHVybjsKIAotICAgIElu dFBvaW50IGFuY2hvcihyb3VuZFVudHJhbnNmb3JtZWRQb2ludChtX2ZpbmFsQW5pbWF0aW9uRG9j dW1lbnRTY3JvbGxQb3NpdGlvbikpOworICAgIEludFBvaW50IGFuY2hvcihyb3VuZFVudHJhbnNm b3JtZWRQb2ludChmaW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24pKTsKICAgICBi b29sIHdpbGxVc2VUZXh0UmVmbG93ID0gZmFsc2U7CiAKICNpZiBFTkFCTEUoVklFV1BPUlRfUkVG TE9XKQpAQCAtMzAwNCw3ICszMDAyLDcgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6em9vbUJsb2Nr KCkKICNlbmRpZgogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggem9vbTsKLSAgICB6b29tLnNj YWxlKG1fZmluYWxBbmltYXRpb25TY2FsZSk7CisgICAgem9vbS5zY2FsZShmaW5hbEFuaW1hdGlv blNjYWxlKTsKICAgICAqbV90cmFuc2Zvcm1hdGlvbk1hdHJpeCA9IHpvb207CiAgICAgLy8gRklY TUU6IERvIHdlIHJlYWxseSBuZWVkIHRvIHN1c3BlbmQvcmVzdW1lIGJvdGggYmFja2luZ3N0b3Jl IGFuZCBzY3JlZW4gaGVyZT8KICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+c3VzcGVuZEJhY2tpbmdT dG9yZVVwZGF0ZXMoKTsKQEAgLTMwMTUsNyArMzAxMyw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 Onpvb21CbG9jaygpCiAgICAgYm9vbCBjb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZSA9 IHRydWU7CiAgICAgaWYgKG1haW5GcmFtZVZpZXcpIHsKICAgICAgICAgY29uc3RyYWluc1Njcm9s bGluZ1RvQ29udGVudEVkZ2UgPSBtYWluRnJhbWVWaWV3LT5jb25zdHJhaW5zU2Nyb2xsaW5nVG9D b250ZW50RWRnZSgpOwotICAgICAgICBtYWluRnJhbWVWaWV3LT5zZXRDb25zdHJhaW5zU2Nyb2xs aW5nVG9Db250ZW50RWRnZShtX3Nob3VsZENvbnN0cmFpblNjcm9sbGluZ1RvQ29udGVudEVkZ2Up OworICAgICAgICBtYWluRnJhbWVWaWV3LT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50 RWRnZShzaG91bGRDb25zdHJhaW5TY3JvbGxpbmdUb0NvbnRlbnRFZGdlKTsKICAgICB9CiAKICNp ZiBFTkFCTEUoVklFV1BPUlRfUkVGTE9XKQpAQCAtMzA4MSw5ICszMDc5LDkgQEAgdm9pZCBXZWJQ YWdlUHJpdmF0ZTo6em9vbUJsb2NrKCkKICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+cmVzdW1lU2Ny ZWVuVXBkYXRlcyhCYWNraW5nU3RvcmU6OlJlbmRlckFuZEJsaXQpOwogfQogCi12b2lkIFdlYlBh Z2U6OmJsb2NrWm9vbUFuaW1hdGlvbkZpbmlzaGVkKCkKK3ZvaWQgV2ViUGFnZTo6em9vbUFuaW1h dGlvbkZpbmlzaGVkKGRvdWJsZSBmaW5hbFNjYWxlLCBjb25zdCBQbGF0Zm9ybTo6RmxvYXRQb2lu dCYgZmluYWxEb2N1bWVudFNjcm9sbFBvc2l0aW9uLCBib29sIHNob3VsZENvbnN0cmFpblNjcm9s bGluZ1RvQ29udGVudEVkZ2UpCiB7Ci0gICAgZC0+em9vbUJsb2NrKCk7CisgICAgZC0+em9vbUFu aW1hdGlvbkZpbmlzaGVkKGZpbmFsU2NhbGUsIGZpbmFsRG9jdW1lbnRTY3JvbGxQb3NpdGlvbiwg c2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9Db250ZW50RWRnZSk7CiB9CiAKIHZvaWQgV2ViUGFn ZTo6cmVzZXRCbG9ja1pvb20oKQpAQCAtMzA5Niw3ICszMDk0LDYgQEAgdm9pZCBXZWJQYWdlUHJp dmF0ZTo6cmVzZXRCbG9ja1pvb20oKQogICAgIG1fY3VycmVudEJsb2NrWm9vbU5vZGUgPSAwOwog ICAgIG1fY3VycmVudEJsb2NrWm9vbUFkanVzdGVkTm9kZSA9IDA7CiAgICAgbV9zaG91bGRSZWZs b3dCbG9jayA9IGZhbHNlOwotICAgIG1fc2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9Db250ZW50 RWRnZSA9IHRydWU7CiB9CiAKIHZvaWQgV2ViUGFnZTo6ZGVzdHJveVdlYlBhZ2VDb21wb3NpdG9y KCkKQEAgLTQ3MjUsMTggKzQ3MjIsMjAgQEAgYm9vbCBXZWJQYWdlOjpibG9ja1pvb20oY29uc3Qg UGxhdGZvcm06OkludFBvaW50JiBkb2N1bWVudFRhcmdldFBvaW50KQogICAgIH0gZWxzZQogICAg ICAgICBhbmNob3IgPSByZW5kZXJlci0+c3R5bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigp ID8gdG9wTGVmdFBvaW50IDogRmxvYXRQb2ludChub2RlUmVjdC54KCkgKyBub2RlUmVjdC53aWR0 aCgpIC0gc2NhbGVkVmlld3BvcnRXaWR0aCwgdG9wTGVmdFBvaW50LnkoKSk7CiAKKyAgICBXZWJD b3JlOjpGbG9hdFBvaW50IGZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbjsKKwog ICAgIGlmIChuZXdCbG9ja0hlaWdodCA8PSBzY2FsZWRWaWV3cG9ydEhlaWdodCkgewogICAgICAg ICAvLyBUaGUgYmxvY2sgZml0cyBpbiB0aGUgdmlld3BvcnQgc28gY2VudGVyIGl0LgotICAgICAg ICBkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbiA9IEZsb2F0UG9pbnQo YW5jaG9yLngoKSAtIGR4LCBhbmNob3IueSgpIC0gZHkpOworICAgICAgICBmaW5hbEFuaW1hdGlv bkRvY3VtZW50U2Nyb2xsUG9zaXRpb24gPSBGbG9hdFBvaW50KGFuY2hvci54KCkgLSBkeCwgYW5j aG9yLnkoKSAtIGR5KTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBUaGUgYmxvY2sgaXMgbG9u Z2VyIHRoYW4gdGhlIHZpZXdwb3J0IHNvIHRvcCBhbGlnbiBpdCBhbmQgYWRkIDMgcGl4ZWwgbWFy Z2luLgotICAgICAgICBkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbiA9 IEZsb2F0UG9pbnQoYW5jaG9yLngoKSAtIGR4LCBhbmNob3IueSgpIC0gMyk7CisgICAgICAgIGZp bmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbiA9IEZsb2F0UG9pbnQoYW5jaG9yLngo KSAtIGR4LCBhbmNob3IueSgpIC0gMyk7CiAgICAgfQogCiAjaWYgRU5BQkxFKFZJRVdQT1JUX1JF RkxPVykKICAgICAvLyBXZSBkb24ndCBrbm93IGhvdyBsb25nIHRoZSByZWZsb3dlZCBibG9jayB3 aWxsIGJlIHNvIHdlIHBvc2l0aW9uIGl0IGF0IHRoZSB0b3Agb2YgdGhlIHNjcmVlbiB3aXRoIGEg c21hbGwgbWFyZ2luLgogICAgIGlmIChzZXR0aW5ncygpLT50ZXh0UmVmbG93TW9kZSgpICE9IFdl YlNldHRpbmdzOjpUZXh0UmVmbG93RGlzYWJsZWQpIHsKLSAgICAgICAgZC0+bV9maW5hbEFuaW1h dGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24gPSBGbG9hdFBvaW50KGFuY2hvci54KCkgLSBkeCwg YW5jaG9yLnkoKSAtIDMpOworICAgICAgICBmaW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9z aXRpb24gPSBGbG9hdFBvaW50KGFuY2hvci54KCkgLSBkeCwgYW5jaG9yLnkoKSAtIDMpOwogICAg ICAgICBkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlZmxvd09mZnNl dCA9IEZsb2F0UG9pbnQoLWR4LCAtMyk7CiAgICAgfQogI2VuZGlmCkBAIC00NzQ1LDI0ICs0NzQ0 LDI0IEBAIGJvb2wgV2ViUGFnZTo6YmxvY2tab29tKGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYg ZG9jdW1lbnRUYXJnZXRQb2ludCkKICAgICAvLyBub3QgYmUgdGhlIHNhbWUgYXMgdGhlIG9yaWdp bmFsIG5vZGUgcmVjdCwgYW5kIGl0IGNvdWxkIGZvcmNlIHRoZSBvcmlnaW5hbCBub2RlIHJlY3Qg b2ZmIHRoZSBzY3JlZW4uCiAgICAgRmxvYXRSZWN0IGJyKGFuY2hvciwgRmxvYXRTaXplKHNjYWxl ZFZpZXdwb3J0V2lkdGgsIHNjYWxlZFZpZXdwb3J0SGVpZ2h0KSk7CiAgICAgaWYgKCFici5jb250 YWlucyhJbnRQb2ludChkb2N1bWVudFRhcmdldFBvaW50KSkpIHsKLSAgICAgICAgZC0+bV9maW5h bEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWZsb3dPZmZzZXQubW92ZSgwLCAoZG9j dW1lbnRUYXJnZXRQb2ludC55KCkgLSBzY2FsZWRWaWV3cG9ydEhlaWdodCAvIDIpIC0gZC0+bV9m aW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24ueSgpKTsKLSAgICAgICAgZC0+bV9m aW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24gPSBGbG9hdFBvaW50KGQtPm1fZmlu YWxBbmltYXRpb25Eb2N1bWVudFNjcm9sbFBvc2l0aW9uLngoKSwgZG9jdW1lbnRUYXJnZXRQb2lu dC55KCkgLSBzY2FsZWRWaWV3cG9ydEhlaWdodCAvIDIpOworICAgICAgICBkLT5tX2ZpbmFsQW5p bWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlZmxvd09mZnNldC5tb3ZlKDAsIChkb2N1bWVu dFRhcmdldFBvaW50LnkoKSAtIHNjYWxlZFZpZXdwb3J0SGVpZ2h0IC8gMikgLSBmaW5hbEFuaW1h dGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24ueSgpKTsKKyAgICAgICAgZmluYWxBbmltYXRpb25E b2N1bWVudFNjcm9sbFBvc2l0aW9uID0gRmxvYXRQb2ludChmaW5hbEFuaW1hdGlvbkRvY3VtZW50 U2Nyb2xsUG9zaXRpb24ueCgpLCBkb2N1bWVudFRhcmdldFBvaW50LnkoKSAtIHNjYWxlZFZpZXdw b3J0SGVpZ2h0IC8gMik7CiAgICAgfQogCiAgICAgLy8gQ2xhbXAgdGhlIGZpbmFsQmxvY2tQb2lu dCB0byBub3QgY2F1c2UgYW55IG92ZXJmbG93IHNjcm9sbGluZy4KLSAgICBpZiAoZC0+bV9maW5h bEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24ueCgpIDwgMCkgewotICAgICAgICBkLT5t X2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbi5zZXRYKDApOworICAgIGlmIChm aW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24ueCgpIDwgMCkgeworICAgICAgICBm aW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24uc2V0WCgwKTsKICAgICAgICAgZC0+ bV9maW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWZsb3dPZmZzZXQuc2V0WCgw KTsKLSAgICB9IGVsc2UgaWYgKGQtPm1fZmluYWxBbmltYXRpb25Eb2N1bWVudFNjcm9sbFBvc2l0 aW9uLngoKSArIHNjYWxlZFZpZXdwb3J0V2lkdGggPiBkLT5jb250ZW50c1NpemUoKS53aWR0aCgp KSB7Ci0gICAgICAgIGQtPm1fZmluYWxBbmltYXRpb25Eb2N1bWVudFNjcm9sbFBvc2l0aW9uLnNl dFgoZC0+Y29udGVudHNTaXplKCkud2lkdGgoKSAtIHNjYWxlZFZpZXdwb3J0V2lkdGgpOworICAg IH0gZWxzZSBpZiAoZmluYWxBbmltYXRpb25Eb2N1bWVudFNjcm9sbFBvc2l0aW9uLngoKSArIHNj YWxlZFZpZXdwb3J0V2lkdGggPiBkLT5jb250ZW50c1NpemUoKS53aWR0aCgpKSB7CisgICAgICAg IGZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbi5zZXRYKGQtPmNvbnRlbnRzU2l6 ZSgpLndpZHRoKCkgLSBzY2FsZWRWaWV3cG9ydFdpZHRoKTsKICAgICAgICAgZC0+bV9maW5hbEFu aW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWZsb3dPZmZzZXQuc2V0WCgwKTsKICAgICB9 CiAKLSAgICBpZiAoZC0+bV9maW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24ueSgp IDwgMCkgewotICAgICAgICBkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlv bi5zZXRZKDApOworICAgIGlmIChmaW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24u eSgpIDwgMCkgeworICAgICAgICBmaW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24u c2V0WSgwKTsKICAgICAgICAgZC0+bV9maW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRp b25SZWZsb3dPZmZzZXQuc2V0WSgwKTsKLSAgICB9IGVsc2UgaWYgKGQtPm1fZmluYWxBbmltYXRp b25Eb2N1bWVudFNjcm9sbFBvc2l0aW9uLnkoKSArIHNjYWxlZFZpZXdwb3J0SGVpZ2h0ID4gZC0+ Y29udGVudHNTaXplKCkuaGVpZ2h0KCkpIHsKLSAgICAgICAgZC0+bV9maW5hbEFuaW1hdGlvbkRv Y3VtZW50U2Nyb2xsUG9zaXRpb24uc2V0WShkLT5jb250ZW50c1NpemUoKS5oZWlnaHQoKSAtIHNj YWxlZFZpZXdwb3J0SGVpZ2h0KTsKKyAgICB9IGVsc2UgaWYgKGZpbmFsQW5pbWF0aW9uRG9jdW1l bnRTY3JvbGxQb3NpdGlvbi55KCkgKyBzY2FsZWRWaWV3cG9ydEhlaWdodCA+IGQtPmNvbnRlbnRz U2l6ZSgpLmhlaWdodCgpKSB7CisgICAgICAgIGZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQ b3NpdGlvbi5zZXRZKGQtPmNvbnRlbnRzU2l6ZSgpLmhlaWdodCgpIC0gc2NhbGVkVmlld3BvcnRI ZWlnaHQpOwogICAgICAgICBkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlv blJlZmxvd09mZnNldC5zZXRZKDApOwogICAgIH0KIApAQCAtNDc3MSw3ICs0NzcwLDcgQEAgYm9v bCBXZWJQYWdlOjpibG9ja1pvb20oY29uc3QgUGxhdGZvcm06OkludFBvaW50JiBkb2N1bWVudFRh cmdldFBvaW50KQogICAgIC8vIHRoYXQgdGhlIHpvb20gbGV2ZWwgaXMgdGhlIG1pbmltdW1TY2Fs ZS4KICAgICBpZiAoIWVuZE9mQmxvY2tab29tTW9kZSAmJiBhYnMobmV3U2NhbGUgLSBvbGRTY2Fs ZSkgLyBvbGRTY2FsZSA8IG1pbmltdW1FeHBhbmRpbmdSYXRpbykgewogICAgICAgICBjb25zdCBk b3VibGUgbWluaW11bURpc3BsYWNlbWVudCA9IG1pbmltdW1FeHBhbmRpbmdSYXRpbyAqIHdlYmtp dFRocmVhZFZpZXdwb3J0QWNjZXNzb3IoKS0+ZG9jdW1lbnRWaWV3cG9ydFNpemUoKS53aWR0aCgp OwotICAgICAgICBpZiAob2xkU2NhbGUgPT0gZC0+bWluaW11bVNjYWxlKCkgfHwgKGRpc3RhbmNl QmV0d2VlblBvaW50cyhkLT5zY3JvbGxQb3NpdGlvbigpLCByb3VuZFVudHJhbnNmb3JtZWRQb2lu dChkLT5tX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbikpIDwgbWluaW11bURp c3BsYWNlbWVudCAmJiBhYnMobmV3U2NhbGUgLSBvbGRTY2FsZSkgLyBvbGRTY2FsZSA8IDAuMTAp KSB7CisgICAgICAgIGlmIChvbGRTY2FsZSA9PSBkLT5taW5pbXVtU2NhbGUoKSB8fCAoZGlzdGFu Y2VCZXR3ZWVuUG9pbnRzKGQtPnNjcm9sbFBvc2l0aW9uKCksIHJvdW5kVW50cmFuc2Zvcm1lZFBv aW50KGZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQb3NpdGlvbikpIDwgbWluaW11bURpc3Bs YWNlbWVudCAmJiBhYnMobmV3U2NhbGUgLSBvbGRTY2FsZSkgLyBvbGRTY2FsZSA8IDAuMTApKSB7 CiAgICAgICAgICAgICBpZiAoaXNGaXJzdFpvb20pIHsKICAgICAgICAgICAgICAgICBkLT5yZXNl dEJsb2NrWm9vbSgpOwogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTQ3ODIsMTIg KzQ3ODEsMTAgQEAgYm9vbCBXZWJQYWdlOjpibG9ja1pvb20oY29uc3QgUGxhdGZvcm06OkludFBv aW50JiBkb2N1bWVudFRhcmdldFBvaW50KQogICAgICAgICB9CiAgICAgfQogCi0gICAgZC0+bV9m aW5hbEFuaW1hdGlvblNjYWxlID0gbmV3U2NhbGU7Ci0KICAgICAvLyBXZSBzZXQgdGhpcyBoZXJl IHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCB0cnkgdG8gcmUtcmVuZGVyIHRoZSBwYWdlIGF0IGEgZGlm ZmVyZW50IHpvb20gbGV2ZWwgZHVyaW5nIGxvYWRpbmcuCiAgICAgZC0+bV91c2VyUGVyZm9ybWVk TWFudWFsWm9vbSA9IHRydWU7CiAgICAgZC0+bV91c2VyUGVyZm9ybWVkTWFudWFsU2Nyb2xsID0g dHJ1ZTsKLSAgICBkLT5tX2NsaWVudC0+YW5pbWF0ZUJsb2NrWm9vbShkLT5tX2ZpbmFsQW5pbWF0 aW9uU2NhbGUsIGQtPm1fZmluYWxBbmltYXRpb25Eb2N1bWVudFNjcm9sbFBvc2l0aW9uKTsKKyAg ICBkLT5tX2NsaWVudC0+YW5pbWF0ZVRvU2NhbGVBbmREb2N1bWVudFNjcm9sbFBvc2l0aW9uKG5l d1NjYWxlLCBmaW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24sIHRydWUpOwogCiAg ICAgcmV0dXJuIHRydWU7CiB9CkBAIC02NDE3LDEzICs2NDE0LDEwIEBAIHZvaWQgV2ViUGFnZVBy aXZhdGU6OmFuaW1hdGVUb1NjYWxlQW5kRG9jdW1lbnRTY3JvbGxQb3NpdGlvbihkb3VibGUgZGVz dGluYXRpb25aCiAgICAgaWYgKGRlc3RpbmF0aW9uU2Nyb2xsUG9zaXRpb24gPT0gc2Nyb2xsUG9z aXRpb24oKSAmJiBkZXN0aW5hdGlvblpvb21TY2FsZSA9PSBjdXJyZW50U2NhbGUoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgbV9maW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb24g PSBkZXN0aW5hdGlvblNjcm9sbFBvc2l0aW9uOwotICAgIG1fZmluYWxBbmltYXRpb25TY2FsZSA9 IGRlc3RpbmF0aW9uWm9vbVNjYWxlOwogICAgIG1fc2hvdWxkUmVmbG93QmxvY2sgPSBmYWxzZTsK ICAgICBtX3VzZXJQZXJmb3JtZWRNYW51YWxab29tID0gdHJ1ZTsKICAgICBtX3VzZXJQZXJmb3Jt ZWRNYW51YWxTY3JvbGwgPSB0cnVlOwotICAgIG1fc2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9D b250ZW50RWRnZSA9IHNob3VsZENvbnN0cmFpblNjcm9sbGluZ1RvQ29udGVudEVkZ2U7Ci0gICAg Y2xpZW50KCktPmFuaW1hdGVCbG9ja1pvb20oZGVzdGluYXRpb25ab29tU2NhbGUsIGRlc3RpbmF0 aW9uU2Nyb2xsUG9zaXRpb24pOworICAgIGNsaWVudCgpLT5hbmltYXRlVG9TY2FsZUFuZERvY3Vt ZW50U2Nyb2xsUG9zaXRpb24oZGVzdGluYXRpb25ab29tU2NhbGUsIGRlc3RpbmF0aW9uU2Nyb2xs UG9zaXRpb24sIHNob3VsZENvbnN0cmFpblNjcm9sbGluZ1RvQ29udGVudEVkZ2UpOwogfQogCiB2 b2lkIFdlYlBhZ2U6OmFuaW1hdGVUb1NjYWxlQW5kRG9jdW1lbnRTY3JvbGxQb3NpdGlvbihkb3Vi bGUgZGVzdGluYXRpb25ab29tU2NhbGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpGbG9h dFBvaW50JiBkZXN0aW5hdGlvblNjcm9sbFBvc2l0aW9uLCBib29sIHNob3VsZENvbnN0cmFpblNj cm9sbGluZ1RvQ29udGVudEVkZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5o CmluZGV4IGZjY2VhM2ZkM2EzZjFiMWI3YTIyODhiNGEyMGQxY2VhMDU1NzQ3MTMuLjRiZDAxNTE4 NjJlZGQ3YjFhZjM3ZGM2MjhhNWQyNDYyODQ3MTY3YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5oCkBAIC0xOTAsNyArMTkwLDcgQEAgcHVibGljOgogICAgIEluUmVnaW9u U2Nyb2xsZXIqIGluUmVnaW9uU2Nyb2xsZXIoKSBjb25zdDsKIAogICAgIGJvb2wgYmxvY2tab29t KGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgZG9jdW1lbnRUYXJnZXRQb2ludCk7Ci0gICAgdm9p ZCBibG9ja1pvb21BbmltYXRpb25GaW5pc2hlZCgpOworICAgIHZvaWQgem9vbUFuaW1hdGlvbkZp bmlzaGVkKGRvdWJsZSBmaW5hbFNjYWxlLCBjb25zdCBQbGF0Zm9ybTo6RmxvYXRQb2ludCYgZmlu YWxEb2N1bWVudFNjcm9sbFBvc2l0aW9uLCBib29sIHNob3VsZENvbnN0cmFpblNjcm9sbGluZ1Rv Q29udGVudEVkZ2UpOwogICAgIHZvaWQgcmVzZXRCbG9ja1pvb20oKTsKICAgICBib29sIGlzQXRJ bml0aWFsWm9vbSgpIGNvbnN0OwogICAgIGJvb2wgaXNNYXhab29tZWQoKSBjb25zdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKaW5kZXggMzYyZjRkMDJl ZThiZTk2NzQ2N2VjNzYzNjZkNTYzZTJhOWRkNGUxZC4uZTY2Mzk3M2FhNDQxNmQ1YmE1N2RiZTVl YTE2Yjc0YTIwMGIyYzgxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ2xpZW50LmgKQEAgLTIwMiw3ICsyMDIsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpWaWV3cG9ydEFjY2Vzc29yKiB1c2VySW50ZXJmYWNlVmlld3Bv cnRBY2Nlc3NvcigpIGNvbnN0ID0gMDsKIAotICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlQmxvY2ta b29tKGRvdWJsZSBmaW5hbFNjYWxlLCBjb25zdCBQbGF0Zm9ybTo6RmxvYXRQb2ludCYgZmluYWxE b2N1bWVudFNjcm9sbFBvc2l0aW9uKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGFuaW1hdGVUb1Nj YWxlQW5kRG9jdW1lbnRTY3JvbGxQb3NpdGlvbihkb3VibGUgZmluYWxTY2FsZSwgY29uc3QgUGxh dGZvcm06OkZsb2F0UG9pbnQmIGZpbmFsRG9jdW1lbnRTY3JvbGxQb3NpdGlvbiwgYm9vbCBzaG91 bGRDb25zdHJhaW5TY3JvbGxpbmdUb0NvbnRlbnRFZGdlKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZv aWQgc2V0UHJldmVudHNTY3JlZW5JZGxlRGltbWluZyhib29sIG5vRGltbWluZykgPSAwOwogICAg IHZpcnR1YWwgYm9vbCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZShjb25zdCB1bnNpZ25lZCBzaG9y dCogcmVhbG0sIHVuc2lnbmVkIGludCByZWFsbUxlbmd0aCwgQmxhY2tCZXJyeTo6UGxhdGZvcm06 OlN0cmluZyYgdXNlcm5hbWUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHBhc3N3b3Jk LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXF1ZXN0VVJMLCBib29sIGlzUHJveHkp ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGZjZjkz YTkzYmY2OWU4MjYyYjIzZjFjODRjZTNiZGY0OGJjNDg2MWMuLjQwNjM2NTUzODZmMTljZWQyOTQ5 NjgxZWI2ZTNkNmUzM2NkOTg2ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlX3AuaApAQCAtMTQ1LDggKzE0NSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVzdG9yZUhp c3RvcnlWaWV3U3RhdGUoUGxhdGZvcm06OkludFNpemUgY29udGVudHNTaXplLCBQbGF0Zm9ybTo6 SW50UG9pbnQgc2Nyb2xsUG9zaXRpb24sIGRvdWJsZSBzY2FsZSwgYm9vbCBzaG91bGRSZWZsb3dC bG9jayk7CiAKLSAgICAvLyBQZXJmb3JtIGFjdHVhbCB6b29tIGZvciBibG9jayB6b29tLgotICAg IHZvaWQgem9vbUJsb2NrKCk7CisgICAgLy8gUGVyZm9ybSBhY3R1YWwgem9vbSBmb3IgYWZ0ZXIg em9vbSBhbmltYXRpb24uCisgICAgdm9pZCB6b29tQW5pbWF0aW9uRmluaXNoZWQoZG91YmxlIGZp bmFsU2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGZpbmFsRG9jdW1lbnRTY3JvbGxQ b3NpdGlvbiwgYm9vbCBzaG91bGRDb25zdHJhaW5TY3JvbGxpbmdUb0NvbnRlbnRFZGdlKTsKIAog ICAgIC8vIENhbGxlZCBieSB0aGUgYmFja2luZyBzdG9yZSBhcyB3ZWxsIGFzIHRoZSBtZXRob2Qg YmVsb3cuCiAgICAgdm9pZCByZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKSBjb25zdDsKQEAgLTU0OSwx NSArNTQ5LDEyIEBAIHB1YmxpYzoKICAgICBib29sIG1fZm9yY2VSZXNwZWN0Vmlld3BvcnRBcmd1 bWVudHM7CiAKICAgICAvLyBCbG9jayB6b29tICYgem9vbS9zY3JvbGwgYW5pbWF0aW9uIGRhdGEu Ci0gICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX2ZpbmFsQW5pbWF0aW9uRG9jdW1lbnRTY3JvbGxQ b3NpdGlvbjsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IG1fZmluYWxBbmltYXRpb25Eb2N1bWVu dFNjcm9sbFBvc2l0aW9uUmVmbG93T2Zmc2V0OwotICAgIGRvdWJsZSBtX2ZpbmFsQW5pbWF0aW9u U2NhbGU7CiAgICAgUmVmUHRyPFdlYkNvcmU6Ok5vZGU+IG1fY3VycmVudFBpbmNoWm9vbU5vZGU7 CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX2FuY2hvckluTm9kZVJlY3RSYXRpbzsKICAgICBS ZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9jdXJyZW50QmxvY2tab29tTm9kZTsKICAgICBSZWZQdHI8 V2ViQ29yZTo6Tm9kZT4gbV9jdXJyZW50QmxvY2tab29tQWRqdXN0ZWROb2RlOwogICAgIGJvb2wg bV9zaG91bGRSZWZsb3dCbG9jazsKLSAgICBib29sIG1fc2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5n VG9Db250ZW50RWRnZTsKIAogICAgIGRvdWJsZSBtX2xhc3RVc2VyRXZlbnRUaW1lc3RhbXA7IC8v IFVzZWQgdG8gZGV0ZWN0IHVzZXIgc2Nyb2xsaW5nLgogCg==