106946 2013-01-15 14:47:12 -0800 Sticky-position elements can jump around/hide on rubber-banding 2013-01-18 21:51:23 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 104276 1 simon.fraser bdakin ap bdakin benjamin eric jer.noble ojan.autocc simon.fraser webkit-bug-importer webkit.review.bot oldest_to_newest 807711 0 simon.fraser 2013-01-15 14:47:12 -0800 Sticky-postion elements behave oddly on rubber-banding. For example, the bug review bar on https://bugs.webkit.org/attachment.cgi?id=179870&action=review jumps around and disappear when you rubber-band at the top of the document. 807713 1 webkit-bug-importer 2013-01-15 14:47:35 -0800 <rdar://problem/13019346> 811193 2 bdakin 2013-01-18 17:27:20 -0800 I think I know how to fix this. 811221 3 183585 bdakin 2013-01-18 17:56:03 -0800 Created attachment 183585 Patch 811224 4 183585 simon.fraser 2013-01-18 18:03:08 -0800 Comment on attachment 183585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183585&action=review > Source/WebCore/rendering/RenderBoxModelObject.cpp:513 > LayoutRect viewportRect = view()->frameView()->visibleContentRect(); > + viewportRect.setLocation(toPoint(view()->frameView()->scrollOffsetForFixedPosition())); We do this in so many places that I think it's time to add something to FrameView for this. Maybe viewportConstrainedObjectRect() ? 811229 5 183588 bdakin 2013-01-18 18:17:13 -0800 Created attachment 183588 Patch 811230 6 183588 simon.fraser 2013-01-18 18:18:57 -0800 Comment on attachment 183588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183588&action=review > Source/WebCore/page/FrameView.h:194 > + LayoutRect viewportConstrainedVisibleContentRect() const; I think this deserves a comment saying how it's different from visibleContentRect() (rubber-banding and zooming). 811232 7 bdakin 2013-01-18 18:24:23 -0800 Thank you! I added a comment http://trac.webkit.org/changeset/140229 811263 8 benjamin 2013-01-18 19:33:05 -0800 It looks like this caused a regression on fast/css/sticky/sticky-top-zoomed.html: http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK2%20(Tests)/r140230%20(4996)/results.html 811281 9 simon.fraser 2013-01-18 20:58:40 -0800 I think that change is expected, since this commit made sticky take zooming into account. We'll have to fix the ref test. 811301 10 jer.noble 2013-01-18 21:51:23 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=107356, tracking the test failure. Test was added to TestExpectations in <http://trac.webkit.org/changeset/140234>. 183585 2013-01-18 17:56:03 -0800 2013-01-18 18:17:13 -0800 Patch for-review.txt text/plain 5251 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDIyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTE4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2OTQ2CisgICAgICAgIFN0aWNreS1wb3NpdGlvbiBlbGVtZW50 cyBjYW4ganVtcCBhcm91bmQvaGlkZSBvbiBydWJiZXItYmFuZGluZworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIG5lZWQgdG8gdXNlIHNjcm9sbE9m ZnNldEZvckZpeGVkUG9zaXRpb24oKSBoZXJlIHRvIGF2b2lkIG5lZ2F0aXZlIChvciBvdmVybHkt CisgICAgICAgIHBvc2l0aXZlKSBvZmZzZXRzIHdoZW4gcnViYmVyLWJhbmRpbmcuIAorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6c3RpY2t5UG9zaXRpb25PZmZzZXQpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlU3RpY2t5Vmlld3BvcnRDb25zdHJhaW50cyk6 CisKIDIwMTMtMDEtMTggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDAyMDYuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJl dmlzaW9uIDE0MDIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxMCw2ICs1MTAsNyBAQCB2b2lkIFJlbmRl ckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlU3RpY2t5CiBMYXlvdXRTaXplIFJlbmRlckJveE1vZGVs T2JqZWN0OjpzdGlja3lQb3NpdGlvbk9mZnNldCgpIGNvbnN0CiB7CiAgICAgTGF5b3V0UmVjdCB2 aWV3cG9ydFJlY3QgPSB2aWV3KCktPmZyYW1lVmlldygpLT52aXNpYmxlQ29udGVudFJlY3QoKTsK KyAgICB2aWV3cG9ydFJlY3Quc2V0TG9jYXRpb24odG9Qb2ludCh2aWV3KCktPmZyYW1lVmlldygp LT5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkpKTsKICAgICBmbG9hdCBzY2FsZSA9IDE7 CiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IHZpZXcoKS0+ZnJhbWVWaWV3KCktPmZyYW1lKCkpCiAg ICAgICAgIHNjYWxlID0gZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCShyZXZp c2lvbiAxNDAyMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc1Miw2ICsyNzUyLDcgQEAgU3RpY2t5UG9z aXRpb25WaWV3cG9ydENvbnN0cmFpbnRzIFJlbmRlcgogCiAgICAgRnJhbWVWaWV3KiBmcmFtZVZp ZXcgPSBtX3JlbmRlclZpZXctPmZyYW1lVmlldygpOwogICAgIExheW91dFJlY3Qgdmlld3BvcnRS ZWN0ID0gZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsKKyAgICB2aWV3cG9ydFJlY3Qu c2V0TG9jYXRpb24odG9Qb2ludChmcmFtZVZpZXctPnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRp b24oKSkpOwogCiAgICAgU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzIGNvbnN0cmFp bnRzID0gU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzKCk7CiAKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0MDIyNikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDEzLTAxLTE4ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNv bT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2 OTQ2CisgICAgICAgIFN0aWNreS1wb3NpdGlvbiBlbGVtZW50cyBjYW4ganVtcCBhcm91bmQvaGlk ZSBvbiBydWJiZXItYmFuZGluZworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvc3RpY2t5L25lZ2F0aXZl LXNjcm9sbC1vZmZzZXQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvdGlsZWQtZHJhd2luZy9zdGlja3kvbmVnYXRpdmUtc2Nyb2xsLW9mZnNldC5odG1sOiBBZGRl ZC4KKwogMjAxMy0wMS0xOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE0MDIwNi4KSW5kZXg6IExh eW91dFRlc3RzL3BsYXRmb3JtL21hYy90aWxlZC1kcmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3Jv bGwtb2Zmc2V0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvdGlsZWQtZHJhd2luZy9zdGlja3kvbmVnYXRpdmUtc2Nyb2xsLW9mZnNldC1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvdGlsZWQtZHJh d2luZy9zdGlja3kvbmVnYXRpdmUtc2Nyb2xsLW9mZnNldC1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMTkgQEAKKyhTY3JvbGxpbmcgbm9kZQorICAodmlld3BvcnQgcmVjdCAw IDAgNzg1IDYwMCkKKyAgKGNvbnRlbnRzIHNpemUgNzg1IDIyMTYpCisgIChyZXF1ZXN0ZWQgc2Ny b2xsIHBvc2l0aW9uIDAgLTIwKQorICAoY2hpbGRyZW4gMQorICAgIChTdGlja3kgbm9kZQorICAg ICAgKGFuY2hvciBlZGdlczogQW5jaG9yRWRnZUxlZnQgQW5jaG9yRWRnZVJpZ2h0IEFuY2hvckVk Z2VCb3R0b20pCisgICAgICAobGVmdCBvZmZzZXQgMC4wMCkKKyAgICAgIChyaWdodCBvZmZzZXQg MC4wMCkKKyAgICAgIChib3R0b20gb2Zmc2V0IDAuMDApCisgICAgICAoY29udGFpbmluZyBibG9j ayByZWN0IDguMDAsIDguMDAgNzY5LjAwIHggMjIwMC4wMCkKKyAgICAgIChzdGlja3kgYm94IHJl Y3QgOC4wMCA4LjAwIDc3My4wMCA1NC4wMCkKKyAgICAgIChzdGlja3kgYm94IHJlY3QgOC4wMCA4 LjAwIDc3My4wMCA1NC4wMCkKKyAgICAgIChzdGlja3kgb2Zmc2V0IGF0IGxhc3QgbGF5b3V0IDAu MDAgMC4wMCkKKyAgICAgIChsYXllciBwb3NpdGlvbiBhdCBsYXN0IGxheW91dCA4LjAwIDguMDAp CisgICAgKQorICApCispCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy90aWxlZC1k cmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3JvbGwtb2Zmc2V0Lmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvc3RpY2t5L25lZ2F0aXZlLXNj cm9sbC1vZmZzZXQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21h Yy90aWxlZC1kcmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3JvbGwtb2Zmc2V0Lmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNDkgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlIHR5cGU9 InRleHQvY3NzIiBtZWRpYT0ic2NyZWVuIj4KKyAgICAgIGJvZHkgeworICAgICAgICBoZWlnaHQ6 IDIyMDBweDsKKyAgICAgIH0KKworICAgICAgLnN0aWNreSB7CisgICAgICAgIHBvc2l0aW9uOiAt d2Via2l0LXN0aWNreTsKKyAgICAgICAgd2lkdGg6IDEwMCU7CisgICAgICAgIGhlaWdodDogNTBw eDsKKyAgICAgICAgbGVmdDogMDsKKyAgICAgICAgcmlnaHQ6IDA7CisgICAgICAgIGJvdHRvbTog MDsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAxMjgsIDAsIDAuOCk7CisgICAg ICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsYWNrOworICAgICAgfQorICAgICAgCisgICAgPC9zdHls ZT4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgor ICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVu dGlsRG9uZSgpOworICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgIH0KKwor ICAgICAgZnVuY3Rpb24gZG9TY3JvbGwoKQorICAgICAgeworICAgICAgICB3aW5kb3cuc2V0VGlt ZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICB3aW5kb3cuc2Nyb2xsVG8oMCwgLTIwKTsKKyAg ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCdyZXN1bHRzJykuaW5uZXJUZXh0ID0gd2luZG93LmludGVybmFscy5zY3Jv bGxpbmdTdGF0ZVRyZWVBc1RleHQoZG9jdW1lbnQpOworICAgICAgICAgICAgdGVzdFJ1bm5lci5u b3RpZnlEb25lKCk7CisgICAgICAgICAgfQorICAgICAgICB9LCAxMCk7CisgICAgICB9CisgICAg ICAKKyAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZG9TY3JvbGwsIGZhbHNl KTsKKyAgICA8L3NjcmlwdD4KKworICAgIAorPC9oZWFkPgorPGJvZHk+CisKKzxwcmUgaWQ9InJl c3VsdHMiPjwvcHJlPgorCis8ZGl2IGNsYXNzPSJzdGlja3kiPjwvZGl2PgorCis8L2JvZHk+Cis8 L2h0bWw+Cg== 183588 2013-01-18 18:17:13 -0800 2013-01-18 18:18:57 -0800 Patch for-review-2.txt text/plain 8397 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDIyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAxLTE4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2OTQ2CisgICAgICAgIFN0aWNreS1wb3NpdGlvbiBlbGVtZW50 cyBjYW4ganVtcCBhcm91bmQvaGlkZSBvbiBydWJiZXItYmFuZGluZworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBuZXcgZnVu Y3Rpb24gY2FsbGVkIHZpZXdwb3J0Q29uc3RyYWluZWRWaXNpYmxlQ29udGVudFJlY3QoKSAKKyAg ICAgICAgc2luY2UgdGhlcmUgYXJlIGEgbnVtYmVyIG9mIHBsYWNlcyB3aGVyZSB3ZSBuZWVkIGEg dmlzaWJsZUNvbnRlY3RSZWN0KCkgdGhhdCBkb2VzIAorICAgICAgICBub3QgYWxsb3cgc2Nyb2xs IG9mZnNldHMgdGhhdCBpbmRpY2F0ZSB0aGUgcnViYmVyLWJhbmRpbmcgdGhhdCBpcyBoYXBwZW5p bmcuIEFuZCAKKyAgICAgICAgdGhpcyBwYXRjaCBmaXhlcyB0aGUgYnVnIGZvciBzdGlja3kgYnkg Y2FsbGluZyB0aGlzIGZ1bmN0aW9uIGluIHR3byBuZXcgcGxhY2VzLgorCisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp2aWV3cG9ydENv bnN0cmFpbmVkVmlzaWJsZUNvbnRlbnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChGcmFtZVZpZXcpOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVNYWluRnJhbWVTY3JvbGxQb3NpdGlvbik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpzdGlja3lQb3NpdGlvbk9mZnNldCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVGaXhlZFZpZXdwb3J0Q29uc3RyYWlu dHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlU3Rp Y2t5Vmlld3BvcnRDb25zdHJhaW50cyk6CisKIDIwMTMtMDEtMTggIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHIxNDAyMDYuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAx NDAyMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE0OTQsNiArMTQ5NCwxMyBAQCB2b2lkIEZyYW1lVmlldzo6cmVtb3ZlVmlld3BvcnRD b25zdHJhaW5lCiAgICAgfQogfQogCitMYXlvdXRSZWN0IEZyYW1lVmlldzo6dmlld3BvcnRDb25z dHJhaW5lZFZpc2libGVDb250ZW50UmVjdCgpIGNvbnN0Cit7CisgICAgTGF5b3V0UmVjdCB2aWV3 cG9ydFJlY3QgPSB2aXNpYmxlQ29udGVudFJlY3QoKTsKKyAgICB2aWV3cG9ydFJlY3Quc2V0TG9j YXRpb24odG9Qb2ludChzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkpKTsKKyAgICByZXR1 cm4gdmlld3BvcnRSZWN0OworfQorCiBJbnRTaXplIEZyYW1lVmlldzo6c2Nyb2xsT2Zmc2V0Rm9y Rml4ZWRQb3NpdGlvbigpIGNvbnN0CiB7CiAgICAgSW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3Qg PSB0aGlzLT52aXNpYmxlQ29udGVudFJlY3QoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu aAkocmV2aXNpb24gMTQwMjE5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtMTkxLDYgKzE5MSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJv b2wgc2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFNjcm9sbERpcmVjdGlvbikgY29uc3Q7CiAg ICAgdmlydHVhbCBib29sIHJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZShjb25zdCBJbnRQb2lu dCYpIE9WRVJSSURFOwogCisgICAgTGF5b3V0UmVjdCB2aWV3cG9ydENvbnN0cmFpbmVkVmlzaWJs ZUNvbnRlbnRSZWN0KCkgY29uc3Q7CisKICAgICBTdHJpbmcgbWVkaWFUeXBlKCkgY29uc3Q7CiAg ICAgdm9pZCBzZXRNZWRpYVR5cGUoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBhZGp1c3RNZWRp YVR5cGVGb3JQcmludGluZyhib29sIHByaW50aW5nKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAJKHJldmlz aW9uIDE0MDIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nv b3JkaW5hdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY5LDggKzM2OSw3IEBAIHZvaWQgU2Ny b2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmEKICAgICAgICAgICAgIHNjcm9sbExheWVy LT5zZXRQb3NpdGlvbigtZnJhbWVWaWV3LT5zY3JvbGxQb3NpdGlvbigpKTsKICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICBzY3JvbGxMYXllci0+c3luY1Bvc2l0aW9uKC1mcmFtZVZpZXctPnNj cm9sbFBvc2l0aW9uKCkpOwotICAgICAgICAgICAgTGF5b3V0UmVjdCB2aWV3cG9ydFJlY3QgPSBm cmFtZVZpZXctPnZpc2libGVDb250ZW50UmVjdCgpOwotICAgICAgICAgICAgdmlld3BvcnRSZWN0 LnNldExvY2F0aW9uKEludFBvaW50KGZyYW1lVmlldy0+c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3Np dGlvbigpKSk7CisgICAgICAgICAgICBMYXlvdXRSZWN0IHZpZXdwb3J0UmVjdCA9IGZyYW1lVmll dy0+dmlld3BvcnRDb25zdHJhaW5lZFZpc2libGVDb250ZW50UmVjdCgpOwogICAgICAgICAgICAg c3luY0NoaWxkUG9zaXRpb25zKHZpZXdwb3J0UmVjdCk7CiAgICAgICAgIH0KICAgICB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5j cHAJKHJldmlzaW9uIDE0MDIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwOSw3ICs1MDksNyBAQCB2b2lk IFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlU3RpY2t5CiAKIExheW91dFNpemUgUmVuZGVy Qm94TW9kZWxPYmplY3Q6OnN0aWNreVBvc2l0aW9uT2Zmc2V0KCkgY29uc3QKIHsKLSAgICBMYXlv dXRSZWN0IHZpZXdwb3J0UmVjdCA9IHZpZXcoKS0+ZnJhbWVWaWV3KCktPnZpc2libGVDb250ZW50 UmVjdCgpOworICAgIExheW91dFJlY3Qgdmlld3BvcnRSZWN0ID0gdmlldygpLT5mcmFtZVZpZXco KS0+dmlld3BvcnRDb25zdHJhaW5lZFZpc2libGVDb250ZW50UmVjdCgpOwogICAgIGZsb2F0IHNj YWxlID0gMTsKICAgICBpZiAoRnJhbWUqIGZyYW1lID0gdmlldygpLT5mcmFtZVZpZXcoKS0+ZnJh bWUoKSkKICAgICAgICAgc2NhbGUgPSBmcmFtZS0+ZnJhbWVTY2FsZUZhY3RvcigpOwpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAJKHJldmlzaW9uIDE0MDIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzExLDkgKzI3MTEsNyBAQCBG aXhlZFBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50cyBSZW5kZXJMCiAgICAgQVNTRVJUKGxheWVy LT5pc0NvbXBvc2l0ZWQoKSk7CiAKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fcmVuZGVy Vmlldy0+ZnJhbWVWaWV3KCk7Ci0KLSAgICBMYXlvdXRSZWN0IHZpZXdwb3J0UmVjdCA9IGZyYW1l Vmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7Ci0gICAgdmlld3BvcnRSZWN0LnNldExvY2F0aW9u KHRvUG9pbnQoZnJhbWVWaWV3LT5zY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkpKTsKKyAg ICBMYXlvdXRSZWN0IHZpZXdwb3J0UmVjdCA9IGZyYW1lVmlldy0+dmlld3BvcnRDb25zdHJhaW5l ZFZpc2libGVDb250ZW50UmVjdCgpOwogCiAgICAgRml4ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3Ry YWludHMgY29uc3RyYWludHMgPSBGaXhlZFBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50cygpOwog CkBAIC0yNzUxLDcgKzI3NDksNyBAQCBTdGlja3lQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMg UmVuZGVyCiAgICAgQVNTRVJUKGxheWVyLT5pc0NvbXBvc2l0ZWQoKSk7CiAKICAgICBGcmFtZVZp ZXcqIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7Ci0gICAgTGF5b3V0UmVj dCB2aWV3cG9ydFJlY3QgPSBmcmFtZVZpZXctPnZpc2libGVDb250ZW50UmVjdCgpOworICAgIExh eW91dFJlY3Qgdmlld3BvcnRSZWN0ID0gZnJhbWVWaWV3LT52aWV3cG9ydENvbnN0cmFpbmVkVmlz aWJsZUNvbnRlbnRSZWN0KCk7CiAKICAgICBTdGlja3lQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWlu dHMgY29uc3RyYWludHMgPSBTdGlja3lQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMoKTsKIApJ bmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0No YW5nZUxvZwkocmV2aXNpb24gMTQwMjI2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDEtMTggIEJldGggRGFraW4gIDxiZGFr aW5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDY5NDYKKyAgICAgICAgU3RpY2t5LXBvc2l0aW9uIGVsZW1lbnRzIGNhbiBqdW1w IGFyb3VuZC9oaWRlIG9uIHJ1YmJlci1iYW5kaW5nCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvdGlsZWQtZHJhd2luZy9zdGlj a3kvbmVnYXRpdmUtc2Nyb2xsLW9mZnNldC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL21hYy90aWxlZC1kcmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3JvbGwtb2Zmc2V0 Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTAxLTE4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcu Ym90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQwMjA2 LgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvc3RpY2t5L25l Z2F0aXZlLXNjcm9sbC1vZmZzZXQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL3BsYXRmb3JtL21hYy90aWxlZC1kcmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3JvbGwtb2Zm c2V0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21h Yy90aWxlZC1kcmF3aW5nL3N0aWNreS9uZWdhdGl2ZS1zY3JvbGwtb2Zmc2V0LWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxOSBAQAorKFNjcm9sbGluZyBub2RlCisgICh2aWV3 cG9ydCByZWN0IDAgMCA3ODUgNjAwKQorICAoY29udGVudHMgc2l6ZSA3ODUgMjIxNikKKyAgKHJl cXVlc3RlZCBzY3JvbGwgcG9zaXRpb24gMCAtMjApCisgIChjaGlsZHJlbiAxCisgICAgKFN0aWNr eSBub2RlCisgICAgICAoYW5jaG9yIGVkZ2VzOiBBbmNob3JFZGdlTGVmdCBBbmNob3JFZGdlUmln aHQgQW5jaG9yRWRnZUJvdHRvbSkKKyAgICAgIChsZWZ0IG9mZnNldCAwLjAwKQorICAgICAgKHJp Z2h0IG9mZnNldCAwLjAwKQorICAgICAgKGJvdHRvbSBvZmZzZXQgMC4wMCkKKyAgICAgIChjb250 YWluaW5nIGJsb2NrIHJlY3QgOC4wMCwgOC4wMCA3NjkuMDAgeCAyMjAwLjAwKQorICAgICAgKHN0 aWNreSBib3ggcmVjdCA4LjAwIDguMDAgNzczLjAwIDU0LjAwKQorICAgICAgKHN0aWNreSBib3gg cmVjdCA4LjAwIDguMDAgNzczLjAwIDU0LjAwKQorICAgICAgKHN0aWNreSBvZmZzZXQgYXQgbGFz dCBsYXlvdXQgMC4wMCAwLjAwKQorICAgICAgKGxheWVyIHBvc2l0aW9uIGF0IGxhc3QgbGF5b3V0 IDguMDAgOC4wMCkKKyAgICApCisgICkKKykKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL3RpbGVkLWRyYXdpbmcvc3RpY2t5L25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQuaHRtbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvdGlsZWQtZHJhd2luZy9zdGlja3kv bmVnYXRpdmUtc2Nyb2xsLW9mZnNldC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL3RpbGVkLWRyYXdpbmcvc3RpY2t5L25lZ2F0aXZlLXNjcm9sbC1vZmZzZXQu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0OSBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgICAgYm9keSB7CisgICAg ICAgIGhlaWdodDogMjIwMHB4OworICAgICAgfQorCisgICAgICAuc3RpY2t5IHsKKyAgICAgICAg cG9zaXRpb246IC13ZWJraXQtc3RpY2t5OworICAgICAgICB3aWR0aDogMTAwJTsKKyAgICAgICAg aGVpZ2h0OiA1MHB4OworICAgICAgICBsZWZ0OiAwOworICAgICAgICByaWdodDogMDsKKyAgICAg ICAgYm90dG9tOiAwOworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDEyOCwgMCwg MC44KTsKKyAgICAgICAgYm9yZGVyOiAycHggc29saWQgYmxhY2s7CisgICAgICB9CisgICAgICAK KyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0 PSJ1dGYtOCI+CisgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgdGVzdFJ1 bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwor ICAgICAgfQorCisgICAgICBmdW5jdGlvbiBkb1Njcm9sbCgpCisgICAgICB7CisgICAgICAgIHdp bmRvdy5zZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgIHdpbmRvdy5zY3JvbGxUbygw LCAtMjApOworICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdHMnKS5pbm5lclRleHQgPSB3aW5kb3cuaW50 ZXJuYWxzLnNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dChkb2N1bWVudCk7CisgICAgICAgICAgICB0 ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICB9CisgICAgICAgIH0sIDEwKTsKKyAg ICAgIH0KKyAgICAgIAorICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkb1Nj cm9sbCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorCisgICAgCis8L2hlYWQ+Cis8Ym9keT4KKwor PHByZSBpZD0icmVzdWx0cyI+PC9wcmU+CisKKzxkaXYgY2xhc3M9InN0aWNreSI+PC9kaXY+CisK KzwvYm9keT4KKzwvaHRtbD4K