132225 2014-04-26 23:57:49 -0700 WebKit2 View Gestures (Zoom): Pages with 'background-attachment: fixed' don't behave correctly when zoomed 2014-04-27 13:43:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 1004378 0 thorton 2014-04-26 23:57:49 -0700 The RenderView's main GraphicsLayer doesn't apply the page scale if we have composited background-attachment: fixed; its contents containment layer does. We should apply the pinch-zoom scale to that layer if it exists (it only exists in this case). <rdar://problem/15729975> 1004379 1 230254 thorton 2014-04-27 00:01:11 -0700 Created attachment 230254 patch 1004434 2 thorton 2014-04-27 13:43:40 -0700 http://trac.webkit.org/changeset/167860 230254 2014-04-27 00:01:11 -0700 2014-04-27 09:10:56 -0700 patch pinch-fixed.diff text/plain 10487 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4YTU5NGYyLi4zMDRlMzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTQtMDQtMjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgV2ViS2l0MiBWaWV3IEdlc3R1cmVzIChab29tKTogUGFnZXMgd2l0aCAnYmFja2dy b3VuZC1hdHRhY2htZW50OiBmaXhlZCcgZG9uJ3QgYmVoYXZlIGNvcnJlY3RseSB3aGVuIHpvb21l ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMjI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTcyOTk3NT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0 OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6bGF5ZXJGb3JUcmFuc2llbnRab29tKToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNoYWRvd0xh eWVyRm9yVHJhbnNpZW50Wm9vbSk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjphZGp1c3RUcmFuc2llbnRab29tKToKKyAgICAgICAgKFdlYktpdDo6VGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20pOgorICAgICAg ICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YXBwbHlUcmFuc2llbnRa b29tVG9QYWdlKToKKyAgICAgICAgRmFjdG9yIG91dCBjb2RlIHRvIGNob29zZSB3aGljaCBsYXll ciAoYW5kIHNoYWRvdyBsYXllcikgdG8gYXBwbHkgdGhlIHRyYW5zaWVudCB6b29tIHRvLgorICAg ICAgICBJZiB3ZSBoYXZlIGEgY29udGVudHNDb250YWlubWVudExheWVyIChiZWNhdXNlIHdlIGhh dmUgY29tcG9zaXRlZCBiYWNrZ3JvdW5kLWF0dGFjaG1lbnQ6IGZpeGVkKSwKKyAgICAgICAgaXQg YXBwbGllcyBwYWdlIHNjYWxlLCBzbyB3ZSBzaG91bGQgYXBwbHkgdGhlIHRyYW5zaWVudCB6b29t IHRvIHRoYXQgbGF5ZXIKKyAgICAgICAgaW5zdGVhZCBvZiB0aGUgUmVuZGVyVmlldydzIG1haW4g R3JhcGhpY3NMYXllci4KKworMjAxNC0wNC0yNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KKwogICAgICAgICBSRUdSRVNTSU9OIChyMTY3Nzc1KTogU2FmYXJpIGNyYXNo ZXMgaW4gVmlld1NuYXBzaG90U3RvcmU6OnBydW5lU25hcHNob3RzIGFmdGVyIGxvYWRpbmcgMjAg cGFnZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MjIwNAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY3MzU2MjI+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKaW5kZXggZTNkNjE5Zi4uYTUxMmEzZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaApAQCAtNDEsNiArNDEsNyBAQCBPQkpD X0NMQVNTIENBTGF5ZXI7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZyYW1lVmlldzsK K2NsYXNzIFBsYXRmb3JtQ0FMYXllcjsKIGNsYXNzIFRpbGVkQmFja2luZzsKIH0KIApAQCAtOTQs NiArOTUsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RUcmFuc2llbnRab29t KGRvdWJsZSBzY2FsZSwgV2ViQ29yZTo6RmxvYXRQb2ludCBvcmlnaW4pIG92ZXJyaWRlOwogICAg IHZpcnR1YWwgdm9pZCBjb21taXRUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgV2ViQ29yZTo6 RmxvYXRQb2ludCBvcmlnaW4pIG92ZXJyaWRlOwogICAgIHZvaWQgYXBwbHlUcmFuc2llbnRab29t VG9QYWdlKGRvdWJsZSBzY2FsZSwgV2ViQ29yZTo6RmxvYXRQb2ludCBvcmlnaW4pOworICAgIFdl YkNvcmU6OlBsYXRmb3JtQ0FMYXllciogbGF5ZXJGb3JUcmFuc2llbnRab29tKCkgY29uc3Q7Cisg ICAgV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyKiBzaGFkb3dMYXllckZvclRyYW5zaWVudFpvb20o KSBjb25zdDsKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXggcm9v dExheWVyVHJhbnNmb3JtKCkgY29uc3Qgb3ZlcnJpZGUgeyAgcmV0dXJuIG1fdHJhbnNmb3JtOyB9 CiAgICAgdmlydHVhbCB2b2lkIHNldFJvb3RMYXllclRyYW5zZm9ybShjb25zdCBXZWJDb3JlOjpU cmFuc2Zvcm1hdGlvbk1hdHJpeCYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggZDcyMThkYi4uMzhiMTljZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC00ODYsNiArNDg2LDI2IEBAIGJvb2wg VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNob3VsZFVzZVRpbGVkQmFja2luZ0ZvckZy YW1lVmlldyhjb25zdCBGcmFtCiAgICAgcmV0dXJuIGZyYW1lVmlldyAmJiBmcmFtZVZpZXctPmZy YW1lKCkuaXNNYWluRnJhbWUoKTsKIH0KIAorUGxhdGZvcm1DQUxheWVyKiBUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYTo6bGF5ZXJGb3JUcmFuc2llbnRab29tKCkgY29uc3QKK3sKKyAgICBS ZW5kZXJMYXllckJhY2tpbmcqIHJlbmRlclZpZXdCYWNraW5nID0gbV93ZWJQYWdlLT5tYWluRnJh bWVWaWV3KCktPnJlbmRlclZpZXcoKS0+bGF5ZXIoKS0+YmFja2luZygpOworCisgICAgaWYgKEdy YXBoaWNzTGF5ZXIqIGNvbnRlbnRzQ29udGFpbm1lbnRMYXllciA9IHJlbmRlclZpZXdCYWNraW5n LT5jb250ZW50c0NvbnRhaW5tZW50TGF5ZXIoKSkKKyAgICAgICAgcmV0dXJuIHRvR3JhcGhpY3NM YXllckNBKGNvbnRlbnRzQ29udGFpbm1lbnRMYXllciktPnBsYXRmb3JtQ0FMYXllcigpOworCisg ICAgcmV0dXJuIHRvR3JhcGhpY3NMYXllckNBKHJlbmRlclZpZXdCYWNraW5nLT5ncmFwaGljc0xh eWVyKCkpLT5wbGF0Zm9ybUNBTGF5ZXIoKTsKK30KKworUGxhdGZvcm1DQUxheWVyKiBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2hhZG93TGF5ZXJGb3JUcmFuc2llbnRab29tKCkgY29u c3QKK3sKKyAgICBSZW5kZXJMYXllckNvbXBvc2l0b3ImIHJlbmRlckxheWVyQ29tcG9zaXRvciA9 IG1fd2ViUGFnZS0+bWFpbkZyYW1lVmlldygpLT5yZW5kZXJWaWV3KCktPmNvbXBvc2l0b3IoKTsK KworICAgIGlmIChHcmFwaGljc0xheWVyKiBzaGFkb3dHcmFwaGljc0xheWVyID0gcmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmxheWVyRm9yQ29udGVudFNoYWRvdygpKQorICAgICAgICByZXR1cm4gdG9H cmFwaGljc0xheWVyQ0Eoc2hhZG93R3JhcGhpY3NMYXllciktPnBsYXRmb3JtQ0FMYXllcigpOwor CisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2lu Z0FyZWE6OmFkanVzdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxlLCBGbG9hdFBvaW50IG9yaWdp bikKIHsKICAgICAvLyBGSVhNRTogU2Nyb2xsYmFycyBzaG91bGQgc3RheSBpbi1wbGFjZSBhbmQg Y2hhbmdlIGhlaWdodCB3aGlsZSB6b29taW5nLgpAQCAtNDk5LDE2ICs1MTksMTMgQEAgdm9pZCBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0VHJhbnNpZW50Wm9vbShkb3VibGUg c2NhbGUsIEZsb2F0UG9pbnQKICAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKG9yaWdpbi54KCksIG9y aWdpbi55KCkpOwogICAgIHRyYW5zZm9ybS5zY2FsZShzY2FsZSk7CiAKLSAgICBSZW5kZXJWaWV3 KiByZW5kZXJWaWV3ID0gbV93ZWJQYWdlLT5tYWluRnJhbWVWaWV3KCktPnJlbmRlclZpZXcoKTsK LSAgICBQbGF0Zm9ybUNBTGF5ZXIqIHJlbmRlclZpZXdMYXllciA9IHRvR3JhcGhpY3NMYXllckNB KHJlbmRlclZpZXctPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpKS0+cGxhdGZv cm1DQUxheWVyKCk7Ci0gICAgcmVuZGVyVmlld0xheWVyLT5zZXRUcmFuc2Zvcm0odHJhbnNmb3Jt KTsKLSAgICByZW5kZXJWaWV3TGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsK LSAgICByZW5kZXJWaWV3TGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQzRCgpKTsKLQotICAg IEdyYXBoaWNzTGF5ZXJDQSogc2hhZG93R3JhcGhpY3NMYXllciA9IHRvR3JhcGhpY3NMYXllckNB KHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS5sYXllckZvckNvbnRlbnRTaGFkb3coKSk7Ci0gICAg aWYgKHNoYWRvd0dyYXBoaWNzTGF5ZXIpIHsKLSAgICAgICAgUGxhdGZvcm1DQUxheWVyKiBzaGFk b3dMYXllciA9IHNoYWRvd0dyYXBoaWNzTGF5ZXItPnBsYXRmb3JtQ0FMYXllcigpOworICAgIFBs YXRmb3JtQ0FMYXllciogem9vbUxheWVyID0gbGF5ZXJGb3JUcmFuc2llbnRab29tKCk7CisgICAg em9vbUxheWVyLT5zZXRUcmFuc2Zvcm0odHJhbnNmb3JtKTsKKyAgICB6b29tTGF5ZXItPnNldEFu Y2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKKyAgICB6b29tTGF5ZXItPnNldFBvc2l0aW9uKEZs b2F0UG9pbnQzRCgpKTsKIAorICAgIGlmIChQbGF0Zm9ybUNBTGF5ZXIqIHNoYWRvd0xheWVyID0g c2hhZG93TGF5ZXJGb3JUcmFuc2llbnRab29tKCkpIHsKKyAgICAgICAgUmVuZGVyVmlldyogcmVu ZGVyVmlldyA9IG1fd2ViUGFnZS0+bWFpbkZyYW1lVmlldygpLT5yZW5kZXJWaWV3KCk7CiAgICAg ICAgIEZsb2F0UmVjdCBzaGFkb3dCb3VuZHMgPSBGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCB0b0Zs b2F0U2l6ZShyZW5kZXJWaWV3LT5sYXlvdXRPdmVyZmxvd1JlY3QoKS5tYXhYTWF4WUNvcm5lcigp KSk7CiAgICAgICAgIHNoYWRvd0JvdW5kcy5zY2FsZShzY2FsZSk7CiAKQEAgLTUzNiwxNSArNTUz LDEzIEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0FCYXNpY0FuaW1hdGlvbj4gdHJhbnNpZW50Wm9vbVNu YXBBbmltYXRpb25Gb3JLZXlQYXRoKFN0cmluZyBrCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpjb21taXRUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludCBv cmlnaW4pCiB7CiAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3dlYlBhZ2UtPm1haW5GcmFt ZVZpZXcoKTsKLSAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gZnJhbWVWaWV3LT5yZW5kZXJW aWV3KCk7Ci0gICAgUGxhdGZvcm1DQUxheWVyKiByZW5kZXJWaWV3TGF5ZXIgPSBzdGF0aWNfY2Fz dDxHcmFwaGljc0xheWVyQ0EqPihyZW5kZXJWaWV3LT5sYXllcigpLT5iYWNraW5nKCktPmdyYXBo aWNzTGF5ZXIoKSktPnBsYXRmb3JtQ0FMYXllcigpOwotCiAgICAgRmxvYXRSZWN0IHZpc2libGVD b250ZW50UmVjdCA9IGZyYW1lVmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkaW5nU2Nyb2xs YmFycygpOwogCiAgICAgRmxvYXRQb2ludCBjb25zdHJhaW5lZE9yaWdpbiA9IHZpc2libGVDb250 ZW50UmVjdC5sb2NhdGlvbigpOwogICAgIGNvbnN0cmFpbmVkT3JpZ2luLm1vdmVCeSgtb3JpZ2lu KTsKIAotICAgIEludFJlY3QgZG9jdW1lbnRSZWN0ID0gZnJhbWVWaWV3LT5yZW5kZXJWaWV3KCkt PnVuc2NhbGVkRG9jdW1lbnRSZWN0KCk7CisgICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IGZy YW1lVmlldy0+cmVuZGVyVmlldygpOworICAgIEludFJlY3QgZG9jdW1lbnRSZWN0ID0gcmVuZGVy Vmlldy0+dW5zY2FsZWREb2N1bWVudFJlY3QoKTsKICAgICBkb2N1bWVudFJlY3Quc2NhbGUoc2Nh bGUpOwogCiAgICAgLy8gU2NhbGluZyBtYXkgaGF2ZSBleHBvc2VkIHRoZSBvdmVyaGFuZyBhcmVh LCBzbyB3ZSBuZWVkIHRvIGNvbnN0cmFpbiB0aGUgZmluYWwKQEAgLTU2OCwyMSArNTgzLDIzIEBA IHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20o ZG91YmxlIHNjYWxlLCBGbG9hdFBvaW50CiAgICAgUmVmUHRyPFBsYXRmb3JtQ0FBbmltYXRpb24+ IHJlbmRlclZpZXdBbmltYXRpb24gPSBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpjcmVhdGUocmVu ZGVyVmlld0FuaW1hdGlvbkNBLmdldCgpKTsKICAgICByZW5kZXJWaWV3QW5pbWF0aW9uLT5zZXRU b1ZhbHVlKHRyYW5zZm9ybSk7CiAKLSAgICBSZXRhaW5QdHI8Q0FMYXllcj4gc2hhZG93TGF5ZXI7 Ci0gICAgaWYgKEdyYXBoaWNzTGF5ZXJDQSogc2hhZG93R3JhcGhpY3NMYXllciA9IHRvR3JhcGhp Y3NMYXllckNBKHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS5sYXllckZvckNvbnRlbnRTaGFkb3co KSkpCi0gICAgICAgIHNoYWRvd0xheWVyID0gc2hhZG93R3JhcGhpY3NMYXllci0+cGxhdGZvcm1D QUxheWVyKCktPnBsYXRmb3JtTGF5ZXIoKTsKKyAgICBSZXRhaW5QdHI8Q0FMYXllcj4gc2hhZG93 Q0FMYXllcjsKKyAgICBpZiAoUGxhdGZvcm1DQUxheWVyKiBzaGFkb3dMYXllciA9IHNoYWRvd0xh eWVyRm9yVHJhbnNpZW50Wm9vbSgpKQorICAgICAgICBzaGFkb3dDQUxheWVyID0gc2hhZG93TGF5 ZXItPnBsYXRmb3JtTGF5ZXIoKTsKKworICAgIFBsYXRmb3JtQ0FMYXllciogem9vbUxheWVyID0g bGF5ZXJGb3JUcmFuc2llbnRab29tKCk7CiAKICAgICBbQ0FUcmFuc2FjdGlvbiBiZWdpbl07CiAg ICAgW0NBVHJhbnNhY3Rpb24gc2V0Q29tcGxldGlvbkJsb2NrOl4odm9pZCkgewotICAgICAgICBy ZW5kZXJWaWV3TGF5ZXItPnJlbW92ZUFuaW1hdGlvbkZvcktleSgidHJhbnNpZW50Wm9vbUNvbW1p dCIpOwotICAgICAgICBpZiAoc2hhZG93TGF5ZXIpCi0gICAgICAgICAgICBbc2hhZG93TGF5ZXIg cmVtb3ZlQWxsQW5pbWF0aW9uc107CisgICAgICAgIHpvb21MYXllci0+cmVtb3ZlQW5pbWF0aW9u Rm9yS2V5KCJ0cmFuc2llbnRab29tQ29tbWl0Iik7CisgICAgICAgIGlmIChzaGFkb3dDQUxheWVy KQorICAgICAgICAgICAgW3NoYWRvd0NBTGF5ZXIgcmVtb3ZlQWxsQW5pbWF0aW9uc107CiAgICAg ICAgIGFwcGx5VHJhbnNpZW50Wm9vbVRvUGFnZShzY2FsZSwgb3JpZ2luKTsKICAgICB9XTsKIAot ICAgIHJlbmRlclZpZXdMYXllci0+YWRkQW5pbWF0aW9uRm9yS2V5KCJ0cmFuc2llbnRab29tQ29t bWl0IiwgcmVuZGVyVmlld0FuaW1hdGlvbi5nZXQoKSk7CisgICAgem9vbUxheWVyLT5hZGRBbmlt YXRpb25Gb3JLZXkoInRyYW5zaWVudFpvb21Db21taXQiLCByZW5kZXJWaWV3QW5pbWF0aW9uLmdl dCgpKTsKIAotICAgIGlmIChzaGFkb3dMYXllcikgeworICAgIGlmIChzaGFkb3dDQUxheWVyKSB7 CiAgICAgICAgIEZsb2F0UmVjdCBzaGFkb3dCb3VuZHMgPSBGbG9hdFJlY3QoRmxvYXRQb2ludCgp LCB0b0Zsb2F0U2l6ZShyZW5kZXJWaWV3LT5sYXlvdXRPdmVyZmxvd1JlY3QoKS5tYXhYTWF4WUNv cm5lcigpKSk7CiAgICAgICAgIHNoYWRvd0JvdW5kcy5zY2FsZShzY2FsZSk7CiAgICAgICAgIFJl dGFpblB0cjxDR1BhdGhSZWY+IHNoYWRvd1BhdGggPSBhZG9wdENGKENHUGF0aENyZWF0ZVdpdGhS ZWN0KHNoYWRvd0JvdW5kcywgTlVMTCkpLmdldCgpOwpAQCAtNTk0LDkgKzYxMSw5IEBAIHZvaWQg VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20oZG91Ymxl IHNjYWxlLCBGbG9hdFBvaW50CiAgICAgICAgIFJldGFpblB0cjxDQUJhc2ljQW5pbWF0aW9uPiBz aGFkb3dQYXRoQW5pbWF0aW9uID0gdHJhbnNpZW50Wm9vbVNuYXBBbmltYXRpb25Gb3JLZXlQYXRo KCJzaGFkb3dQYXRoIik7CiAgICAgICAgIFtzaGFkb3dQYXRoQW5pbWF0aW9uIHNldFRvVmFsdWU6 KGlkKXNoYWRvd1BhdGguZ2V0KCldOwogCi0gICAgICAgIFtzaGFkb3dMYXllciBhZGRBbmltYXRp b246c2hhZG93Qm91bmRzQW5pbWF0aW9uLmdldCgpIGZvcktleTpAInRyYW5zaWVudFpvb21Db21t aXRTaGFkb3dCb3VuZHMiXTsKLSAgICAgICAgW3NoYWRvd0xheWVyIGFkZEFuaW1hdGlvbjpzaGFk b3dQb3NpdGlvbkFuaW1hdGlvbi5nZXQoKSBmb3JLZXk6QCJ0cmFuc2llbnRab29tQ29tbWl0U2hh ZG93UG9zaXRpb24iXTsKLSAgICAgICAgW3NoYWRvd0xheWVyIGFkZEFuaW1hdGlvbjpzaGFkb3dQ YXRoQW5pbWF0aW9uLmdldCgpIGZvcktleTpAInRyYW5zaWVudFpvb21Db21taXRTaGFkb3dQYXRo Il07CisgICAgICAgIFtzaGFkb3dDQUxheWVyIGFkZEFuaW1hdGlvbjpzaGFkb3dCb3VuZHNBbmlt YXRpb24uZ2V0KCkgZm9yS2V5OkAidHJhbnNpZW50Wm9vbUNvbW1pdFNoYWRvd0JvdW5kcyJdOwor ICAgICAgICBbc2hhZG93Q0FMYXllciBhZGRBbmltYXRpb246c2hhZG93UG9zaXRpb25BbmltYXRp b24uZ2V0KCkgZm9yS2V5OkAidHJhbnNpZW50Wm9vbUNvbW1pdFNoYWRvd1Bvc2l0aW9uIl07Cisg ICAgICAgIFtzaGFkb3dDQUxheWVyIGFkZEFuaW1hdGlvbjpzaGFkb3dQYXRoQW5pbWF0aW9uLmdl dCgpIGZvcktleTpAInRyYW5zaWVudFpvb21Db21taXRTaGFkb3dQYXRoIl07CiAgICAgfQogCiAg ICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKQEAgLTYwNCwxOSArNjIxLDE0IEBAIHZvaWQgVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20oZG91YmxlIHNj YWxlLCBGbG9hdFBvaW50CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmFw cGx5VHJhbnNpZW50Wm9vbVRvUGFnZShkb3VibGUgc2NhbGUsIEZsb2F0UG9pbnQgb3JpZ2luKQog ewotICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZVZpZXco KS0+cmVuZGVyVmlldygpOwotICAgIFBsYXRmb3JtQ0FMYXllciogcmVuZGVyVmlld0xheWVyID0g dG9HcmFwaGljc0xheWVyQ0EocmVuZGVyVmlldy0+bGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGlj c0xheWVyKCkpLT5wbGF0Zm9ybUNBTGF5ZXIoKTsKLQotICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4 IGZpbmFsVHJhbnNmb3JtOwotICAgIGZpbmFsVHJhbnNmb3JtLnNjYWxlKHNjYWxlKTsKLQogICAg IC8vIElmIHRoZSBwYWdlIHNjYWxlIGlzIGFscmVhZHkgdGhlIHRhcmdldCBzY2FsZSwgc2V0UGFn ZVNjYWxlRmFjdG9yKCkgd2lsbCBzaG9ydC1jaXJjdWl0CiAgICAgLy8gYW5kIG5vdCBhcHBseSB0 aGUgdHJhbnNmb3JtLCBzbyB3ZSBjYW4ndCBkZXBlbmQgb24gaXQgdG8gZG8gc28uCi0gICAgcmVu ZGVyVmlld0xheWVyLT5zZXRUcmFuc2Zvcm0oZmluYWxUcmFuc2Zvcm0pOworICAgIFRyYW5zZm9y bWF0aW9uTWF0cml4IGZpbmFsVHJhbnNmb3JtOworICAgIGZpbmFsVHJhbnNmb3JtLnNjYWxlKHNj YWxlKTsKKyAgICBsYXllckZvclRyYW5zaWVudFpvb20oKS0+c2V0VHJhbnNmb3JtKGZpbmFsVHJh bnNmb3JtKTsKIAotICAgIEdyYXBoaWNzTGF5ZXJDQSogc2hhZG93R3JhcGhpY3NMYXllciA9IHRv R3JhcGhpY3NMYXllckNBKHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS5sYXllckZvckNvbnRlbnRT aGFkb3coKSk7Ci0gICAgaWYgKHNoYWRvd0dyYXBoaWNzTGF5ZXIpIHsKLSAgICAgICAgUGxhdGZv cm1DQUxheWVyKiBzaGFkb3dMYXllciA9IHNoYWRvd0dyYXBoaWNzTGF5ZXItPnBsYXRmb3JtQ0FM YXllcigpOworICAgIGlmIChQbGF0Zm9ybUNBTGF5ZXIqIHNoYWRvd0xheWVyID0gc2hhZG93TGF5 ZXJGb3JUcmFuc2llbnRab29tKCkpIHsKKyAgICAgICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9 IG1fd2ViUGFnZS0+bWFpbkZyYW1lVmlldygpLT5yZW5kZXJWaWV3KCk7CiAgICAgICAgIEludFJl Y3Qgb3ZlcmZsb3dSZWN0ID0gcmVuZGVyVmlldy0+cGl4ZWxTbmFwcGVkTGF5b3V0T3ZlcmZsb3dS ZWN0KCk7CiAgICAgICAgIHNoYWRvd0xheWVyLT5zZXRCb3VuZHMoSW50UmVjdChJbnRQb2ludCgp LCB0b0ludFNpemUob3ZlcmZsb3dSZWN0Lm1heFhNYXhZQ29ybmVyKCkpKSk7CiAgICAgICAgIHNo YWRvd0xheWVyLT5zZXRQb3NpdGlvbihzaGFkb3dMYXllci0+Ym91bmRzKCkuY2VudGVyKCkpOwo=