142750 2015-03-16 14:52:54 -0700 WebKit1 Clients Are Not Reliably Repainted 2015-03-16 16:01:53 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham webkit-bug-importer oldest_to_newest 1077573 0 bfulgham 2015-03-16 14:52:54 -0700 In Bug 135514 I corrected a problem where paint operations were being performed during layout. An unintended side-effect of this was that WebKit clients that performed a programmatic scroll of web content (outside of WebKit's control) would no longer receive a "free" paint operation. To avoid breaking clients that relied on this misfeature, we need to notify AppKit that the view needs to be repainted once layout completes. 1077579 1 248751 bfulgham 2015-03-16 15:00:58 -0700 Created attachment 248751 Patch 1077580 2 bfulgham 2015-03-16 15:01:43 -0700 <rdar://problem/20042453> 1077582 3 248751 simon.fraser 2015-03-16 15:05:02 -0700 Comment on attachment 248751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248751&action=review > Source/WebCore/page/FrameView.h:116 > + WEBCORE_EXPORT bool isInViewSizeAdjust() { return m_layoutPhase == InViewSizeAdjust; } I think this would be better called something like inPaintableState(), and it should test the inverse. > Source/WebKit/mac/WebView/WebClipView.mm:118 > + if (paintable) > + [[self window] _disableDelayedWindowDisplay]; Is this still required? > Source/WebKit/mac/WebView/WebClipView.mm:123 > + if (paintable) > + [[self window] _enableDelayedWindowDisplay]; And this? 1077592 4 248755 bfulgham 2015-03-16 15:29:52 -0700 Created attachment 248755 Patch 1077596 5 248755 simon.fraser 2015-03-16 15:41:48 -0700 Comment on attachment 248755 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248755&action=review > Source/WebCore/page/FrameView.h:116 > + WEBCORE_EXPORT bool inPaintableState() { return m_layoutPhase != InViewSizeAdjust && !isInLayout(); } I don't think this is tight enough. FrameView::layout() sets the phase to InPostLayout before we've done updateLayerPositionsAfterLayout(), and it's certainly bad to paint before we've updated layers. I would prohibit painting with InLayout, InViewSizeAdjust and InPostLayout. > Source/WebKit/mac/WebView/WebClipView.mm:119 > + [self setNeedsDisplay: YES]; No space after the : I think this deserves a comment describing the situation under which this can occur. 1077619 6 bfulgham 2015-03-16 16:01:53 -0700 Committed r181587: <http://trac.webkit.org/changeset/181587> 248751 2015-03-16 15:00:58 -0700 2015-03-16 15:29:51 -0700 Patch bug-142750-20150316150029.patch text/plain 4824 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTU3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAzLTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdDEgQ2xpZW50cyBB cmUgTm90IFJlbGlhYmx5IFJlcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDA0MjQ1 Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGFpbnRDb250 ZW50cyk6IE1vdmUgIlJlZCBSZWN0IiBkZWJ1ZyBwYWludGluZyBiZWZvcmUKKyAgICAgICAgdGhl IGVhcmx5IHJldHVybiBzbyB3ZSBjYW4gc2VlIHdoZW4gdGhpcyBoYXBwZW5pbmcgaW4gZGVidWcg YnVpbGRzLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmlzSW5WaWV3U2l6ZUFkanVzdCk6IEFkZGVkLgorCiAyMDE1LTAzLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBEYXRhYmFzZUNvbnRl eHQgc3VzcGVuZGFibGUgaWYgdGhlcmUgaXMgbm8gcGVuZGluZyBkYXRhYmFzZSBhY3Rpdml0eQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTgxNTc0KQorKysgU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODQ5LDEx ICszODQ5LDYgQEAgdm9pZCBGcmFtZVZpZXc6OmRpZFBhaW50Q29udGVudHMoR3JhcGhpYwogCiB2 b2lkIEZyYW1lVmlldzo6cGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGRpcnR5UmVjdCkKIHsKLSAgICBpZiAobV9sYXlvdXRQaGFzZSA9PSBJblZp ZXdTaXplQWRqdXN0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBBU1NFUlQobV9sYXlvdXRQaGFz ZSA9PSBJblBvc3RMYXllclBvc2l0aW9uc1VwZGF0ZWRBZnRlckxheW91dCB8fCBtX2xheW91dFBo YXNlID09IE91dHNpZGVMYXlvdXQpOwotCiAjaWZuZGVmIE5ERUJVRwogICAgIGJvb2wgZmlsbFdp dGhSZWQ7CiAgICAgaWYgKGZyYW1lKCkuZG9jdW1lbnQoKS0+cHJpbnRpbmcoKSkKQEAgLTM4NzMs NiArMzg2OCwxMSBAQCB2b2lkIEZyYW1lVmlldzo6cGFpbnRDb250ZW50cyhHcmFwaGljc0NvCiAg ICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KGRpcnR5UmVjdCwgQ29sb3IoMHhGRiwgMCwgMCksIENv bG9yU3BhY2VEZXZpY2VSR0IpOwogI2VuZGlmCiAKKyAgICBpZiAobV9sYXlvdXRQaGFzZSA9PSBJ blZpZXdTaXplQWRqdXN0KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgQVNTRVJUKG1fbGF5 b3V0UGhhc2UgPT0gSW5Qb3N0TGF5ZXJQb3NpdGlvbnNVcGRhdGVkQWZ0ZXJMYXlvdXQgfHwgbV9s YXlvdXRQaGFzZSA9PSBPdXRzaWRlTGF5b3V0KTsKKyAgICAKICAgICBSZW5kZXJWaWV3KiByZW5k ZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpOwogICAgIGlmICghcmVuZGVyVmlldykgewogICAg ICAgICBMT0dfRVJST1IoImNhbGxlZCBGcmFtZVZpZXc6OnBhaW50IHdpdGggbmlsIHJlbmRlcmVy Iik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHJldmlzaW9uIDE4MTU3NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMyw2ICsx MTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1bnNjaGVkdWxlUmVsYXlvdXQoKTsKICAgICBib29s IGxheW91dFBlbmRpbmcoKSBjb25zdDsKICAgICBib29sIGlzSW5MYXlvdXQoKSBjb25zdCB7IHJl dHVybiBtX2xheW91dFBoYXNlID09IEluTGF5b3V0OyB9CisgICAgV0VCQ09SRV9FWFBPUlQgYm9v bCBpc0luVmlld1NpemVBZGp1c3QoKSB7IHJldHVybiBtX2xheW91dFBoYXNlID09IEluVmlld1Np emVBZGp1c3Q7IH0KIAogICAgIFJlbmRlck9iamVjdCogbGF5b3V0Um9vdChib29sIG9ubHlEdXJp bmdMYXlvdXQgPSBmYWxzZSkgY29uc3Q7CiAgICAgdm9pZCBjbGVhckxheW91dFJvb3QoKSB7IG1f bGF5b3V0Um9vdCA9IG51bGxwdHI7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4 MTU3OCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE4IEBACisyMDE1LTAzLTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYktpdDEgQ2xpZW50cyBBcmUgTm90IFJlbGlhYmx5IFJlcGFpbnRl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzUw CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDA0MjQ1Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGVjayB3aXRoIHRoZSBGcmFtZVZpZXcgdG8g c2VlIGlmIHdlIGFyZSBwZXJmb3JtaW5nIHNpemluZyBvcGVyYXRpb25zLiBJZiB3ZSBhcmUsCisg ICAgICAgIGRvIG5vdCBkaXNhYmxlIGRlbGF5ZWQgcGFpbnRpbmcsIGFuZCBtYXJrIHRoZSB2aWV3 IGFzIGRpcnR5IG9uY2UgdGhlIF9pbW1lZGlhdGVTY3JvbGxUb1BvaW50CisgICAgICAgIG9wZXJh dGlvbiBpcyBjb21wbGV0ZSBzbyB0aGF0IHRoZSByZWdpb24gd2lsbCBiZSBwYWludGVkLgorCisg ICAgICAgICogV2ViVmlldy9XZWJDbGlwVmlldy5tbToKKyAgICAgICAgKC1bV2ViQ2xpcFZpZXcg X2ltbWVkaWF0ZVNjcm9sbFRvUG9pbnQ6XSk6IAorCiAyMDE1LTAzLTE2ICBDb25yYWQgU2h1bHR6 ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgY2xpZW50cyB0byBz ZWxlY3RpdmVseSBkaXNhYmxlIHBsdWctaW5zCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkNsaXBWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViQ2xpcFZpZXcubW0JKHJldmlzaW9uIDE4MTU3NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViQ2xpcFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDA1IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMTUgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNl cnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTA1LDExICsxMDUsMjQg QEAgLSAodm9pZClfaW1tZWRpYXRlU2Nyb2xsVG9Qb2ludDooTlNQb2ludAogewogICAgIF9pc1Nj cm9sbGluZyA9IFlFUzsKIAotICAgIFtbc2VsZiB3aW5kb3ddIF9kaXNhYmxlRGVsYXllZFdpbmRv d0Rpc3BsYXldOworICAgIGJvb2wgcGFpbnRhYmxlID0gdHJ1ZTsKKyAgICBXZWJGcmFtZVZpZXcg KndlYkZyYW1lVmlldyA9IChXZWJGcmFtZVZpZXcgKilbW3NlbGYgc3VwZXJ2aWV3XSBzdXBlcnZp ZXddOworICAgIGlmIChbd2ViRnJhbWVWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkZyYW1lVmlldyBj bGFzc11dKSB7CisgICAgICAgIGlmIChGcmFtZSogY29yZUZyYW1lID0gY29yZShbd2ViRnJhbWVW aWV3IHdlYkZyYW1lXSkpIHsKKyAgICAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9 IGNvcmVGcmFtZS0+dmlldygpKQorICAgICAgICAgICAgICAgIHBhaW50YWJsZSA9ICFmcmFtZVZp ZXctPmlzSW5WaWV3U2l6ZUFkanVzdCgpOworICAgICAgICB9CisgICAgfQorICAgIAorICAgIGlm IChwYWludGFibGUpCisgICAgICAgIFtbc2VsZiB3aW5kb3ddIF9kaXNhYmxlRGVsYXllZFdpbmRv d0Rpc3BsYXldOwogCiAgICAgW3N1cGVyIF9pbW1lZGlhdGVTY3JvbGxUb1BvaW50Om5ld09yaWdp bl07CiAKLSAgICBbW3NlbGYgd2luZG93XSBfZW5hYmxlRGVsYXllZFdpbmRvd0Rpc3BsYXldOwor ICAgIGlmIChwYWludGFibGUpCisgICAgICAgIFtbc2VsZiB3aW5kb3ddIF9lbmFibGVEZWxheWVk V2luZG93RGlzcGxheV07CisgICAgZWxzZQorICAgICAgICBbc2VsZiBzZXROZWVkc0Rpc3BsYXk6 IFlFU107CiAKICAgICBfaXNTY3JvbGxpbmcgPSBOTzsKIH0K 248755 2015-03-16 15:29:52 -0700 2015-03-16 15:41:48 -0700 Patch bug-142750-20150316152923.patch text/plain 4516 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTU3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAzLTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdDEgQ2xpZW50cyBB cmUgTm90IFJlbGlhYmx5IFJlcGFpbnRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDA0MjQ1 Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGFpbnRDb250 ZW50cyk6IE1vdmUgIlJlZCBSZWN0IiBkZWJ1ZyBwYWludGluZyBiZWZvcmUKKyAgICAgICAgdGhl IGVhcmx5IHJldHVybiBzbyB3ZSBjYW4gc2VlIHdoZW4gdGhpcyBoYXBwZW5pbmcgaW4gZGVidWcg YnVpbGRzLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmluUGFpbnRhYmxlU3RhdGUpOiBBZGRlZC4KKwogMjAxNS0wMy0xNiAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRGF0YWJhc2VDb250ZXh0 IHN1c3BlbmRhYmxlIGlmIHRoZXJlIGlzIG5vIHBlbmRpbmcgZGF0YWJhc2UgYWN0aXZpdHkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9uIDE4MTU3NCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg0OSwxMSAr Mzg0OSw2IEBAIHZvaWQgRnJhbWVWaWV3OjpkaWRQYWludENvbnRlbnRzKEdyYXBoaWMKIAogdm9p ZCBGcmFtZVZpZXc6OnBhaW50Q29udGVudHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25z dCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7Ci0gICAgaWYgKG1fbGF5b3V0UGhhc2UgPT0gSW5WaWV3 U2l6ZUFkanVzdCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgQVNTRVJUKG1fbGF5b3V0UGhhc2Ug PT0gSW5Qb3N0TGF5ZXJQb3NpdGlvbnNVcGRhdGVkQWZ0ZXJMYXlvdXQgfHwgbV9sYXlvdXRQaGFz ZSA9PSBPdXRzaWRlTGF5b3V0KTsKLQogI2lmbmRlZiBOREVCVUcKICAgICBib29sIGZpbGxXaXRo UmVkOwogICAgIGlmIChmcmFtZSgpLmRvY3VtZW50KCktPnByaW50aW5nKCkpCkBAIC0zODczLDYg KzM4NjgsMTEgQEAgdm9pZCBGcmFtZVZpZXc6OnBhaW50Q29udGVudHMoR3JhcGhpY3NDbwogICAg ICAgICBjb250ZXh0LT5maWxsUmVjdChkaXJ0eVJlY3QsIENvbG9yKDB4RkYsIDAsIDApLCBDb2xv clNwYWNlRGV2aWNlUkdCKTsKICNlbmRpZgogCisgICAgaWYgKG1fbGF5b3V0UGhhc2UgPT0gSW5W aWV3U2l6ZUFkanVzdCkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIEFTU0VSVChtX2xheW91 dFBoYXNlID09IEluUG9zdExheWVyUG9zaXRpb25zVXBkYXRlZEFmdGVyTGF5b3V0IHx8IG1fbGF5 b3V0UGhhc2UgPT0gT3V0c2lkZUxheW91dCk7CisgICAgCiAgICAgUmVuZGVyVmlldyogcmVuZGVy VmlldyA9IHRoaXMtPnJlbmRlclZpZXcoKTsKICAgICBpZiAoIXJlbmRlclZpZXcpIHsKICAgICAg ICAgTE9HX0VSUk9SKCJjYWxsZWQgRnJhbWVWaWV3OjpwYWludCB3aXRoIG5pbCByZW5kZXJlciIp OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCShyZXZpc2lvbiAxODE1NzQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMsNiArMTEz LDcgQEAgcHVibGljOgogICAgIHZvaWQgdW5zY2hlZHVsZVJlbGF5b3V0KCk7CiAgICAgYm9vbCBs YXlvdXRQZW5kaW5nKCkgY29uc3Q7CiAgICAgYm9vbCBpc0luTGF5b3V0KCkgY29uc3QgeyByZXR1 cm4gbV9sYXlvdXRQaGFzZSA9PSBJbkxheW91dDsgfQorICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wg aW5QYWludGFibGVTdGF0ZSgpIHsgcmV0dXJuIG1fbGF5b3V0UGhhc2UgIT0gSW5WaWV3U2l6ZUFk anVzdCAmJiAhaXNJbkxheW91dCgpOyB9CiAKICAgICBSZW5kZXJPYmplY3QqIGxheW91dFJvb3Qo Ym9vbCBvbmx5RHVyaW5nTGF5b3V0ID0gZmFsc2UpIGNvbnN0OwogICAgIHZvaWQgY2xlYXJMYXlv dXRSb290KCkgeyBtX2xheW91dFJvb3QgPSBudWxscHRyOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODE1NzgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxNS0wMy0xNiAgQnJlbnQgRnVsZ2hhbSAgPGJm dWxnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQxIENsaWVudHMgQXJlIE5vdCBSZWxp YWJseSBSZXBhaW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0Mjc1MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjAwNDI0NTM+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hlY2sgd2l0aCB0aGUg RnJhbWVWaWV3IHRvIHNlZSBpZiB3ZSBhcmUgaW4gYW4gaW1tZWRpYXRlbHkgcGFpbnRhYmxlIHN0 YXRlLiBJZiB3ZSBhcmUgbm90LAorICAgICAgICBtYXJrIHRoZSB2aWV3IGFzIGRpcnR5IG9uY2Ug dGhlIF9pbW1lZGlhdGVTY3JvbGxUb1BvaW50IG9wZXJhdGlvbiBpcyBjb21wbGV0ZSBzbyB0aGF0 IHRoZQorICAgICAgICByZWdpb24gd2lsbCBiZSBwYWludGVkIHByb3Blcmx5LgorCisgICAgICAg ICogV2ViVmlldy9XZWJDbGlwVmlldy5tbToKKyAgICAgICAgKC1bV2ViQ2xpcFZpZXcgX2ltbWVk aWF0ZVNjcm9sbFRvUG9pbnQ6XSk6IAorCiAyMDE1LTAzLTE2ICBDb25yYWQgU2h1bHR6ICA8Y29u cmFkX3NodWx0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgY2xpZW50cyB0byBzZWxlY3Rp dmVseSBkaXNhYmxlIHBsdWctaW5zCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YkNsaXBWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Q2xpcFZpZXcubW0JKHJldmlzaW9uIDE4MTU3NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViQ2xpcFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDA1IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDUsIDIwMTUgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTExLDYgKzExMSwxNiBAQCAtICh2 b2lkKV9pbW1lZGlhdGVTY3JvbGxUb1BvaW50OihOU1BvaW50CiAKICAgICBbW3NlbGYgd2luZG93 XSBfZW5hYmxlRGVsYXllZFdpbmRvd0Rpc3BsYXldOwogCisgICAgV2ViRnJhbWVWaWV3ICp3ZWJG cmFtZVZpZXcgPSAoV2ViRnJhbWVWaWV3ICopW1tzZWxmIHN1cGVydmlld10gc3VwZXJ2aWV3XTsK KyAgICBpZiAoW3dlYkZyYW1lVmlldyBpc0tpbmRPZkNsYXNzOltXZWJGcmFtZVZpZXcgY2xhc3Nd XSkgeworICAgICAgICBpZiAoRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoW3dlYkZyYW1lVmlldyB3 ZWJGcmFtZV0pKSB7CisgICAgICAgICAgICBpZiAoRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBjb3Jl RnJhbWUtPnZpZXcoKSkgeworICAgICAgICAgICAgICAgIGlmICghZnJhbWVWaWV3LT5pblBhaW50 YWJsZVN0YXRlKCkpCisgICAgICAgICAgICAgICAgICAgIFtzZWxmIHNldE5lZWRzRGlzcGxheTog WUVTXTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKwogICAgIF9pc1Njcm9sbGlu ZyA9IE5POwogfQogCg==