86025 2012-05-09 15:37:52 -0700 RTL and vertical text documents do not scroll properly with the new tiled scrolling model 2012-05-09 16:07:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin andersca bdakin eric jamesr tonikitoo webkit.review.bot oldest_to_newest 619923 0 bdakin 2012-05-09 15:37:52 -0700 The new tiles scrolling model does no work well on RTL and vertical text pages. <rdar://problem/11077589> 619935 1 141036 bdakin 2012-05-09 15:46:17 -0700 Created attachment 141036 Patch 619959 2 bdakin 2012-05-09 16:05:42 -0700 Thanks Dan! http://trac.webkit.org/changeset/116570 141036 2012-05-09 15:46:17 -0700 2012-05-09 15:52:52 -0700 Patch for-review.txt text/plain 10716 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjU2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTA1LTA5ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODYwMjUKKyAgICAgICAgUlRMIGFuZCB2ZXJ0aWNhbCB0ZXh0IGRv Y3VtZW50cyBkbyBubyBzY3JvbGwgcHJvcGVybHkgd2l0aCB0aGUgbmV3IAorICAgICAgICB0aWxl ZCBzY3JvbGxpbmcgbW9kZWwKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTEwNzc1ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisgICAgICAgIAorICAgICAgICBNb3N0IG9mIHRoZSBmaXggaGVyZSBpcyBqdXN0IHRv IHRlYWNoIHRoZSBzY3JvbGxpbmcgdHJlZSBhYm91dCB0aGUgCisgICAgICAgIHNjcm9sbCBvcmln aW4uCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld0xheW91dFVw ZGF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNldFNjcm9s bFBhcmFtZXRlcnMpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmg6CisgICAgICAgIChTY3JvbGxQYXJhbWV0ZXJzKToKKyAgICAgICAgKiBwYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdU cmVlTm9kZTo6dXBkYXRlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl Tm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU5vZGU6OnNjcm9sbE9yaWdp bik6CisgICAgICAgIChTY3JvbGxpbmdUcmVlTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWVTdGF0ZTo6c2V0U2Nyb2xsT3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nVHJlZVN0YXRlOjpzY3JvbGxPcmlnaW4pOgorICAgICAgICAoU2Nyb2xsaW5nVHJl ZVN0YXRlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU5vZGVN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlTm9kZU1hYzo6c2Nyb2xsUG9z aXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnNldFNjcm9s bExheWVyUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU5vZGVNYWM6 Om1pbmltdW1TY3JvbGxQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVl Tm9kZU1hYzo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29t cG9zaXRvcjo6ZnJhbWVWaWV3RGlkU2Nyb2xsKToKKworICAgICAgICBUZWFjaGluZyB0aGUgc2Ny b2xsaW5nIHRyZWUgYWJvdXQgdGhlIHNjcm9sbCBvcmlnaW4gcmV2ZWFsZWQgdGhpcyBwcmUtCisg ICAgICAgIGV4aXN0aW5nIGJ1Zy4gbGF5b3V0T3ZlcmZsb3dSZWN0KCkgaXMgbm90IHRoZSByaWdo dCByZWN0IHRvIHVzZSBzaW5jZSAKKyAgICAgICAgaXQgaXMgbm90IHdyaXRpbmctbW9kZSBzYXZ2 eS4gdW5zY2FsZWREb2N1bWVudFJlY3QoKSBpcyB0aGUgcmlnaHQgcmVjdCAKKyAgICAgICAgZm9y IHRoZSB2aWV3J3MgYm91bmRzLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVDb21w b3NpdGVkQm91bmRzKToKKwogMjAxMi0wNS0wOSAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXaGVuIGNyZWF0aW5nIGEgbmV3IHBhZ2UgZHVyaW5nIGEg bmF2aWdhdGlvbiwgcHJpbWUgdGhlIGluaXRpYWwgZG9jdW1lbnQgd2l0aCB0aGUgY29ycmVjdCBy ZWZlcnJlciBwb2xpY3kKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAJKHJldmlzaW9uIDExNjQzOSkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTQ5LDYgKzE0OSw3IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6 OmZyYW1lVmlld0xheW8KICAgICBzY3JvbGxQYXJhbWV0ZXJzLmhvcml6b250YWxTY3JvbGxiYXJN b2RlID0gZnJhbWVWaWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpOwogICAgIHNjcm9sbFBh cmFtZXRlcnMudmVydGljYWxTY3JvbGxiYXJNb2RlID0gZnJhbWVWaWV3LT52ZXJ0aWNhbFNjcm9s bGJhck1vZGUoKTsKIAorICAgIHNjcm9sbFBhcmFtZXRlcnMuc2Nyb2xsT3JpZ2luID0gZnJhbWVW aWV3LT5zY3JvbGxPcmlnaW4oKTsKICAgICBzY3JvbGxQYXJhbWV0ZXJzLnZpZXdwb3J0UmVjdCA9 IEludFJlY3QoSW50UG9pbnQoKSwgZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJlY3QoKS5zaXpl KCkpOwogICAgIHNjcm9sbFBhcmFtZXRlcnMuY29udGVudHNTaXplID0gZnJhbWVWaWV3LT5jb250 ZW50c1NpemUoKTsKIApAQCAtMzYwLDYgKzM2MSw3IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0 b3I6OnNldFNjcm9sbFBhcmEKICAgICBtX3Njcm9sbGluZ1RyZWVTdGF0ZS0+c2V0SG9yaXpvbnRh bFNjcm9sbGJhck1vZGUoc2Nyb2xsUGFyYW1ldGVycy5ob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSk7 CiAgICAgbV9zY3JvbGxpbmdUcmVlU3RhdGUtPnNldFZlcnRpY2FsU2Nyb2xsYmFyTW9kZShzY3Jv bGxQYXJhbWV0ZXJzLnZlcnRpY2FsU2Nyb2xsYmFyTW9kZSk7CiAKKyAgICBtX3Njcm9sbGluZ1Ry ZWVTdGF0ZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbFBhcmFtZXRlcnMuc2Nyb2xsT3JpZ2luKTsK ICAgICBtX3Njcm9sbGluZ1RyZWVTdGF0ZS0+c2V0Vmlld3BvcnRSZWN0KHNjcm9sbFBhcmFtZXRl cnMudmlld3BvcnRSZWN0KTsKICAgICBtX3Njcm9sbGluZ1RyZWVTdGF0ZS0+c2V0Q29udGVudHNT aXplKHNjcm9sbFBhcmFtZXRlcnMuY29udGVudHNTaXplKTsKICAgICBzY2hlZHVsZVRyZWVTdGF0 ZUNvbW1pdCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n Q29vcmRpbmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdDb29yZGluYXRvci5oCShyZXZpc2lvbiAxMTY0MzkpCisrKyBTb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMzUsNiArMTM1LDggQEAgcHJpdmF0ZToKICAgICAgICAgU2Nyb2xsYmFyTW9kZSBob3Jp em9udGFsU2Nyb2xsYmFyTW9kZTsKICAgICAgICAgU2Nyb2xsYmFyTW9kZSB2ZXJ0aWNhbFNjcm9s bGJhck1vZGU7CiAKKyAgICAgICAgSW50UG9pbnQgc2Nyb2xsT3JpZ2luOworCiAgICAgICAgIElu dFJlY3Qgdmlld3BvcnRSZWN0OwogICAgICAgICBJbnRTaXplIGNvbnRlbnRzU2l6ZTsKICAgICB9 OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWVOb2RlLmNwcAkocmV2aXNpb24gMTE2NDM5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Niw2ICs3 Niw5IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZU5vZGU6OnVwZGF0ZShTY3JvbGxpbmcKIAogICAgIGlm IChzdGF0ZS0+Y2hhbmdlZFByb3BlcnRpZXMoKSAmIFNjcm9sbGluZ1RyZWVTdGF0ZTo6VmVydGlj YWxTY3JvbGxiYXJNb2RlKQogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyTW9kZSA9IHN0YXRl LT52ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKTsKKworICAgIGlmIChzdGF0ZS0+Y2hhbmdlZFByb3Bl cnRpZXMoKSAmIFNjcm9sbGluZ1RyZWVTdGF0ZTo6U2Nyb2xsT3JpZ2luKQorICAgICAgICBtX3Nj cm9sbE9yaWdpbiA9IHN0YXRlLT5zY3JvbGxPcmlnaW4oKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZU5vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlTm9kZS5oCShyZXZpc2lvbiAxMTY0MzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSwxMSAr NjUsMTQgQEAgcHJvdGVjdGVkOgogCiAgICAgYm9vbCBjYW5IYXZlU2Nyb2xsYmFycygpIGNvbnN0 IHsgcmV0dXJuIG1faG9yaXpvbnRhbFNjcm9sbGJhck1vZGUgIT0gU2Nyb2xsYmFyQWx3YXlzT2Zm IHx8IG1fdmVydGljYWxTY3JvbGxiYXJNb2RlICE9IFNjcm9sbGJhckFsd2F5c09mZjsgfQogCisg ICAgY29uc3QgSW50UG9pbnQmIHNjcm9sbE9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xs T3JpZ2luOyB9CisKIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nVHJlZSogbV9zY3JvbGxpbmdUcmVl OwogCiAgICAgSW50UmVjdCBtX3ZpZXdwb3J0UmVjdDsKICAgICBJbnRTaXplIG1fY29udGVudHNT aXplOworICAgIEludFBvaW50IG1fc2Nyb2xsT3JpZ2luOwogCiAgICAgYm9vbCBtX3Nob3VsZFVw ZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQ7CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcAkocmV2 aXNpb24gMTE2NDM5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZVN0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDYgKzE1NywxNSBAQCB2b2lkIFNj cm9sbGluZ1RyZWVTdGF0ZTo6c2V0UmVxdWVzdGVkU2NyCiAgICAgbV9jaGFuZ2VkUHJvcGVydGll cyB8PSBSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbjsKIH0KIAordm9pZCBTY3JvbGxpbmdUcmVlU3Rh dGU6OnNldFNjcm9sbE9yaWdpbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luKQoreworICAg IGlmIChtX3Njcm9sbE9yaWdpbiA9PSBzY3JvbGxPcmlnaW4pCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fc2Nyb2xsT3JpZ2luID0gc2Nyb2xsT3JpZ2luOworICAgIG1fY2hhbmdlZFByb3BlcnRp ZXMgfD0gU2Nyb2xsT3JpZ2luOworfQorCiBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVTdGF0ZT4g U2Nyb2xsaW5nVHJlZVN0YXRlOjpjb21taXQoKQogewogICAgIE93blB0cjxTY3JvbGxpbmdUcmVl U3RhdGU+IHRyZWVTdGF0ZSA9IGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdUcmVlU3RhdGUoKnRoaXMp KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWVTdGF0ZS5oCShyZXZpc2lvbiAxMTY0MzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdUcmVlU3RhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsOCArNjEs OSBAQCBwdWJsaWM6CiAgICAgICAgIEhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhciA9IDEgPDwg OCwKICAgICAgICAgSG9yaXpvbnRhbFNjcm9sbGJhck1vZGUgPSAxIDw8IDksCiAgICAgICAgIFZl cnRpY2FsU2Nyb2xsYmFyTW9kZSA9IDEgPDwgMTAsCi0gICAgICAgIFNjcm9sbExheWVyID0gMSA8 PCAxMSwKLSAgICAgICAgUmVxdWVzdGVkU2Nyb2xsUG9zaXRpb24gPSAxIDw8IDEyLAorICAgICAg ICBTY3JvbGxPcmlnaW4gPSAxIDw8IDExLAorICAgICAgICBTY3JvbGxMYXllciA9IDEgPDwgMTIs CisgICAgICAgIFJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uID0gMSA8PCAxMywKICAgICB9OwogCiAg ICAgYm9vbCBoYXNDaGFuZ2VkUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1fY2hhbmdlZFBy b3BlcnRpZXM7IH0KQEAgLTEwNyw2ICsxMDgsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW50UG9p bnQmIHJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0ZWRT Y3JvbGxQb3NpdGlvbjsgfQogICAgIHZvaWQgc2V0UmVxdWVzdGVkU2Nyb2xsUG9zaXRpb24oY29u c3QgSW50UG9pbnQmKTsKIAorICAgIGNvbnN0IEludFBvaW50JiBzY3JvbGxPcmlnaW4oKSBjb25z dCB7IHJldHVybiBtX3Njcm9sbE9yaWdpbjsgfQorICAgIHZvaWQgc2V0U2Nyb2xsT3JpZ2luKGNv bnN0IEludFBvaW50Jik7CisKICAgICAvLyBDb3BpZXMgdGhlIGN1cnJlbnQgdHJlZSBzdGF0ZSBh bmQgY2xlYXJzIHRoZSBjaGFuZ2VkIHByb3BlcnRpZXMgbWFzayBpbiB0aGUgb3JpZ2luYWwuCiAg ICAgUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU3RhdGU+IGNvbW1pdCgpOwogCkBAIC0xMzQsNiAr MTM4LDcgQEAgcHJpdmF0ZToKICAgICBTY3JvbGxiYXJNb2RlIG1fdmVydGljYWxTY3JvbGxiYXJN b2RlOwogCiAgICAgSW50UG9pbnQgbV9yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbjsKKyAgICBJbnRQ b2ludCBtX3Njcm9sbE9yaWdpbjsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBSZXRhaW5QdHI8 UGxhdGZvcm1MYXllcj4gbV9wbGF0Zm9ybVNjcm9sbExheWVyOwpJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVOb2RlTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1h Yy5tbQkocmV2aXNpb24gMTE2NDM5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVOb2RlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMzcsMjQgKzIz NywyMiBAQCBJbnRQb2ludCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6c2Nyb2xsUG9zCiAgICAgICAg IHJldHVybiBtX3Byb2JhYmxlTWFpblRocmVhZFNjcm9sbFBvc2l0aW9uOwogCiAgICAgQ0dQb2lu dCBzY3JvbGxMYXllclBvc2l0aW9uID0gbV9zY3JvbGxMYXllci5nZXQoKS5wb3NpdGlvbjsKLSAg ICByZXR1cm4gSW50UG9pbnQoLXNjcm9sbExheWVyUG9zaXRpb24ueCwgLXNjcm9sbExheWVyUG9z aXRpb24ueSk7CisgICAgcmV0dXJuIEludFBvaW50KC1zY3JvbGxMYXllclBvc2l0aW9uLnggKyBz Y3JvbGxPcmlnaW4oKS54KCksIC1zY3JvbGxMYXllclBvc2l0aW9uLnkgKyBzY3JvbGxPcmlnaW4o KS55KCkpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpzZXRTY3JvbGxMYXllclBv c2l0aW9uKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHsKICAgICBBU1NFUlQoIXNob3VsZFVw ZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQoKSk7Ci0gICAgbV9zY3JvbGxMYXll ci5nZXQoKS5wb3NpdGlvbiA9IENHUG9pbnRNYWtlKC1wb3NpdGlvbi54KCksIC1wb3NpdGlvbi55 KCkpOworICAgIG1fc2Nyb2xsTGF5ZXIuZ2V0KCkucG9zaXRpb24gPSBDR1BvaW50TWFrZSgtcG9z aXRpb24ueCgpICsgc2Nyb2xsT3JpZ2luKCkueCgpLCAtcG9zaXRpb24ueSgpICsgc2Nyb2xsT3Jp Z2luKCkueSgpKTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6Om1pbmltdW1T Y3JvbGxQb3NpdGlvbigpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHRha2Ug dGhlIHNjcm9sbCBvcmlnaW4gaW50byBhY2NvdW50LgogICAgIHJldHVybiBJbnRQb2ludCgwLCAw KTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6Om1heGltdW1TY3JvbGxQb3Np dGlvbigpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHRha2UgdGhlIHNjcm9s bCBvcmlnaW4gaW50byBhY2NvdW50LgogICAgIEludFBvaW50IHBvc2l0aW9uKGNvbnRlbnRzU2l6 ZSgpLndpZHRoKCkgLSB2aWV3cG9ydFJlY3QoKS53aWR0aCgpLAogICAgICAgICAgICAgICAgICAg ICAgIGNvbnRlbnRzU2l6ZSgpLmhlaWdodCgpIC0gdmlld3BvcnRSZWN0KCkuaGVpZ2h0KCkpOwog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcAkocmV2aXNpb24gMTE2NDM5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2Miw3ICsyNjIsNyBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29tcG9zaXRlCiAgICAgICAgIFJlbmRlckxheWVy KiByb290TGF5ZXIgPSB2aWV3LT5sYXllcigpOwogCiAgICAgICAgIC8vIFN0YXJ0IGJ5IGNsaXBw aW5nIHRvIHRoZSB2aWV3J3MgYm91bmRzLgotICAgICAgICBMYXlvdXRSZWN0IGNsaXBwaW5nQm91 bmRzID0gdmlldy0+bGF5b3V0T3ZlcmZsb3dSZWN0KCk7CisgICAgICAgIExheW91dFJlY3QgY2xp cHBpbmdCb3VuZHMgPSB2aWV3LT51bnNjYWxlZERvY3VtZW50UmVjdCgpOwogCiAgICAgICAgIGlm IChtX293bmluZ0xheWVyICE9IHJvb3RMYXllcikKICAgICAgICAgICAgIGNsaXBwaW5nQm91bmRz LmludGVyc2VjdChtX293bmluZ0xheWVyLT5iYWNrZ3JvdW5kQ2xpcFJlY3Qocm9vdExheWVyLCAw LCB0cnVlKS5yZWN0KCkpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwCShyZXZpc2lvbiAxMTY0MzkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0MCw4ICsxMDQwLDEx IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmcmFtZVZpZXdEaWQKICAgICBGcmFtZVZp ZXcqIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7CiAgICAgSW50UG9pbnQg c2Nyb2xsUG9zaXRpb24gPSBmcmFtZVZpZXctPnNjcm9sbFBvc2l0aW9uKCk7CiAKLSAgICBpZiAo VGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBmcmFtZVZpZXctPnRpbGVkQmFja2luZygpKQot ICAgICAgICB0aWxlZEJhY2tpbmctPnZpc2libGVSZWN0Q2hhbmdlZChmcmFtZVZpZXctPnZpc2li bGVDb250ZW50UmVjdChmYWxzZSAvKiBleGNsdWRlIHNjcm9sbGJhcnMgKi8pKTsKKyAgICBpZiAo VGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBmcmFtZVZpZXctPnRpbGVkQmFja2luZygpKSB7 CisgICAgICAgIEludFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0ID0gZnJhbWVWaWV3LT52aXNpYmxl Q29udGVudFJlY3QoZmFsc2UgLyogZXhjbHVkZSBzY3JvbGxiYXJzICovKTsKKyAgICAgICAgdmlz aWJsZUNvbnRlbnRSZWN0Lm1vdmUodG9TaXplKGZyYW1lVmlldy0+c2Nyb2xsT3JpZ2luKCkpKTsK KyAgICAgICAgdGlsZWRCYWNraW5nLT52aXNpYmxlUmVjdENoYW5nZWQodmlzaWJsZUNvbnRlbnRS ZWN0KTsKKyAgICB9CiAKICAgICBpZiAoIW1fc2Nyb2xsTGF5ZXIpCiAgICAgICAgIHJldHVybjsK