101644 2012-11-08 14:12:53 -0800 Fixed header on Facebook news feed becomes detached from top of viewport after rubber band scrolling 2012-11-08 17:02:14 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin andersca bdakin eric jamesr simon.fraser thorton tonikitoo webkit.review.bot oldest_to_newest 762161 0 bdakin 2012-11-08 14:12:53 -0800 When scrolling upwards rapidly on my Facebook news feed, the blue header at the top of the page often detaches from the top of the page after my scrolling reaches the top and rubber-bands back. This regression appeared once we started scrolling pages with fixed positioning on the scrolling thread. <rdar://problem/12651944> 762180 1 173118 bdakin 2012-11-08 14:30:05 -0800 Created attachment 173118 Patch 762324 2 173118 simon.fraser 2012-11-08 16:50:18 -0800 Comment on attachment 173118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173118&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:88 > +IntSize scrollOffsetForFixedPosition(const IntRect visibleContentRect, const IntSize contentsSize, const IntPoint scrollPosition, const IntPoint scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame) All the const IntFoo should be references. > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:281 > + LayoutRect viewportRect = IntRect(scrollOffsetForFixed.width(), scrollOffsetForFixed.height(), visibleContentRect.width(), visibleContentRect.height()); I think we have toPoint() and toSize() now. > Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:285 > + IntRect viewportRect = IntRect(scrollOffsetForFixedChildren.width(), scrollOffsetForFixedChildren.height(), viewportSize.width(), viewportSize.height()); Here you can just do viewportRect = this->viewportRect(); viewportRect.setLocation(toInt(scrollOffsetForFixedChildren)). 762335 3 bdakin 2012-11-08 17:02:08 -0800 Thanks, Simon! I made the suggested changes. http://trac.webkit.org/changeset/133974 173118 2012-11-08 14:30:05 -0800 2012-11-08 16:50:18 -0800 Patch for-review.txt text/plain 12628 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzk0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTExLTA4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjQ0CisgICAgICAgIEZpeGVkIGhlYWRlciBvbiBGYWNlYm9v ayBuZXdzIGZlZWQgYmVjb21lcyBkZXRhY2hlZCBmcm9tIHRvcCBvZiAKKyAgICAgICAgdmlld3Bv cnQgYWZ0ZXIgcnViYmVyIGJhbmQgc2Nyb2xsaW5nCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGlu Zy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyNjUxOTQ0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIGlzIGNvZGUgdG8gaGFuZGxlIHRo aXMgZm9yIG5vbi10aHJlYWRlZCBzY3JvbGxpbmcgb24gRnJhbWVWaWV3LiAKKyAgICAgICAgVGhp cyBwYXRjaCBtb3ZlcyBtb3N0IG9mIHRoYXQgY29kZSBpbnRvIGEgY29udmVuaWVuY2UgZnVuY3Rp b24gb24gCisgICAgICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yLgorCisgICAgICAgIEhhdmUgRnJh bWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkgY2FsbCAKKyAgICAgICAgV2Vi Q29yZTo6c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbigpIHdpdGggYWxsIHRoZSByaWdodCAK KyAgICAgICAgcGFyYW1ldGVycy4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24pOgor CisgICAgICAgIEhlcmUncyB3aGVyZSBhbGwgdGhlIG1hdGggaGFwcGVucy4KKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpmaXhlZFBvc2l0aW9uU2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OnNjcm9sbE9m ZnNldEZvckZpeGVkUG9zaXRpb24pOgorCisgICAgICAgIFRoZSB2aWV3cG9ydFJlY3QgaW4gdGhl c2UgdGhyZWUgcGxhY2VzIG5lZWRzIHRvIGhhdmUgdGhlIAorICAgICAgICBhZGp1c3RlZC1mb3It Zml4ZWQgb2Zmc2V0LgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVw ZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYzo6c2V0U2Nyb2xsTGF5ZXJQb3NpdGlvbik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVGaXhlZFZpZXdwb3J0Q29uc3Ry YWludHMpOgorCiAyMDEyLTExLTA4ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW1Y4XSBVcGRhdGUgY2FsbGVycyB0byB1c2UgdGhlIGFsaWduZWQgcG9pbnRlciBB UEkgcmF0aGVyIHRoYW4gdGhlIGRlcHJlY2F0ZWQgdW5hbGlnbmVkIHBvaW50ZXIgQVBJCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxMzM5MTgpCisrKyBTb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NjUsNDUgKzE0 NjUsMTQgQEAgdm9pZCBGcmFtZVZpZXc6OnJlbW92ZVZpZXdwb3J0Q29uc3RyYWluZQogICAgIH0K IH0KIAotc3RhdGljIGludCBmaXhlZFBvc2l0aW9uU2Nyb2xsT2Zmc2V0KGludCBzY3JvbGxQb3Np dGlvbiwgaW50IG1heFZhbHVlLCBpbnQgc2Nyb2xsT3JpZ2luLCBmbG9hdCBkcmFnRmFjdG9yKQot ewotICAgIGlmICghbWF4VmFsdWUpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgaWYgKCFzY3Jv bGxPcmlnaW4pIHsKLSAgICAgICAgaWYgKHNjcm9sbFBvc2l0aW9uIDwgMCkKLSAgICAgICAgICAg IHNjcm9sbFBvc2l0aW9uID0gMDsKLSAgICAgICAgZWxzZSBpZiAoc2Nyb2xsUG9zaXRpb24gPiBt YXhWYWx1ZSkKLSAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gbWF4VmFsdWU7Ci0gICAgfSBl bHNlIHsKLSAgICAgICAgaWYgKHNjcm9sbFBvc2l0aW9uID4gMCkKLSAgICAgICAgICAgIHNjcm9s bFBvc2l0aW9uID0gMDsKLSAgICAgICAgZWxzZSBpZiAoc2Nyb2xsUG9zaXRpb24gPCAtbWF4VmFs dWUpCi0gICAgICAgICAgICBzY3JvbGxQb3NpdGlvbiA9IC1tYXhWYWx1ZTsKLSAgICB9Ci0gICAg Ci0gICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uICogZHJhZ0ZhY3RvcjsKLX0KLQogSW50U2l6ZSBG cmFtZVZpZXc6OnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24oKSBjb25zdAogewogICAgIElu dFJlY3QgdmlzaWJsZUNvbnRlbnRSZWN0ID0gdGhpcy0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7CiAg ICAgSW50U2l6ZSBjb250ZW50c1NpemUgPSB0aGlzLT5jb250ZW50c1NpemUoKTsKICAgICBJbnRQ b2ludCBzY3JvbGxQb3NpdGlvbiA9IHRoaXMtPnNjcm9sbFBvc2l0aW9uKCk7CiAgICAgSW50UG9p bnQgc2Nyb2xsT3JpZ2luID0gdGhpcy0+c2Nyb2xsT3JpZ2luKCk7Ci0gICAgCi0gICAgSW50U2l6 ZSBtYXhPZmZzZXQoY29udGVudHNTaXplLndpZHRoKCkgLSB2aXNpYmxlQ29udGVudFJlY3Qud2lk dGgoKSwgY29udGVudHNTaXplLmhlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRSZWN0LmhlaWdodCgp KTsKLSAgICAKICAgICBmbG9hdCBmcmFtZVNjYWxlRmFjdG9yID0gbV9mcmFtZSA/IG1fZnJhbWUt PmZyYW1lU2NhbGVGYWN0b3IoKSA6IDE7Ci0KLSAgICBGbG9hdFNpemUgZHJhZ0ZhY3RvciA9IGZp eGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUoKSA/IEZsb2F0U2l6ZSgxLCAxKSA6IEZs b2F0U2l6ZSgKLSAgICAgICAgKGNvbnRlbnRzU2l6ZS53aWR0aCgpIC0gdmlzaWJsZUNvbnRlbnRS ZWN0LndpZHRoKCkgKiBmcmFtZVNjYWxlRmFjdG9yKSAvIG1heE9mZnNldC53aWR0aCgpLAotICAg ICAgICAoY29udGVudHNTaXplLmhlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRSZWN0LmhlaWdodCgp ICogZnJhbWVTY2FsZUZhY3RvcikgLyBtYXhPZmZzZXQuaGVpZ2h0KCkpOwotCi0gICAgaW50IHgg PSBmaXhlZFBvc2l0aW9uU2Nyb2xsT2Zmc2V0KHNjcm9sbFBvc2l0aW9uLngoKSwgbWF4T2Zmc2V0 LndpZHRoKCksIHNjcm9sbE9yaWdpbi54KCksIGRyYWdGYWN0b3Iud2lkdGgoKSAvIGZyYW1lU2Nh bGVGYWN0b3IpOwotICAgIGludCB5ID0gZml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldChzY3JvbGxQ b3NpdGlvbi55KCksIG1heE9mZnNldC5oZWlnaHQoKSwgc2Nyb2xsT3JpZ2luLnkoKSwgZHJhZ0Zh Y3Rvci5oZWlnaHQoKSAvIGZyYW1lU2NhbGVGYWN0b3IpOwotCi0gICAgcmV0dXJuIEludFNpemUo eCwgeSk7CisgICAgcmV0dXJuIFdlYkNvcmU6OnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24o dmlzaWJsZUNvbnRlbnRSZWN0LCBjb250ZW50c1NpemUsIHNjcm9sbFBvc2l0aW9uLCBzY3JvbGxP cmlnaW4sIGZyYW1lU2NhbGVGYWN0b3IsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJh bWUoKSk7CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVU b0ZyYW1lKCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAJKHJldmlzaW9uIDEzMzkxOCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjUsNiArNjUsNDAgQEAgUGFzc1JlZlB0cjxTY3JvbGxpbmdDb29yZGlu YXRvcj4gU2Nyb2xsaQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2Nyb2xsaW5nQ29vcmRpbmF0 b3IocGFnZSkpOwogfQogCitzdGF0aWMgaW50IGZpeGVkUG9zaXRpb25TY3JvbGxPZmZzZXQoaW50 IHNjcm9sbFBvc2l0aW9uLCBpbnQgbWF4VmFsdWUsIGludCBzY3JvbGxPcmlnaW4sIGZsb2F0IGRy YWdGYWN0b3IpCit7CisgICAgaWYgKCFtYXhWYWx1ZSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAg ICBpZiAoIXNjcm9sbE9yaWdpbikgeworICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPCAwKQor ICAgICAgICAgICAgc2Nyb2xsUG9zaXRpb24gPSAwOworICAgICAgICBlbHNlIGlmIChzY3JvbGxQ b3NpdGlvbiA+IG1heFZhbHVlKQorICAgICAgICAgICAgc2Nyb2xsUG9zaXRpb24gPSBtYXhWYWx1 ZTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoc2Nyb2xsUG9zaXRpb24gPiAwKQorICAgICAg ICAgICAgc2Nyb2xsUG9zaXRpb24gPSAwOworICAgICAgICBlbHNlIGlmIChzY3JvbGxQb3NpdGlv biA8IC1tYXhWYWx1ZSkKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gLW1heFZhbHVlOwor ICAgIH0KKyAgICAKKyAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24gKiBkcmFnRmFjdG9yOworfQor CitJbnRTaXplIHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24oY29uc3QgSW50UmVjdCB2aXNp YmxlQ29udGVudFJlY3QsIGNvbnN0IEludFNpemUgY29udGVudHNTaXplLCBjb25zdCBJbnRQb2lu dCBzY3JvbGxQb3NpdGlvbiwgY29uc3QgSW50UG9pbnQgc2Nyb2xsT3JpZ2luLCBmbG9hdCBmcmFt ZVNjYWxlRmFjdG9yLCBib29sIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCit7 CisgICAgSW50U2l6ZSBtYXhPZmZzZXQoY29udGVudHNTaXplLndpZHRoKCkgLSB2aXNpYmxlQ29u dGVudFJlY3Qud2lkdGgoKSwgY29udGVudHNTaXplLmhlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRS ZWN0LmhlaWdodCgpKTsKKyAgICAKKyAgICBGbG9hdFNpemUgZHJhZ0ZhY3RvciA9IGZpeGVkRWxl bWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgPyBGbG9hdFNpemUoMSwgMSkgOiBGbG9hdFNpemUo CisgICAgICAgIChjb250ZW50c1NpemUud2lkdGgoKSAtIHZpc2libGVDb250ZW50UmVjdC53aWR0 aCgpICogZnJhbWVTY2FsZUZhY3RvcikgLyBtYXhPZmZzZXQud2lkdGgoKSwKKyAgICAgICAgKGNv bnRlbnRzU2l6ZS5oZWlnaHQoKSAtIHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSAqIGZyYW1l U2NhbGVGYWN0b3IpIC8gbWF4T2Zmc2V0LmhlaWdodCgpKTsKKworICAgIGludCB4ID0gZml4ZWRQ b3NpdGlvblNjcm9sbE9mZnNldChzY3JvbGxQb3NpdGlvbi54KCksIG1heE9mZnNldC53aWR0aCgp LCBzY3JvbGxPcmlnaW4ueCgpLCBkcmFnRmFjdG9yLndpZHRoKCkgLyBmcmFtZVNjYWxlRmFjdG9y KTsKKyAgICBpbnQgeSA9IGZpeGVkUG9zaXRpb25TY3JvbGxPZmZzZXQoc2Nyb2xsUG9zaXRpb24u eSgpLCBtYXhPZmZzZXQuaGVpZ2h0KCksIHNjcm9sbE9yaWdpbi55KCksIGRyYWdGYWN0b3IuaGVp Z2h0KCkgLyBmcmFtZVNjYWxlRmFjdG9yKTsKKworICAgIHJldHVybiBJbnRTaXplKHgsIHkpOwor fQorCiBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nQ29vcmRpbmF0b3IoUGFnZSogcGFn ZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV9mb3JjZU1haW5UaHJlYWRTY3JvbGxMYXll clBvc2l0aW9uVXBkYXRlcyhmYWxzZSkKQEAgLTI0Miw3ICsyNzYsMTAgQEAgdm9pZCBTY3JvbGxp bmdDb29yZGluYXRvcjo6dXBkYXRlTWFpbkZyYQogICAgICAgICAgICAgc2Nyb2xsTGF5ZXItPnNl dFBvc2l0aW9uKC1mcmFtZVZpZXctPnNjcm9sbFBvc2l0aW9uKCkpOwogICAgICAgICBlbHNlIHsK ICAgICAgICAgICAgIHNjcm9sbExheWVyLT5zeW5jUG9zaXRpb24oLWZyYW1lVmlldy0+c2Nyb2xs UG9zaXRpb24oKSk7Ci0gICAgICAgICAgICBzeW5jQ2hpbGRQb3NpdGlvbnMoZnJhbWVWaWV3LT52 aXNpYmxlQ29udGVudFJlY3QoKSk7CisgICAgICAgICAgICBJbnRTaXplIHNjcm9sbE9mZnNldEZv ckZpeGVkID0gZnJhbWVWaWV3LT5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCk7CisgICAg ICAgICAgICBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdCA9IGZyYW1lVmlldy0+dmlzaWJsZUNv bnRlbnRSZWN0KCk7CisgICAgICAgICAgICBMYXlvdXRSZWN0IHZpZXdwb3J0UmVjdCA9IEludFJl Y3Qoc2Nyb2xsT2Zmc2V0Rm9yRml4ZWQud2lkdGgoKSwgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWQuaGVp Z2h0KCksIHZpc2libGVDb250ZW50UmVjdC53aWR0aCgpLCB2aXNpYmxlQ29udGVudFJlY3QuaGVp Z2h0KCkpOworICAgICAgICAgICAgc3luY0NoaWxkUG9zaXRpb25zKHZpZXdwb3J0UmVjdCk7CiAg ICAgICAgIH0KICAgICB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAkocmV2aXNpb24gMTMzOTE4KQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAko d29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOSBAQCBjbGFzcyBWaWV3cG9ydENvbnN0cmFpbnRz OwogY2xhc3MgU2Nyb2xsaW5nVHJlZTsKICNlbmRpZgogCitJbnRTaXplIHNjcm9sbE9mZnNldEZv ckZpeGVkUG9zaXRpb24oY29uc3QgSW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3QsIGNvbnN0IElu dFNpemUgY29udGVudHNTaXplLCBjb25zdCBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbiwKKyAgICBj b25zdCBJbnRQb2ludCBzY3JvbGxPcmlnaW4sIGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IsIGJvb2wg Zml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7CisKIGNsYXNzIFNjcm9sbGluZ0Nv b3JkaW5hdG9yIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFNjcm9sbGluZ0Nvb3JkaW5h dG9yPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2Nyb2xsaW5nQ29vcmRpbmF0 b3I+IGNyZWF0ZShQYWdlKik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFj Lm1tCShyZXZpc2lvbiAxMzM5MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3 OSw5ICsyNzksMTYgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYzo6c2V0Uwog ICAgIGlmICghbV9jaGlsZHJlbikKICAgICAgICAgcmV0dXJuOwogCisgICAgSW50U2l6ZSBzY3Jv bGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuID0gV2ViQ29yZTo6c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQ b3NpdGlvbih2aWV3cG9ydFJlY3QoKSwgY29udGVudHNTaXplKCksIHBvc2l0aW9uLAorICAgICAg ICBzY3JvbGxPcmlnaW4oKSwgMSwgZmFsc2UpOworICAgIEludFNpemUgdmlld3BvcnRTaXplID0g dmlld3BvcnRSZWN0KCkuc2l6ZSgpOworICAgIEludFJlY3Qgdmlld3BvcnRSZWN0ID0gSW50UmVj dChzY3JvbGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuLndpZHRoKCksIHNjcm9sbE9mZnNldEZvckZp eGVkQ2hpbGRyZW4uaGVpZ2h0KCksIHZpZXdwb3J0U2l6ZS53aWR0aCgpLCB2aWV3cG9ydFNpemUu aGVpZ2h0KCkpOworCiAgICAgc2l6ZV90IHNpemUgPSBtX2NoaWxkcmVuLT5zaXplKCk7Ci0gICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCi0gICAgICAgIG1fY2hpbGRyZW4tPmF0 KGkpLT5wYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5nZShJbnRSZWN0KHBvc2l0aW9uLCB2aWV3 cG9ydFJlY3QoKS5zaXplKCkpKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsr aSkgeworICAgICAgICBTY3JvbGxpbmdUcmVlTm9kZSogY2hpbGQgPSBtX2NoaWxkcmVuLT5hdChp KS5nZXQoKTsKKyAgICAgICAgICAgIGNoaWxkLT5wYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5n ZSh2aWV3cG9ydFJlY3QpOworICAgIH0KIH0KIAogSW50UG9pbnQgU2Nyb2xsaW5nVHJlZVNjcm9s bGluZ05vZGVNYWM6Om1pbmltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkocmV2 aXNpb24gMTMzOTE4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1OTAsNyArMjU5MCwxMCBAQCBjb25zdCBG aXhlZFBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50cyBSCiAgICAgQVNTRVJUKGxheWVyLT5pc0Nv bXBvc2l0ZWQoKSk7CiAKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy0+ ZnJhbWVWaWV3KCk7Ci0gICAgTGF5b3V0UmVjdCB2aWV3cG9ydFJlY3QgPSBmcmFtZVZpZXctPnZp c2libGVDb250ZW50UmVjdCgpOworCisgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZCA9 IGZyYW1lVmlldy0+c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbigpOworICAgIEludFJlY3Qg dmlzaWJsZUNvbnRlbnRSZWN0ID0gZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsKKyAg ICBMYXlvdXRSZWN0IHZpZXdwb3J0UmVjdCA9IExheW91dFJlY3Qoc2Nyb2xsT2Zmc2V0Rm9yRml4 ZWQud2lkdGgoKSwgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWQuaGVpZ2h0KCksIHZpc2libGVDb250ZW50 UmVjdC53aWR0aCgpLCB2aXNpYmxlQ29udGVudFJlY3QuaGVpZ2h0KCkpOwogCiAgICAgRml4ZWRQ b3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMgY29uc3RyYWludHMgPSBGaXhlZFBvc2l0aW9uVmll d3BvcnRDb25zdHJhaW50cygpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzM5NTIpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0x MS0wOCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTY0NAorICAgICAgICBGaXhlZCBoZWFk ZXIgb24gRmFjZWJvb2sgbmV3cyBmZWVkIGJlY29tZXMgZGV0YWNoZWQgZnJvbSB0b3Agb2YgCisg ICAgICAgIHZpZXdwb3J0IGFmdGVyIHJ1YmJlciBiYW5kIHNjcm9sbGluZworICAgICAgICAtYW5k IGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjY1MTk0ND4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZXcgdGVzdCBlbnN1 cmVzIHRoYXQgbmVnYXRpdmUgb2Zmc2V0cyB3aWxsIG5vdCBtYWtlIHRoZWlyIHdheSBpbnRvIAor ICAgICAgICB0aGUgRml4ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMuCisgICAgICAgICog cGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvZml4ZWQvbmVnYXRpdmUtc2Nyb2xsLW9mZnNldC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy90aWxlZC1kcmF3aW5n L2ZpeGVkL25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQuaHRtbDogQWRkZWQuCisKIDIwMTItMTEtMDgg IFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25AaW50ZWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIFNvbWUgbW9yZSBnYXJkZW5pbmcgYWZ0ZXIgcjEzMzg5OC4KSW5kZXg6IExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy90aWxlZC1kcmF3aW5nL2ZpeGVkL25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy90aWxl ZC1kcmF3aW5nL2ZpeGVkL25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvZml4ZWQv bmVnYXRpdmUtc2Nyb2xsLW9mZnNldC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTIgQEAKKyhTY3JvbGxpbmcgbm9kZQorICAodmlld3BvcnQgcmVjdCAwIDAgNzg1IDYwMCkK KyAgKGNvbnRlbnRzIHNpemUgNzg1IDIyMjEpCisgIChyZXF1ZXN0ZWQgc2Nyb2xsIHBvc2l0aW9u IDAgLTIwKQorICAoY2hpbGRyZW4gMQorICAgIChGaXhlZCBub2RlCisgICAgICAoYW5jaG9yIGVk Z2VzOiBBbmNob3JFZGdlTGVmdCBBbmNob3JFZGdlVG9wKQorICAgICAgKHZpZXdwb3J0IHJlY3Qg YXQgbGFzdCBsYXlvdXQ6IDAuMDAgMC4wMCA3ODUuMDAgNjAwLjAwKQorICAgICkKKyAgKQorKQor VGhpcyBpcyB0aGUgdG9wIGJhci4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy90aWxl ZC1kcmF3aW5nL2ZpeGVkL25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvdGlsZWQtZHJhd2luZy9maXhlZC9uZWdhdGl2ZS1z Y3JvbGwtb2Zmc2V0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvdGlsZWQtZHJhd2luZy9maXhlZC9uZWdhdGl2ZS1zY3JvbGwtb2Zmc2V0Lmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNTUgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFk PgorICAgIDxzdHlsZT4KKyAgICAgIGJvZHkgeworICAgICAgICBoZWlnaHQ6IDIyMDBweDsKKyAg ICAgIH0KKyAgICAgIAorICAgICAgLmZpeGVkIHsKKyAgICAgICAgcG9zaXRpb246IGZpeGVkOwor ICAgICAgICB0b3A6IDA7CisgICAgICAgIGxlZnQ6IDA7CisgICAgICAgIG1hcmdpbjogMTBweDsK KyAgICAgICAgaGVpZ2h0OiA1MHB4OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAs IDEyOCwgMCwgMC44KTsKKyAgICAgICAgYm9yZGVyOiAycHggc29saWQgYmxhY2s7CisgICAgICAg IC13ZWJraXQtYm94LXNoYWRvdzogMCAwIDEwcHggYmxhY2s7CisgICAgICB9CisgICAgICAKKyAg ICAgIC50b3AgeworICAgICAgICB3aWR0aDogOTYlOworICAgICAgfQorICAgICAgCisgICAgPC9z dHlsZT4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgi PgorICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIud2Fp dFVudGlsRG9uZSgpOworICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgIH0K KworICAgICAgZnVuY3Rpb24gZG9TY3JvbGwoKQorICAgICAgeworICAgICAgICB3aW5kb3cuc2V0 VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICB3aW5kb3cuc2Nyb2xsVG8oMCwgLTIwKTsK KyAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdyZXN1bHRzJykuaW5uZXJUZXh0ID0gd2luZG93LmludGVybmFscy5z Y3JvbGxpbmdTdGF0ZVRyZWVBc1RleHQoZG9jdW1lbnQpOworICAgICAgICAgICAgdGVzdFJ1bm5l ci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgfQorICAgICAgICB9LCAxMCk7CisgICAgICB9Cisg ICAgICAKKyAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZG9TY3JvbGwsIGZh bHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8cHJlIGlkPSJyZXN1bHRz Ij48L3ByZT4KKworPGRpdiBjbGFzcz0iZml4ZWQgdG9wIj4KKyAgVGhpcyBpcyB0aGUgdG9wIGJh ci4KKzwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+Cg==