189525 2018-09-11 14:56:08 -0700 [IntersectionObserver] Implement rootMargin expansion 2018-09-12 10:04:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 159475 1 ajuma ajuma bfulgham cdumez commit-queue dbates esprehn+autocc ews-watchlist kangil.han simon.fraser webkit-bug-importer zalan oldest_to_newest 1458691 0 ajuma 2018-09-11 14:56:08 -0700 Expand the root intersection rectangle by the observer's rootMargin. 1458698 1 349467 ajuma 2018-09-11 14:59:37 -0700 Created attachment 349467 Patch 1458724 2 349467 simon.fraser 2018-09-11 15:32:33 -0700 Comment on attachment 349467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349467&action=review > Source/WebCore/dom/Document.cpp:7498 > + localRootBounds.move(-rootMarginFloatBox.left(), -rootMarginFloatBox.top()); > + localRootBounds.expand(rootMarginFloatBox.left() + rootMarginFloatBox.right(), rootMarginFloatBox.top() + rootMarginFloatBox.bottom()); It feels like there should be a cleaner way to do this. 1458946 3 349548 ajuma 2018-09-12 08:26:36 -0700 Created attachment 349548 Patch for landing 1458947 4 ajuma 2018-09-12 08:30:10 -0700 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 349467 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349467&action=review > > > Source/WebCore/dom/Document.cpp:7498 > > + localRootBounds.move(-rootMarginFloatBox.left(), -rootMarginFloatBox.top()); > > + localRootBounds.expand(rootMarginFloatBox.left() + rootMarginFloatBox.right(), rootMarginFloatBox.top() + rootMarginFloatBox.bottom()); > > It feels like there should be a cleaner way to do this. LayoutRect::expand has an overload that takes a LayoutBoxExtent, so I added a version of FloatRect::expand that takes a FloatBoxExtent. 1459001 5 349548 commit-queue 2018-09-12 10:03:22 -0700 Comment on attachment 349548 Patch for landing Clearing flags on attachment: 349548 Committed r235943: <https://trac.webkit.org/changeset/235943> 1459002 6 commit-queue 2018-09-12 10:03:24 -0700 All reviewed patches have been landed. Closing bug. 1459003 7 webkit-bug-importer 2018-09-12 10:04:21 -0700 <rdar://problem/44386685> 349467 2018-09-11 14:59:37 -0700 2018-09-12 08:26:35 -0700 Patch bug-189525-20180911175936.patch text/plain 5633 ajuma U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNjZjI5MmFlYjgwOGNj ZTEwMWU2MWRhNDk1MjAwNTczYzczY2UzZi4uYzlkNTY3YmVkZjQxZTQ1YzFjNGViMTg0Yzg0MmFi ZDM0OWRlYjVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA5LTExICBBbGkg SnVtYSAgPGFqdW1hQGNocm9taXVtLm9yZz4KKworICAgICAgICBbSW50ZXJzZWN0aW9uT2JzZXJ2 ZXJdIEltcGxlbWVudCByb290TWFyZ2luIGV4cGFuc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwYW5kIHRoZSByb290IGludGVyc2VjdGlvbiBy ZWN0YW5nbGUgYnkgdGhlIG9ic2VydmVyJ3Mgcm9vdE1hcmdpbiB3aGVuIGNvbXB1dGluZworICAg ICAgICBpbnRlcnNlY3Rpb25zLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3Jvb3QtbWFyZ2luLmh0bWwKKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleHBhbmRSb290Qm91 bmRzV2l0aFJvb3RNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUludGVyc2VjdGlv blJlY3RzKToKKyAgICAgICAgKiBwYWdlL0ludGVyc2VjdGlvbk9ic2VydmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpJbnRlcnNlY3Rpb25PYnNlcnZlcjo6cm9vdE1hcmdpbkJveCBjb25zdCk6CisK IDIwMTgtMDktMTEgIEZyZWRlcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFJlZmFjdG9yIGZpbHRlciBsaXN0IGNoZWNraW5nIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CmluZGV4IGZiN2ZjNTk1MzVhNTU1ZDFjNmMwMWU2ODEyYzgwMzU3YWNhNGNlYTUuLjdhNmRlZmI2 NzBjZDFiMTU1NGQ4NmJkOGFkMWRhY2IyNTc3OGIzNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cApAQCAtNzQ4NSw2ICs3NDg1LDE5IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZUludGVyc2VjdGlv bk9ic2VydmVyKEludGVyc2VjdGlvbk9ic2VydmVyJiBvYnNlcnZlcikKICAgICBtX2ludGVyc2Vj dGlvbk9ic2VydmVycy5yZW1vdmVGaXJzdCgmb2JzZXJ2ZXIpOwogfQogCitzdGF0aWMgdm9pZCBl eHBhbmRSb290Qm91bmRzV2l0aFJvb3RNYXJnaW4oRmxvYXRSZWN0JiBsb2NhbFJvb3RCb3VuZHMs IGNvbnN0IExlbmd0aEJveCYgcm9vdE1hcmdpbikKK3sKKyAgICBGbG9hdEJveEV4dGVudCByb290 TWFyZ2luRmxvYXRCb3goCisgICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgocm9vdE1hcmdpbi50 b3AoKSwgbG9jYWxSb290Qm91bmRzLmhlaWdodCgpKSwKKyAgICAgICAgZmxvYXRWYWx1ZUZvckxl bmd0aChyb290TWFyZ2luLnJpZ2h0KCksIGxvY2FsUm9vdEJvdW5kcy53aWR0aCgpKSwKKyAgICAg ICAgZmxvYXRWYWx1ZUZvckxlbmd0aChyb290TWFyZ2luLmJvdHRvbSgpLCBsb2NhbFJvb3RCb3Vu ZHMuaGVpZ2h0KCkpLAorICAgICAgICBmbG9hdFZhbHVlRm9yTGVuZ3RoKHJvb3RNYXJnaW4ubGVm dCgpLCBsb2NhbFJvb3RCb3VuZHMud2lkdGgoKSkKKyAgICApOworCisgICAgbG9jYWxSb290Qm91 bmRzLm1vdmUoLXJvb3RNYXJnaW5GbG9hdEJveC5sZWZ0KCksIC1yb290TWFyZ2luRmxvYXRCb3gu dG9wKCkpOworICAgIGxvY2FsUm9vdEJvdW5kcy5leHBhbmQocm9vdE1hcmdpbkZsb2F0Qm94Lmxl ZnQoKSArIHJvb3RNYXJnaW5GbG9hdEJveC5yaWdodCgpLCByb290TWFyZ2luRmxvYXRCb3gudG9w KCkgKyByb290TWFyZ2luRmxvYXRCb3guYm90dG9tKCkpOworfQorCiBzdGF0aWMgdm9pZCBjb21w dXRlSW50ZXJzZWN0aW9uUmVjdHMoRnJhbWVWaWV3JiBmcmFtZVZpZXcsIEludGVyc2VjdGlvbk9i c2VydmVyJiBvYnNlcnZlciwgRWxlbWVudCYgdGFyZ2V0LCBGbG9hdFJlY3QmIGFic1RhcmdldFJl Y3QsIEZsb2F0UmVjdCYgYWJzSW50ZXJzZWN0aW9uUmVjdCwgRmxvYXRSZWN0JiBhYnNSb290Qm91 bmRzKQogewogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgaW50ZXJzZWN0aW9uIGNvbXB1dGF0aW9u IGZvciB0aGUgY3Jvc3MtZG9jdW1lbnQgY2FzZS4KQEAgLTc0OTUsNyArNzUwOCw2IEBAIHN0YXRp YyB2b2lkIGNvbXB1dGVJbnRlcnNlY3Rpb25SZWN0cyhGcmFtZVZpZXcmIGZyYW1lVmlldywgSW50 ZXJzZWN0aW9uT2JzZXJ2ZXImCiAgICAgaWYgKCF0YXJnZXRSZW5kZXJlcikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgLy8gRklYTUU6IEV4cGFuZCBsb2NhbFJvb3RCb3VuZHMgdXNpbmcgdGhlIG9i c2VydmVyJ3Mgcm9vdE1hcmdpbi4KICAgICBGbG9hdFJlY3QgbG9jYWxSb290Qm91bmRzOwogICAg IFJlbmRlckJsb2NrKiByb290UmVuZGVyZXI7CiAgICAgaWYgKG9ic2VydmVyLnJvb3QoKSkgewpA QCAtNzUxNiw2ICs3NTI4LDggQEAgc3RhdGljIHZvaWQgY29tcHV0ZUludGVyc2VjdGlvblJlY3Rz KEZyYW1lVmlldyYgZnJhbWVWaWV3LCBJbnRlcnNlY3Rpb25PYnNlcnZlciYKICAgICAgICAgbG9j YWxSb290Qm91bmRzID0gZnJhbWVWaWV3LmxheW91dFZpZXdwb3J0UmVjdCgpOwogICAgIH0KIAor ICAgIGV4cGFuZFJvb3RCb3VuZHNXaXRoUm9vdE1hcmdpbihsb2NhbFJvb3RCb3VuZHMsIG9ic2Vy dmVyLnJvb3RNYXJnaW5Cb3goKSk7CisKICAgICBMYXlvdXRSZWN0IGxvY2FsVGFyZ2V0Qm91bmRz OwogICAgIGlmIChpczxSZW5kZXJCb3g+KCp0YXJnZXRSZW5kZXJlcikpCiAgICAgICAgIGxvY2Fs VGFyZ2V0Qm91bmRzID0gZG93bmNhc3Q8UmVuZGVyQm94Pih0YXJnZXRSZW5kZXJlciktPmJvcmRl ckJvdW5kaW5nQm94KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ludGVyc2Vj dGlvbk9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ludGVyc2VjdGlvbk9ic2VydmVy LmgKaW5kZXggZjUwODllMDRmZTkyZmRhNDJhNzJhMWZjYmM0MWFkYmM4MjNiMWVhNC4uMDkyYzRl MWY1MDBiNDkxMjRjNjkyNGVlNDk1OGUxMTZkZGNmZGM2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9JbnRlcnNlY3Rpb25PYnNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvSW50ZXJzZWN0aW9uT2JzZXJ2ZXIuaApAQCAtNzIsNiArNzIsNyBAQCBwdWJsaWM6CiAKICAg ICBFbGVtZW50KiByb290KCkgY29uc3QgeyByZXR1cm4gbV9yb290OyB9CiAgICAgU3RyaW5nIHJv b3RNYXJnaW4oKSBjb25zdDsKKyAgICBjb25zdCBMZW5ndGhCb3gmIHJvb3RNYXJnaW5Cb3goKSBj b25zdCB7IHJldHVybiBtX3Jvb3RNYXJnaW47IH0KICAgICBjb25zdCBWZWN0b3I8ZG91YmxlPiYg dGhyZXNob2xkcygpIGNvbnN0IHsgcmV0dXJuIG1fdGhyZXNob2xkczsgfQogICAgIGNvbnN0IFZl Y3RvcjxFbGVtZW50Kj4gb2JzZXJ2YXRpb25UYXJnZXRzKCkgY29uc3QgeyByZXR1cm4gbV9vYnNl cnZhdGlvblRhcmdldHM7IH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggZTYw YWJlZTQxODlmMTQ0MmFmYzUyYzU5ODA5OTMwNWEyMDE3NWVkMS4uMTVkZjlmYzNjMTNmN2RhYzM5 ODAwYjEyYmY5MmU3MTQxNjE1ZDNmYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBA IC0xICsxLDEyIEBACisyMDE4LTA5LTExICBBbGkgSnVtYSAgPGFqdW1hQGNocm9taXVtLm9yZz4K KworICAgICAgICBbSW50ZXJzZWN0aW9uT2JzZXJ2ZXJdIEltcGxlbWVudCByb290TWFyZ2luIGV4 cGFuc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTg5NTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmViYXNsaW5lIGV4cGVjdGF0aW9uIGZvciB0ZXN0IHRoYXQgbm93IHBhc3Nlcy4KKworICAgICAg ICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvcm9vdC1tYXJnaW4t ZXhwZWN0ZWQudHh0OgorCiA9PSBSb2xsZWQgb3ZlciB0byBDaGFuZ2VMb2ctMjAxOC0wOS0xMSA9 PQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvcm9vdC1tYXJnaW4tZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2 ZXIvcm9vdC1tYXJnaW4tZXhwZWN0ZWQudHh0CmluZGV4IDNjMzY2OTBkMGIzZDEyMTY2MTU2YTI0 ODc2YjZjNDk2Y2RmOWU4M2QuLjlkOWFiMmFiYTFmN2Q4NjY0NzZmNzNjMzVmYjE4MzgwN2JhNjAz OWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3Jvb3QtbWFyZ2luLWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ludGVyc2VjdGlvbi1v YnNlcnZlci9yb290LW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTEsOCArMSw4IEBACiAgIAogCiBQ QVNTIFJvb3QgbWFyZ2luIHRlc3RzIAotRkFJTCBGaXJzdCByQUYuIGFzc2VydF9lcXVhbHM6IGVu dHJpZXNbMF0ucm9vdEJvdW5kcy5sZWZ0IGV4cGVjdGVkIC0zMCBidXQgZ290IDAKLUZBSUwgZG9j dW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxMZWZ0ID0gMTAwIGFzc2VydF9lcXVhbHM6IGVu dHJpZXMubGVuZ3RoIGV4cGVjdGVkIDIgYnV0IGdvdCAxCi1GQUlMIGRvY3VtZW50LnNjcm9sbGlu Z0VsZW1lbnQuc2Nyb2xsVG9wID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdo dCArIDIwMCBhc3NlcnRfZXF1YWxzOiBlbnRyaWVzLmxlbmd0aCBleHBlY3RlZCAyIGJ1dCBnb3Qg MQotRkFJTCBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbFRvcCA9IGRvY3VtZW50LmRv Y3VtZW50RWxlbWVudC5jbGllbnRIZWlnaHQgKyAzMDAgYXNzZXJ0X2VxdWFsczogZW50cmllcy5s ZW5ndGggZXhwZWN0ZWQgMyBidXQgZ290IDEKK1BBU1MgRmlyc3QgckFGLiAKK1BBU1MgZG9jdW1l bnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxMZWZ0ID0gMTAwIAorUEFTUyBkb2N1bWVudC5zY3Jv bGxpbmdFbGVtZW50LnNjcm9sbFRvcCA9IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5jbGllbnRI ZWlnaHQgKyAyMDAgCitQQVNTIGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsVG9wID0g ZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdodCArIDMwMCAKIAo= 349548 2018-09-12 08:26:36 -0700 2018-09-12 10:03:22 -0700 Patch for landing bug-189525-20180912112636.patch text/plain 6502 ajuma U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNjZjI5MmFlYjgwOGNj ZTEwMWU2MWRhNDk1MjAwNTczYzczY2UzZi4uNTk3NjA4YzcyNjdjZTFkZTAxYzc1NWQzM2QxMGMw OTY1YzBlOWM0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA5LTEyICBBbGkg SnVtYSAgPGFqdW1hQGNocm9taXVtLm9yZz4KKworICAgICAgICBbSW50ZXJzZWN0aW9uT2JzZXJ2 ZXJdIEltcGxlbWVudCByb290TWFyZ2luIGV4cGFuc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg U2ltb24gRnJhc2VyLgorCisgICAgICAgIEV4cGFuZCB0aGUgcm9vdCBpbnRlcnNlY3Rpb24gcmVj dGFuZ2xlIGJ5IHRoZSBvYnNlcnZlcidzIHJvb3RNYXJnaW4gd2hlbiBjb21wdXRpbmcKKyAgICAg ICAgaW50ZXJzZWN0aW9ucy4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2ludGVyc2VjdGlvbi1vYnNlcnZlci9yb290LW1hcmdpbi5odG1sCisKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZXhwYW5kUm9vdEJvdW5k c1dpdGhSb290TWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVJbnRlcnNlY3Rpb25S ZWN0cyk6CisgICAgICAgICogcGFnZS9JbnRlcnNlY3Rpb25PYnNlcnZlci5oOgorICAgICAgICAo V2ViQ29yZTo6SW50ZXJzZWN0aW9uT2JzZXJ2ZXI6OnJvb3RNYXJnaW5Cb3ggY29uc3QpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6 RmxvYXRSZWN0OjpleHBhbmQpOgorCiAyMDE4LTA5LTExICBGcmVkZXJpYyBXYW5nICA8ZndhbmdA aWdhbGlhLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBmaWx0ZXIgbGlzdCBjaGVja2luZyBjb2Rl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBmYjdmYzU5NTM1YTU1NWQxYzZjMDFlNjgxMmM4 MDM1N2FjYTRjZWE1Li41MWY2NjBlMjE2NjZjYjcyY2I5OTE0YWFkOTM4NWRhMmQ5YWZiYzYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTc0ODUsNiArNzQ4NSwxOCBAQCB2b2lkIERvY3Vt ZW50OjpyZW1vdmVJbnRlcnNlY3Rpb25PYnNlcnZlcihJbnRlcnNlY3Rpb25PYnNlcnZlciYgb2Jz ZXJ2ZXIpCiAgICAgbV9pbnRlcnNlY3Rpb25PYnNlcnZlcnMucmVtb3ZlRmlyc3QoJm9ic2VydmVy KTsKIH0KIAorc3RhdGljIHZvaWQgZXhwYW5kUm9vdEJvdW5kc1dpdGhSb290TWFyZ2luKEZsb2F0 UmVjdCYgbG9jYWxSb290Qm91bmRzLCBjb25zdCBMZW5ndGhCb3gmIHJvb3RNYXJnaW4pCit7Cisg ICAgRmxvYXRCb3hFeHRlbnQgcm9vdE1hcmdpbkZsb2F0Qm94KAorICAgICAgICBmbG9hdFZhbHVl Rm9yTGVuZ3RoKHJvb3RNYXJnaW4udG9wKCksIGxvY2FsUm9vdEJvdW5kcy5oZWlnaHQoKSksCisg ICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgocm9vdE1hcmdpbi5yaWdodCgpLCBsb2NhbFJvb3RC b3VuZHMud2lkdGgoKSksCisgICAgICAgIGZsb2F0VmFsdWVGb3JMZW5ndGgocm9vdE1hcmdpbi5i b3R0b20oKSwgbG9jYWxSb290Qm91bmRzLmhlaWdodCgpKSwKKyAgICAgICAgZmxvYXRWYWx1ZUZv ckxlbmd0aChyb290TWFyZ2luLmxlZnQoKSwgbG9jYWxSb290Qm91bmRzLndpZHRoKCkpCisgICAg KTsKKworICAgIGxvY2FsUm9vdEJvdW5kcy5leHBhbmQocm9vdE1hcmdpbkZsb2F0Qm94KTsKK30K Kwogc3RhdGljIHZvaWQgY29tcHV0ZUludGVyc2VjdGlvblJlY3RzKEZyYW1lVmlldyYgZnJhbWVW aWV3LCBJbnRlcnNlY3Rpb25PYnNlcnZlciYgb2JzZXJ2ZXIsIEVsZW1lbnQmIHRhcmdldCwgRmxv YXRSZWN0JiBhYnNUYXJnZXRSZWN0LCBGbG9hdFJlY3QmIGFic0ludGVyc2VjdGlvblJlY3QsIEZs b2F0UmVjdCYgYWJzUm9vdEJvdW5kcykKIHsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50IGludGVy c2VjdGlvbiBjb21wdXRhdGlvbiBmb3IgdGhlIGNyb3NzLWRvY3VtZW50IGNhc2UuCkBAIC03NDk1 LDcgKzc1MDcsNiBAQCBzdGF0aWMgdm9pZCBjb21wdXRlSW50ZXJzZWN0aW9uUmVjdHMoRnJhbWVW aWV3JiBmcmFtZVZpZXcsIEludGVyc2VjdGlvbk9ic2VydmVyJgogICAgIGlmICghdGFyZ2V0UmVu ZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBFeHBhbmQgbG9jYWxSb290 Qm91bmRzIHVzaW5nIHRoZSBvYnNlcnZlcidzIHJvb3RNYXJnaW4uCiAgICAgRmxvYXRSZWN0IGxv Y2FsUm9vdEJvdW5kczsKICAgICBSZW5kZXJCbG9jayogcm9vdFJlbmRlcmVyOwogICAgIGlmIChv YnNlcnZlci5yb290KCkpIHsKQEAgLTc1MTYsNiArNzUyNyw4IEBAIHN0YXRpYyB2b2lkIGNvbXB1 dGVJbnRlcnNlY3Rpb25SZWN0cyhGcmFtZVZpZXcmIGZyYW1lVmlldywgSW50ZXJzZWN0aW9uT2Jz ZXJ2ZXImCiAgICAgICAgIGxvY2FsUm9vdEJvdW5kcyA9IGZyYW1lVmlldy5sYXlvdXRWaWV3cG9y dFJlY3QoKTsKICAgICB9CiAKKyAgICBleHBhbmRSb290Qm91bmRzV2l0aFJvb3RNYXJnaW4obG9j YWxSb290Qm91bmRzLCBvYnNlcnZlci5yb290TWFyZ2luQm94KCkpOworCiAgICAgTGF5b3V0UmVj dCBsb2NhbFRhcmdldEJvdW5kczsKICAgICBpZiAoaXM8UmVuZGVyQm94PigqdGFyZ2V0UmVuZGVy ZXIpKQogICAgICAgICBsb2NhbFRhcmdldEJvdW5kcyA9IGRvd25jYXN0PFJlbmRlckJveD4odGFy Z2V0UmVuZGVyZXIpLT5ib3JkZXJCb3VuZGluZ0JveCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9JbnRlcnNlY3Rpb25PYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9J bnRlcnNlY3Rpb25PYnNlcnZlci5oCmluZGV4IGY1MDg5ZTA0ZmU5MmZkYTQyYTcyYTFmY2JjNDFh ZGJjODIzYjFlYTQuLjA5MmM0ZTFmNTAwYjQ5MTI0YzY5MjRlZTQ5NThlMTE2ZGRjZmRjNjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvSW50ZXJzZWN0aW9uT2JzZXJ2ZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ludGVyc2VjdGlvbk9ic2VydmVyLmgKQEAgLTcyLDYgKzcy LDcgQEAgcHVibGljOgogCiAgICAgRWxlbWVudCogcm9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9v dDsgfQogICAgIFN0cmluZyByb290TWFyZ2luKCkgY29uc3Q7CisgICAgY29uc3QgTGVuZ3RoQm94 JiByb290TWFyZ2luQm94KCkgY29uc3QgeyByZXR1cm4gbV9yb290TWFyZ2luOyB9CiAgICAgY29u c3QgVmVjdG9yPGRvdWJsZT4mIHRocmVzaG9sZHMoKSBjb25zdCB7IHJldHVybiBtX3RocmVzaG9s ZHM7IH0KICAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+IG9ic2VydmF0aW9uVGFyZ2V0cygpIGNv bnN0IHsgcmV0dXJuIG1fb2JzZXJ2YXRpb25UYXJnZXRzOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmgKaW5kZXggYTZkZDIxMDZmZTNjNmYzNjZjM2Fm NGU4MDgwMTYzZWMwNjJkZmQzNS4uOTNhY2FkNTM2MTg1YTZjODllMGEzZTg4ODU4YWU2OWU1ODJj ZDNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRS ZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmgK QEAgLTI3LDYgKzI3LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiRmxvYXRQb2ludC5o IgorI2luY2x1ZGUgIkxlbmd0aEJveC5oIgogCiAjaWYgVVNFKENHKQogdHlwZWRlZiBzdHJ1Y3Qg Q0dSZWN0IENHUmVjdDsKQEAgLTEwOCw2ICsxMDksMTEgQEAgcHVibGljOgogICAgIHZvaWQgbW92 ZShmbG9hdCBkeCwgZmxvYXQgZHkpIHsgbV9sb2NhdGlvbi5tb3ZlKGR4LCBkeSk7IH0KIAogICAg IHZvaWQgZXhwYW5kKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkgeyBtX3NpemUgKz0gc2l6ZTsgfQor ICAgIHZvaWQgZXhwYW5kKGNvbnN0IEZsb2F0Qm94RXh0ZW50JiBib3gpCisgICAgeworICAgICAg ICBtX2xvY2F0aW9uLm1vdmUoLWJveC5sZWZ0KCksIC1ib3gudG9wKCkpOworICAgICAgICBtX3Np emUuZXhwYW5kKGJveC5sZWZ0KCkgKyBib3gucmlnaHQoKSwgYm94LnRvcCgpICsgYm94LmJvdHRv bSgpKTsKKyAgICB9CiAgICAgdm9pZCBleHBhbmQoZmxvYXQgZHcsIGZsb2F0IGRoKSB7IG1fc2l6 ZS5leHBhbmQoZHcsIGRoKTsgfQogICAgIHZvaWQgY29udHJhY3QoY29uc3QgRmxvYXRTaXplJiBz aXplKSB7IG1fc2l6ZSAtPSBzaXplOyB9CiAgICAgdm9pZCBjb250cmFjdChmbG9hdCBkdywgZmxv YXQgZGgpIHsgbV9zaXplLmV4cGFuZCgtZHcsIC1kaCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh bmdlTG9nCmluZGV4IGU2MGFiZWU0MTg5ZjE0NDJhZmM1MmM1OTgwOTkzMDVhMjAxNzVlZDEuLjU3 MTNhMmI4NDEzY2U2OGM2ZGFmN2ZlOTRjNmVhMjc2NDk5NzliZjcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZwpAQCAtMSArMSwxMiBAQAorMjAxOC0wOS0xMiAgQWxpIEp1bWEgIDxhanVt YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0ludGVyc2VjdGlvbk9ic2VydmVyXSBJbXBsZW1l bnQgcm9vdE1hcmdpbiBleHBhbnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTUyNQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNl ci4KKworICAgICAgICBSZWJhc2xpbmUgZXhwZWN0YXRpb24gZm9yIHRlc3QgdGhhdCBub3cgcGFz c2VzLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2ludGVyc2VjdGlvbi1vYnNlcnZl ci9yb290LW1hcmdpbi1leHBlY3RlZC50eHQ6CisKID09IFJvbGxlZCBvdmVyIHRvIENoYW5nZUxv Zy0yMDE4LTA5LTExID09CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2ludGVyc2VjdGlvbi1vYnNlcnZlci9yb290LW1hcmdpbi1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ludGVy c2VjdGlvbi1vYnNlcnZlci9yb290LW1hcmdpbi1leHBlY3RlZC50eHQKaW5kZXggM2MzNjY5MGQw YjNkMTIxNjYxNTZhMjQ4NzZiNmM0OTZjZGY5ZTgzZC4uOWQ5YWIyYWJhMWY3ZDg2NjQ3NmY3M2Mz NWZiMTgzODA3YmE2MDM5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvcm9vdC1tYXJnaW4tZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv aW50ZXJzZWN0aW9uLW9ic2VydmVyL3Jvb3QtbWFyZ2luLWV4cGVjdGVkLnR4dApAQCAtMSw4ICsx LDggQEAKICAgCiAKIFBBU1MgUm9vdCBtYXJnaW4gdGVzdHMgCi1GQUlMIEZpcnN0IHJBRi4gYXNz ZXJ0X2VxdWFsczogZW50cmllc1swXS5yb290Qm91bmRzLmxlZnQgZXhwZWN0ZWQgLTMwIGJ1dCBn b3QgMAotRkFJTCBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbExlZnQgPSAxMDAgYXNz ZXJ0X2VxdWFsczogZW50cmllcy5sZW5ndGggZXhwZWN0ZWQgMiBidXQgZ290IDEKLUZBSUwgZG9j dW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1l bnQuY2xpZW50SGVpZ2h0ICsgMjAwIGFzc2VydF9lcXVhbHM6IGVudHJpZXMubGVuZ3RoIGV4cGVj dGVkIDIgYnV0IGdvdCAxCi1GQUlMIGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsVG9w ID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdodCArIDMwMCBhc3NlcnRfZXF1 YWxzOiBlbnRyaWVzLmxlbmd0aCBleHBlY3RlZCAzIGJ1dCBnb3QgMQorUEFTUyBGaXJzdCByQUYu IAorUEFTUyBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbExlZnQgPSAxMDAgCitQQVNT IGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsVG9wID0gZG9jdW1lbnQuZG9jdW1lbnRF bGVtZW50LmNsaWVudEhlaWdodCArIDIwMCAKK1BBU1MgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVu dC5zY3JvbGxUb3AgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuY2xpZW50SGVpZ2h0ICsgMzAw IAogCg==