101514 2012-11-07 14:57:24 -0800 Remove ScrollingCoordinatorMac::updateMainFrameScrollPositionAndScrollLayerPosition() 2012-11-10 21:21:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin jamesr simon.fraser thorton tonikitoo webkit.review.bot oldest_to_newest 761083 0 simon.fraser 2012-11-07 14:57:24 -0800 Remove ScrollingCoordinatorMac::updateMainFrameScrollPositionAndScrollLayerPosition() 761096 1 172879 simon.fraser 2012-11-07 15:22:13 -0800 Created attachment 172879 Patch 761099 2 172879 thorton 2012-11-07 15:24:55 -0800 Comment on attachment 172879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172879&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:219 > +void ScrollingCoordinator::updateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll, bool setLayerPosition) More boolean arguments? :( > Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:266 > + scrollingTree()->updateMainFrameScrollPosition(scrollPosition, true /* setLayerPosition */); See, this is the path down which those lead :) 761140 3 172879 thorton 2012-11-07 16:10:57 -0800 Comment on attachment 172879 Patch Fix the bools and all will be well? 763775 4 simon.fraser 2012-11-10 21:21:59 -0800 http://trac.webkit.org/changeset/134169 172879 2012-11-07 15:22:13 -0800 2012-11-07 16:10:57 -0800 Patch bug-101514-20121107152024.patch text/plain 10226 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg0NTZkN2JjYjExODJj MTNiZWU3MTI2NzVjYjZlZjIyZGE3NDYzNC4uMTVlOGVhNzQzMWZlOTgyY2JjNTM4OTg4YzU1NmUy N2E1YTY1ZDY0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTExLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBTY3Jv bGxpbmdDb29yZGluYXRvck1hYzo6dXBkYXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25BbmRTY3Jv bGxMYXllclBvc2l0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMTUxNAorCisgICAgICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjp1cGRh dGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbkFuZFNjcm9sbExheWVyUG9zaXRpb24oKSBpcyB2ZXJ5 IHNpbWlsYXIgdG8KKyAgICAgICAgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmFt ZVNjcm9sbFBvc2l0aW9uKCkuIEluIG9yZGVyIHRvIGVsaW1pbmF0ZSB1cGRhdGVNYWluRnJhbWVT Y3JvbGxQb3NpdGlvbkFuZFNjcm9sbExheWVyUG9zaXRpb24oKSwKKyAgICAgICAgd2UganVzdCBu ZWVkIHRvIHBsdW1iIHRocm91Z2ggYSBmbGFnIHRoYXQgc2F5cyB0aGF0IHVwZGF0ZU1haW5GcmFt ZVNjcm9sbFBvc2l0aW9uKCkgc2hvdWxkCisgICAgICAgIHNldCB0aGUgbGF5ZXIgcG9zaXRpb24g KHJhdGhlciB0aGFuIGp1c3QgZG9pbmcgYSAnc3luYycpLgorCisgICAgICAgICogcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAg KiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAoU2Nyb2xs aW5nQ29vcmRpbmF0b3IpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6dXBkYXRlTWFpbkZyYW1lU2Ny b2xsUG9zaXRpb24pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMuaDoK KyAgICAgICAgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjKToKKyAgICAgICAgKiBwYWdlL3Njcm9s bGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW06CisgICAgICAgICogcGFnZS9zY3Jv bGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWM6OnNldFNjcm9sbFBvc2l0aW9uV2l0 aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMpOgorCiAyMDEyLTExLTA3ICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1Y4XSBJbnRydXNpdmVET01XcmFwcGVyTWFw IGlzIG5vIGxvbmdlciBuZWVkZWQgYW5kIGNhbiBiZSBkZWxldGVkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKaW5kZXgg MzQ0Njg1OWMxMjZkMmNmMTEzNzUwMDNkMmYwYzMwNmQzNmI3YTRhZC4uNGIxMDljOWNiMzY4OWZl MGRjMDkzOWMxMGU4YTg1OGQ3ZTU2NDhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtMjE2LDcgKzIxNiw3 IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld1Jvb3RMYXllckRpZENoYW5n ZShGcmFtZVZpZXcqIGZyYW1lVmlldykKICAgICB1cGRhdGVTaG91bGRVcGRhdGVTY3JvbGxMYXll clBvc2l0aW9uT25NYWluVGhyZWFkKCk7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6 OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3Np dGlvbiwgYm9vbCBwcm9ncmFtbWF0aWNTY3JvbGwpCit2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9y Ojp1cGRhdGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9z aXRpb24sIGJvb2wgcHJvZ3JhbW1hdGljU2Nyb2xsLCBib29sIHNldExheWVyUG9zaXRpb24pCiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIApAQCAtMjM4LDcgKzIzOCw3IEBAIHZvaWQg U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKGNvbnN0 IEludFBvaW50JiBzY3JvbGxQCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAg ICAgaWYgKEdyYXBoaWNzTGF5ZXIqIHNjcm9sbExheWVyID0gc2Nyb2xsTGF5ZXJGb3JGcmFtZVZp ZXcoZnJhbWVWaWV3KSkgewotICAgICAgICBpZiAocHJvZ3JhbW1hdGljU2Nyb2xsKQorICAgICAg ICBpZiAocHJvZ3JhbW1hdGljU2Nyb2xsIHx8IHNldExheWVyUG9zaXRpb24pCiAgICAgICAgICAg ICBzY3JvbGxMYXllci0+c2V0UG9zaXRpb24oLWZyYW1lVmlldy0+c2Nyb2xsUG9zaXRpb24oKSk7 CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgc2Nyb2xsTGF5ZXItPnN5bmNQb3NpdGlvbigt ZnJhbWVWaWV3LT5zY3JvbGxQb3NpdGlvbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IDAxYzFiMDQzZjRiNGMz OWZkMWU5NmU2YTk5N2I4NzdiNWFhMWJjMDQuLmI2YmZiNGY1Mjc3OTQ4NTYzYTRhMTNiZDcyYjU4 MDMwNDI3N2MxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtMTA5LDcgKzEwOSw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgY29tbWl0VHJlZVN0YXRlSWZOZWVkZWQoKSB7IH0KICAgICB2aXJ0dWFsIGJv b2wgcmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKEZyYW1lVmlldyosIGNvbnN0IEludFBvaW50 JikgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlV2hlZWxFdmVudChG cmFtZVZpZXcqLCBjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKSB7IHJldHVybiB0cnVlOyB9Ci0g ICAgdmlydHVhbCB2b2lkIHVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uQW5kU2Nyb2xsTGF5 ZXJQb3NpdGlvbigpIHsgfQogICAgIHZpcnR1YWwgU2Nyb2xsaW5nTm9kZUlEIGF0dGFjaFRvU3Rh dGVUcmVlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQgbmV3Tm9kZUlELCBTY3Jv bGxpbmdOb2RlSUQgLypwYXJlbnRJRCovKSB7IHJldHVybiBuZXdOb2RlSUQ7IH0KICAgICB2aXJ0 dWFsIHZvaWQgZGV0YWNoRnJvbVN0YXRlVHJlZShTY3JvbGxpbmdOb2RlSUQpIHsgfQogICAgIHZp cnR1YWwgdm9pZCBjbGVhclN0YXRlVHJlZSgpIHsgfQpAQCAtMTIxLDcgKzEyMCw3IEBAIHB1Ymxp YzoKICAgICBTY3JvbGxpbmdOb2RlSUQgdW5pcXVlU2Nyb2xsTGF5ZXJJRCgpOwogCiAgICAgLy8g RGlzcGF0Y2hlZCBieSB0aGUgc2Nyb2xsaW5nIHRyZWUgd2hlbmV2ZXIgdGhlIG1haW4gZnJhbWUg c2Nyb2xsIHBvc2l0aW9uIGNoYW5nZXMuCi0gICAgdm9pZCB1cGRhdGVNYWluRnJhbWVTY3JvbGxQ b3NpdGlvbihjb25zdCBJbnRQb2ludCYsIGJvb2wgcHJvZ3JhbW1hdGljU2Nyb2xsKTsKKyAgICB2 b2lkIHVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKGNvbnN0IEludFBvaW50JiwgYm9vbCBw cm9ncmFtbWF0aWNTY3JvbGwsIGJvb2wgc2V0TGF5ZXJQb3NpdGlvbiA9IGZhbHNlKTsKIAogICAg IGVudW0gTWFpblRocmVhZFNjcm9sbGluZ1JlYXNvbkZsYWdzIHsKICAgICAgICAgRm9yY2VkT25N YWluVGhyZWFkID0gMSA8PCAwLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlLmNwcAppbmRleCBhMWQ0YTQ4OWE4ODA0OGZmYWViMzM0NmJhN2VmODVhY2I2 OGZlNjhkLi43OTg5ZTZmMTZjZGJkNjNjZjc5OTRlZTRmNTgyOWQ3MWNlMjQ1YzQ1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcApAQCAtMjE0 LDcgKzIxNCw3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZTo6c2V0TWFpbkZyYW1lUGluU3RhdGUoYm9v bCBwaW5uZWRUb1RoZUxlZnQsIGJvb2wgcGlubmVkVG9UaGVSCiAgICAgbV9tYWluRnJhbWVQaW5u ZWRUb1RoZVJpZ2h0ID0gcGlubmVkVG9UaGVSaWdodDsKIH0KIAotdm9pZCBTY3JvbGxpbmdUcmVl Ojp1cGRhdGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9z aXRpb24pCit2b2lkIFNjcm9sbGluZ1RyZWU6OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9u KGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBzZXRMYXllclBvc2l0aW9uKQog ewogICAgIGlmICghbV9zY3JvbGxpbmdDb29yZGluYXRvcikKICAgICAgICAgcmV0dXJuOwpAQCAt MjI0LDcgKzIyNCw3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZTo6dXBkYXRlTWFpbkZyYW1lU2Nyb2xs UG9zaXRpb24oY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uCiAgICAgICAgIG1fbWFpbkZy YW1lU2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKICAgICB9CiAKLSAgICBjYWxsT25N YWluVGhyZWFkKGJpbmQoJlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVNYWluRnJhbWVTY3Jv bGxQb3NpdGlvbiwgbV9zY3JvbGxpbmdDb29yZGluYXRvci5nZXQoKSwgc2Nyb2xsUG9zaXRpb24s IG1faXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbCkpOworICAgIGNhbGxPbk1haW5UaHJlYWQo YmluZCgmU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9u LCBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yLmdldCgpLCBzY3JvbGxQb3NpdGlvbiwgbV9pc0hhbmRs aW5nUHJvZ3JhbW1hdGljU2Nyb2xsLCBzZXRMYXllclBvc2l0aW9uKSk7CiB9CiAKIEludFBvaW50 IFNjcm9sbGluZ1RyZWU6Om1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKCkKQEAgLTIzMywxOSArMjMz LDYgQEAgSW50UG9pbnQgU2Nyb2xsaW5nVHJlZTo6bWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24oKQog ICAgIHJldHVybiBtX21haW5GcmFtZVNjcm9sbFBvc2l0aW9uOwogfQogCi12b2lkIFNjcm9sbGlu Z1RyZWU6OnVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uQW5kU2Nyb2xsTGF5ZXJQb3NpdGlv bihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pCi17Ci0gICAgaWYgKCFtX3Njcm9sbGlu Z0Nvb3JkaW5hdG9yKQotICAgICAgICByZXR1cm47Ci0KLSAgICB7Ci0gICAgICAgIE11dGV4TG9j a2VyIGxvY2sobV9tdXRleCk7Ci0gICAgICAgIG1fbWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24gPSBz Y3JvbGxQb3NpdGlvbjsKLSAgICB9Ci0KLSAgICBjYWxsT25NYWluVGhyZWFkKGJpbmQoJlNjcm9s bGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbkFuZFNjcm9sbExh eWVyUG9zaXRpb24sIG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3IuZ2V0KCkpKTsKLX0KLQogI2lmIFBM QVRGT1JNKE1BQykgfHwgKFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4pKQogdm9pZCBT Y3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UoUGxhdGZvcm1XaGVlbEV2ZW50UGhh c2UgcGhhc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlLmgKaW5kZXggNTI1YWYzZjEwNWMwZWE2MmYyZDg1NzQ2MjcxYzIxOWFmOGZhOGRlNy4uODc2 ODllZTgxYzI3Zjk3MDJkYjkwNzBkMDZjMzk0ZjdiMWYwZDc0ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtODMsOCArODMsNyBAQCBwdWJs aWM6CiAKICAgICB2b2lkIHNldE1haW5GcmFtZVBpblN0YXRlKGJvb2wgcGlubmVkVG9UaGVMZWZ0 LCBib29sIHBpbm5lZFRvVGhlUmlnaHQpOwogCi0gICAgdm9pZCB1cGRhdGVNYWluRnJhbWVTY3Jv bGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pOwotICAgIHZvaWQgdXBk YXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25BbmRTY3JvbGxMYXllclBvc2l0aW9uKGNvbnN0IElu dFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CisgICAgdm9pZCB1cGRhdGVNYWluRnJhbWVTY3JvbGxQ b3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGJvb2wgdXBkYXRlTGF5ZXJQ b3NpdGlvbiA9IGZhbHNlKTsKICAgICBJbnRQb2ludCBtYWluRnJhbWVTY3JvbGxQb3NpdGlvbigp OwogCiAjaWYgUExBVEZPUk0oTUFDKSB8fCAoUExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJ TikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nQ29vcmRpbmF0b3JNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdDb29yZGluYXRvck1hYy5oCmluZGV4IDQ2ZTEyNDllZWJmMzBkYTc1ZTEyNTgxNzdl ZjViODhhNjg4Yzc3MGUuLjc5OTUzOWNiNzBkM2FmYWY5Mzk0NWJhZmNhMDg4OTEwZDE3MWQ4OTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdD b29yZGluYXRvck1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdDb29yZGluYXRvck1hYy5oCkBAIC02NSw5ICs2NSw2IEBAIHB1YmxpYzoKICAgICAv LyBIYW5kbGUgdGhlIHdoZWVsIGV2ZW50IG9uIHRoZSBzY3JvbGxpbmcgdGhyZWFkLiBSZXR1cm5z IHdoZXRoZXIgdGhlIGV2ZW50IHdhcyBoYW5kbGVkIG9yIG5vdC4KICAgICB2aXJ0dWFsIGJvb2wg aGFuZGxlV2hlZWxFdmVudChGcmFtZVZpZXcqLCBjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKTsK IAotICAgIC8vIERpc3BhdGNoZWQgYnkgdGhlIHNjcm9sbGluZyB0cmVlIHdoZW5ldmVyIHRoZSBt YWluIGZyYW1lIHNjcm9sbCBwb3NpdGlvbiBjaGFuZ2VzIGFuZCB0aGUgc2Nyb2xsIGxheWVyIHBv c2l0aW9uIG5lZWRzIHRvIGJlIHVwZGF0ZWQgYXMgd2VsbC4KLSAgICB2aXJ0dWFsIHZvaWQgdXBk YXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25BbmRTY3JvbGxMYXllclBvc2l0aW9uKCk7Ci0KICAg ICAvLyBUaGVzZSBmdW5jdGlvbnMgYXJlIHVzZWQgdG8gaW5kaWNhdGUgdGhhdCBhIGxheWVyIHNo b3VsZCBiZSAob3Igc2hvdWxkIG5vdCBsb25nZXIgYmUpIHJlcHJlc2VudGVkIGJ5IGEgbm9kZQog ICAgIC8vIGluIHRoZSBzY3JvbGxpbmcgdHJlZS4KICAgICB2aXJ0dWFsIFNjcm9sbGluZ05vZGVJ RCBhdHRhY2hUb1N0YXRlVHJlZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIG5l d05vZGVJRCwgU2Nyb2xsaW5nTm9kZUlEIHBhcmVudElEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5t bQppbmRleCA2ZjBkZTQ0ODYyMzVkMjFjYWFmMDI0ZjMwYzI2YzkyNTgyZjcwYjBmLi4yNmVkMTc5 NDg3MjE2NDY0NjdmYzVlZWI5Yjk4MzRlNmNlNDEwZDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFj Lm1tCkBAIC0yMTUsMjcgKzIxNSw2IEBAIGJvb2wgU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6Omhh bmRsZVdoZWVsRXZlbnQoRnJhbWVWaWV3KiwgY29uc3QgUGxhdGZvcm1XaGVlbEV2CiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OnVwZGF0ZU1haW5G cmFtZVNjcm9sbFBvc2l0aW9uQW5kU2Nyb2xsTGF5ZXJQb3NpdGlvbigpCi17Ci0gICAgQVNTRVJU KGlzTWFpblRocmVhZCgpKTsKLQotICAgIGlmICghbV9wYWdlKQotICAgICAgICByZXR1cm47Ci0K LSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsK LSAgICBpZiAoIWZyYW1lVmlldykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgSW50UG9pbnQgc2Ny b2xsUG9zaXRpb24gPSBtX3Njcm9sbGluZ1RyZWUtPm1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKCk7 Ci0KLSAgICBmcmFtZVZpZXctPnNldENvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKGZh bHNlKTsKLSAgICBmcmFtZVZpZXctPm5vdGlmeVNjcm9sbFBvc2l0aW9uQ2hhbmdlZChzY3JvbGxQ b3NpdGlvbik7Ci0gICAgZnJhbWVWaWV3LT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50 RWRnZSh0cnVlKTsKLQotICAgIGlmIChHcmFwaGljc0xheWVyKiBzY3JvbGxMYXllciA9IHNjcm9s bExheWVyRm9yRnJhbWVWaWV3KGZyYW1lVmlldykpCi0gICAgICAgIHNjcm9sbExheWVyLT5zZXRQ b3NpdGlvbigtZnJhbWVWaWV3LT5zY3JvbGxQb3NpdGlvbigpKTsKLX0KLQogU2Nyb2xsaW5nTm9k ZUlEIFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjphdHRhY2hUb1N0YXRlVHJlZShTY3JvbGxpbmdO b2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIG5ld05vZGVJRCwgU2Nyb2xsaW5nTm9k ZUlEIHBhcmVudElEKQogewogICAgIEFTU0VSVChuZXdOb2RlSUQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IGJkNmQ3MjgwYTNhZTcyZjg1Mjg5YWE5OTM3MDk4YWQ5 NDJjMThiYzUuLjJhZThhMjgyYzg3MzU4NjJmN2YxZTUzMjVjM2I3ZGE2YTllOTFkMWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0KQEAgLTI2Myw3ICsyNjMsNyBAQCB2b2lk IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRD b250ZW50RWRnZUNvbnN0cmFpbgogCiAgICAgaWYgKHNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9z aXRpb25Pbk1haW5UaHJlYWQoKSkgewogICAgICAgICBtX3Byb2JhYmxlTWFpblRocmVhZFNjcm9s bFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRpb247Ci0gICAgICAgIHNjcm9sbGluZ1RyZWUoKS0+dXBk YXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25BbmRTY3JvbGxMYXllclBvc2l0aW9uKHNjcm9sbFBv c2l0aW9uKTsKKyAgICAgICAgc2Nyb2xsaW5nVHJlZSgpLT51cGRhdGVNYWluRnJhbWVTY3JvbGxQ b3NpdGlvbihzY3JvbGxQb3NpdGlvbiwgdHJ1ZSAvKiBzZXRMYXllclBvc2l0aW9uICovKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAo=