135582 2014-08-04 17:10:47 -0700 Selection services menu dropdown is in the wrong place when selecting some text on Yelp 2014-08-04 18:41:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton beidson enrica hyatt sam simon.fraser oldest_to_newest 1026728 0 thorton 2014-08-04 17:10:47 -0700 <rdar://problem/17837636> 1026729 1 235993 thorton 2014-08-04 17:11:59 -0700 Created attachment 235993 patch 1026736 2 235993 simon.fraser 2014-08-04 17:26:49 -0700 Comment on attachment 235993 patch View in context: https://bugs.webkit.org/attachment.cgi?id=235993&action=review > Source/WebCore/editing/SelectionRectGatherer.cpp:56 > + absoluteGapRects.uniteLeft(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.left())).boundingBox())); > + absoluteGapRects.uniteCenter(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.center())).boundingBox())); > + absoluteGapRects.uniteRight(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.right())).boundingBox())); This is all gross and horrible and services should not be so tied to selection code. 1026737 3 thorton 2014-08-04 17:28:53 -0700 (In reply to comment #2) > (From update of attachment 235993 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=235993&action=review > > > Source/WebCore/editing/SelectionRectGatherer.cpp:56 > > + absoluteGapRects.uniteLeft(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.left())).boundingBox())); > > + absoluteGapRects.uniteCenter(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.center())).boundingBox())); > > + absoluteGapRects.uniteRight(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.right())).boundingBox())); > > This is all gross and horrible and services should not be so tied to selection code. +1 Thank you. http://trac.webkit.org/changeset/172013 1026756 4 235997 thorton 2014-08-04 18:36:13 -0700 Created attachment 235997 crash fix 1026759 5 235997 enrica 2014-08-04 18:38:19 -0700 Comment on attachment 235997 crash fix Good boy! 1026762 6 thorton 2014-08-04 18:41:10 -0700 Stop the crashes: http://trac.webkit.org/changeset/172018 235993 2014-08-04 17:11:59 -0700 2014-08-04 17:26:49 -0700 patch selection1.diff text/plain 5141 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZWNiMmJkLi42NTQ1Y2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTQtMDgtMDQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgU2VsZWN0aW9uIHNlcnZpY2VzIG1lbnUgZHJvcGRvd24gaXMgaW4gdGhlIHdyb25n IHBsYWNlIHdoZW4gc2VsZWN0aW5nIHNvbWUgdGV4dCBvbiBZZWxwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1ODIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE3ODM3NjM2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2VsZWN0aW9uUmVjdEdhdGhlcmVyOjphZGRSZWN0KToKKyAgICAgICAgKFdlYkNv cmU6OlNlbGVjdGlvblJlY3RHYXRoZXJlcjo6YWRkR2FwUmVjdHMpOgorICAgICAgICAoV2ViQ29y ZTo6U2VsZWN0aW9uUmVjdEdhdGhlcmVyOjphZGRSZWN0cyk6IERlbGV0ZWQuCisgICAgICAgIFJl bmFtZSBhZGRSZWN0cyB0byBhZGRHYXBSZWN0cyBmb3IgY2xhcml0eS4KKyAgICAgICAgTWFwIHJl Y3RzIGFuZCBnYXBSZWN0cyB0byBhYnNvbHV0ZSBSZW5kZXJWaWV3IGNvb3JkaW5hdGVzIHNvIHRo YXQKKyAgICAgICAgdGhleSBhcmUgaW4gYSBmb3JtIFdlYktpdDIgY2FuIHVzZS4gUHJldmlvdXNs eSB0aGV5IHdlcmUgc29tZXRpbWVzCisgICAgICAgIHJlbGF0aXZlIHRvIGEgZGlmZmVyZW50IHJl cGFpbnQgY29udGFpbmVyLCBidXQgdGhhdCBpbmZvcm1hdGlvbiB3YXMKKyAgICAgICAgbG9zdCB3 aGVuIG1vdmluZyB0aHJvdWdoIFNlbGVjdGlvblJlY3RHYXRoZXJlci4KKworICAgICAgICBJZGVh bGx5IHdlIHdvdWxkIGtlZXAgc2VsZWN0aW9uIHJlY3RzIGFzIGZ1bGwgcXVhZHMgaW5zdGVhZCBv ZiByZWN0cworICAgICAgICBmb3IgbW9yZSBvZiB0aGVpciBsaWZlLCBidXQgdGhhdCBwcm9ibGVt IGlzIG11Y2ggZGVlcGVyIHRoYW4ganVzdCBTZWxlY3Rpb25SZWN0R2F0aGVyZXIuCisKKyAgICAg ICAgKiBlZGl0aW5nL1NlbGVjdGlvblJlY3RHYXRoZXJlci5oOgorICAgICAgICBBZGQgYSBjb21t ZW50IGNsYXJpZnlpbmcgdGhlIGNvb3JkaW5hdGUgc3BhY2Ugb2YgdGhlIHN0b3JlZCBzZWxlY3Rp b24gcmVjdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJWaWV3OjphcHBseVN1YnRyZWVTZWxlY3Rpb24pOgorICAgICAgICBS ZW5hbWUgYWRkUmVjdHMgdG8gYWRkR2FwUmVjdHMgZm9yIGNsYXJpdHkuCisKIDIwMTQtMDgtMDQg IENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogU2Vs ZWN0VGV4dCBmdW5jdGlvbmFsaXR5IGFsd2F5cyBzZWxlY3RzIHRleHQgYWZ0ZXIgY3VycmVudCBz ZWxlY3Rpb24gZXZlbiBpZiBjbG9zZXIgc2VsZWN0aW9uIGlzIGJlaGluZCBpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuY3BwCmluZGV4IDVhN2Rk YjguLjFlNzc4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9u UmVjdEdhdGhlcmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJl Y3RHYXRoZXJlci5jcHAKQEAgLTQwLDE1ICs0MCwyMSBAQCBTZWxlY3Rpb25SZWN0R2F0aGVyZXI6 OlNlbGVjdGlvblJlY3RHYXRoZXJlcihSZW5kZXJWaWV3JiByZW5kZXJWaWV3KQogewogfQogCi12 b2lkIFNlbGVjdGlvblJlY3RHYXRoZXJlcjo6YWRkUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0 KQordm9pZCBTZWxlY3Rpb25SZWN0R2F0aGVyZXI6OmFkZFJlY3QoUmVuZGVyTGF5ZXJNb2RlbE9i amVjdCAqcmVwYWludENvbnRhaW5lciwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKIHsKLSAgICBp ZiAoIXJlY3QuaXNFbXB0eSgpKQotICAgICAgICBtX3JlY3RzLmFwcGVuZChyZWN0KTsKKyAgICBp ZiAoIXJlY3QuaXNFbXB0eSgpKSB7CisgICAgICAgIExheW91dFJlY3QgYWJzb2x1dGVSZWN0KHJl cGFpbnRDb250YWluZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFkKHJlY3QpKS5ib3Vu ZGluZ0JveCgpKTsKKyAgICAgICAgbV9yZWN0cy5hcHBlbmQoYWJzb2x1dGVSZWN0KTsKKyAgICB9 CiB9CiAKLXZvaWQgU2VsZWN0aW9uUmVjdEdhdGhlcmVyOjphZGRSZWN0cyhjb25zdCBHYXBSZWN0 cyYgcmVjdHMpCit2b2lkIFNlbGVjdGlvblJlY3RHYXRoZXJlcjo6YWRkR2FwUmVjdHMoUmVuZGVy TGF5ZXJNb2RlbE9iamVjdCAqcmVwYWludENvbnRhaW5lciwgY29uc3QgR2FwUmVjdHMmIHJlY3Rz KQogewotICAgIG1fZ2FwUmVjdHMuYXBwZW5kKHJlY3RzKTsKKyAgICBHYXBSZWN0cyBhYnNvbHV0 ZUdhcFJlY3RzOworICAgIGFic29sdXRlR2FwUmVjdHMudW5pdGVMZWZ0KExheW91dFJlY3QocmVw YWludENvbnRhaW5lci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFF1YWQocmVjdHMubGVmdCgp KSkuYm91bmRpbmdCb3goKSkpOworICAgIGFic29sdXRlR2FwUmVjdHMudW5pdGVDZW50ZXIoTGF5 b3V0UmVjdChyZXBhaW50Q29udGFpbmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UXVhZChy ZWN0cy5jZW50ZXIoKSkpLmJvdW5kaW5nQm94KCkpKTsKKyAgICBhYnNvbHV0ZUdhcFJlY3RzLnVu aXRlUmlnaHQoTGF5b3V0UmVjdChyZXBhaW50Q29udGFpbmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFk KEZsb2F0UXVhZChyZWN0cy5yaWdodCgpKSkuYm91bmRpbmdCb3goKSkpOworICAgIG1fZ2FwUmVj dHMuYXBwZW5kKGFic29sdXRlR2FwUmVjdHMpOwogfQogCiBTZWxlY3Rpb25SZWN0R2F0aGVyZXI6 Ok5vdGlmaWVyOjpOb3RpZmllcihTZWxlY3Rpb25SZWN0R2F0aGVyZXImIGdhdGhlcmVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uUmVjdEdhdGhlcmVyLmgKaW5kZXggZjg3 ZTUyZi4uZDM2ZTQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rp b25SZWN0R2F0aGVyZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJl Y3RHYXRoZXJlci5oCkBAIC0zNCw2ICszNCw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNs YXNzIExheW91dFJlY3Q7CitjbGFzcyBSZW5kZXJMYXllck1vZGVsT2JqZWN0OwogY2xhc3MgUmVu ZGVyVmlldzsKIAogc3RydWN0IEdhcFJlY3RzOwpAQCAtNDQsOCArNDUsOCBAQCBjbGFzcyBTZWxl Y3Rpb25SZWN0R2F0aGVyZXIgewogcHVibGljOgogICAgIFNlbGVjdGlvblJlY3RHYXRoZXJlcihS ZW5kZXJWaWV3Jik7CiAKLSAgICB2b2lkIGFkZFJlY3QoY29uc3QgTGF5b3V0UmVjdCYpOwotICAg IHZvaWQgYWRkUmVjdHMoY29uc3QgR2FwUmVjdHMmKTsKKyAgICB2b2lkIGFkZFJlY3QoUmVuZGVy TGF5ZXJNb2RlbE9iamVjdCAqcmVwYWludENvbnRhaW5lciwgY29uc3QgTGF5b3V0UmVjdCYpOwor ICAgIHZvaWQgYWRkR2FwUmVjdHMoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCAqcmVwYWludENvbnRh aW5lciwgY29uc3QgR2FwUmVjdHMmKTsKIAogICAgIGNsYXNzIE5vdGlmaWVyIHsKICAgICAgICAg V1RGX01BS0VfTk9OQ09QWUFCTEUoTm90aWZpZXIpOwpAQCAtNjEsNiArNjIsOCBAQCBwdWJsaWM6 CiAgICAgCiBwcml2YXRlOgogICAgIFJlbmRlclZpZXcmIG1fcmVuZGVyVmlldzsKKworICAgIC8v IEFsbCByZWN0cyBhcmUgaW4gUmVuZGVyVmlldyBjb29yZGluYXRlcy4KICAgICBWZWN0b3I8TGF5 b3V0UmVjdD4gbV9yZWN0czsKICAgICBWZWN0b3I8R2FwUmVjdHM+IG1fZ2FwUmVjdHM7CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmluZGV4IDJmMjY2MDUuLjMxMzE1 NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTEwMTMsNyAr MTAxMyw3IEBAIHZvaWQgUmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlv blN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqCiAKICNpZiBFTkFCTEUoU0VSVklDRV9D T05UUk9MUykKICAgICAgICAgICAgIGZvciAoYXV0byYgcmVjdCA6IHNlbGVjdGlvbkluZm8tPmNv bGxlY3RlZFNlbGVjdGlvblJlY3RzKCkpCi0gICAgICAgICAgICAgICAgbV9zZWxlY3Rpb25SZWN0 R2F0aGVyZXIuYWRkUmVjdChyZWN0KTsKKyAgICAgICAgICAgICAgICBtX3NlbGVjdGlvblJlY3RH YXRoZXJlci5hZGRSZWN0KHNlbGVjdGlvbkluZm8tPnJlcGFpbnRDb250YWluZXIoKSwgcmVjdCk7 CiAjZW5kaWYKIAogICAgICAgICAgICAgbmV3U2VsZWN0ZWRPYmplY3RzLnNldChvLCBXVEY6Om1v dmUoc2VsZWN0aW9uSW5mbykpOwpAQCAtMTAyNyw3ICsxMDI3LDcgQEAgdm9pZCBSZW5kZXJWaWV3 OjphcHBseVN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRl ck9iamVjdCoKICAgICAgICAgICAgICAgICBjYiA9IGNiLT5jb250YWluaW5nQmxvY2soKTsKIAog I2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgICAgICAgICAgICAgIG1fc2VsZWN0aW9u UmVjdEdhdGhlcmVyLmFkZFJlY3RzKGJsb2NrSW5mby0+cmVjdHMoKSk7CisgICAgICAgICAgICAg ICAgbV9zZWxlY3Rpb25SZWN0R2F0aGVyZXIuYWRkR2FwUmVjdHMoYmxvY2tJbmZvLT5yZXBhaW50 Q29udGFpbmVyKCksIGJsb2NrSW5mby0+cmVjdHMoKSk7CiAjZW5kaWYKICAgICAgICAgICAgIH0K ICAgICAgICAgfQo= 235997 2014-08-04 18:36:13 -0700 2014-08-04 18:38:19 -0700 crash fix crash.diff text/plain 2868 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NTQ1Y2I2Li5lZDcwZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTQtMDgtMDQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgTG90cyBvZiBjcmFzaGVzIGluIFdlYktpdDEgYWZ0ZXIgcjE3MjAxMy4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvU2Vs ZWN0aW9uUmVjdEdhdGhlcmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvblJlY3RH YXRoZXJlcjo6YWRkUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25SZWN0R2F0aGVy ZXI6OmFkZEdhcFJlY3RzKToKKyAgICAgICAgRG9uJ3QgdHJ5IHRvIGRvIGxvY2FsLXRvLWFic29s dXRlIGNvb3JkaW5hdGUgY29udmVyc2lvbiBpZiB3ZSBkb24ndCBoYXZlCisgICAgICAgIGEgcmVw YWludCBjb250YWluZXIsIHdoaWNoIGhhcHBlbnMgYSBsb3QgaW4gV2ViS2l0MS4KKworMjAxNC0w OC0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBT ZWxlY3Rpb24gc2VydmljZXMgbWVudSBkcm9wZG93biBpcyBpbiB0aGUgd3JvbmcgcGxhY2Ugd2hl biBzZWxlY3Rpbmcgc29tZSB0ZXh0IG9uIFllbHAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTU4MgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc4 Mzc2MzY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJlY3RH YXRoZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJlY3RHYXRoZXJl ci5jcHAKaW5kZXggMWU3NzgwOS4uNDkyMGIzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvU2VsZWN0aW9uUmVjdEdhdGhlcmVyLmNwcApAQCAtNDMsMTggKzQzLDIzIEBAIFNlbGVj dGlvblJlY3RHYXRoZXJlcjo6U2VsZWN0aW9uUmVjdEdhdGhlcmVyKFJlbmRlclZpZXcmIHJlbmRl clZpZXcpCiB2b2lkIFNlbGVjdGlvblJlY3RHYXRoZXJlcjo6YWRkUmVjdChSZW5kZXJMYXllck1v ZGVsT2JqZWN0ICpyZXBhaW50Q29udGFpbmVyLCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KQogewog ICAgIGlmICghcmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgTGF5b3V0UmVjdCBhYnNvbHV0ZVJl Y3QocmVwYWludENvbnRhaW5lci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFF1YWQocmVjdCkp LmJvdW5kaW5nQm94KCkpOwotICAgICAgICBtX3JlY3RzLmFwcGVuZChhYnNvbHV0ZVJlY3QpOwor ICAgICAgICBpZiAocmVwYWludENvbnRhaW5lcikKKyAgICAgICAgICAgIG1fcmVjdHMuYXBwZW5k KExheW91dFJlY3QocmVwYWludENvbnRhaW5lci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFF1 YWQocmVjdCkpLmJvdW5kaW5nQm94KCkpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9y ZWN0cy5hcHBlbmQocmVjdCk7CiAgICAgfQogfQogCiB2b2lkIFNlbGVjdGlvblJlY3RHYXRoZXJl cjo6YWRkR2FwUmVjdHMoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCAqcmVwYWludENvbnRhaW5lciwg Y29uc3QgR2FwUmVjdHMmIHJlY3RzKQogewotICAgIEdhcFJlY3RzIGFic29sdXRlR2FwUmVjdHM7 Ci0gICAgYWJzb2x1dGVHYXBSZWN0cy51bml0ZUxlZnQoTGF5b3V0UmVjdChyZXBhaW50Q29udGFp bmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UXVhZChyZWN0cy5sZWZ0KCkpKS5ib3VuZGlu Z0JveCgpKSk7Ci0gICAgYWJzb2x1dGVHYXBSZWN0cy51bml0ZUNlbnRlcihMYXlvdXRSZWN0KHJl cGFpbnRDb250YWluZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFkKHJlY3RzLmNlbnRl cigpKSkuYm91bmRpbmdCb3goKSkpOwotICAgIGFic29sdXRlR2FwUmVjdHMudW5pdGVSaWdodChM YXlvdXRSZWN0KHJlcGFpbnRDb250YWluZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFk KHJlY3RzLnJpZ2h0KCkpKS5ib3VuZGluZ0JveCgpKSk7Ci0gICAgbV9nYXBSZWN0cy5hcHBlbmQo YWJzb2x1dGVHYXBSZWN0cyk7CisgICAgaWYgKHJlcGFpbnRDb250YWluZXIpIHsKKyAgICAgICAg R2FwUmVjdHMgYWJzb2x1dGVHYXBSZWN0czsKKyAgICAgICAgYWJzb2x1dGVHYXBSZWN0cy51bml0 ZUxlZnQoTGF5b3V0UmVjdChyZXBhaW50Q29udGFpbmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZs b2F0UXVhZChyZWN0cy5sZWZ0KCkpKS5ib3VuZGluZ0JveCgpKSk7CisgICAgICAgIGFic29sdXRl R2FwUmVjdHMudW5pdGVDZW50ZXIoTGF5b3V0UmVjdChyZXBhaW50Q29udGFpbmVyLT5sb2NhbFRv QWJzb2x1dGVRdWFkKEZsb2F0UXVhZChyZWN0cy5jZW50ZXIoKSkpLmJvdW5kaW5nQm94KCkpKTsK KyAgICAgICAgYWJzb2x1dGVHYXBSZWN0cy51bml0ZVJpZ2h0KExheW91dFJlY3QocmVwYWludENv bnRhaW5lci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFF1YWQocmVjdHMucmlnaHQoKSkpLmJv dW5kaW5nQm94KCkpKTsKKyAgICAgICAgbV9nYXBSZWN0cy5hcHBlbmQoYWJzb2x1dGVHYXBSZWN0 cyk7CisgICAgfSBlbHNlCisgICAgICAgIG1fZ2FwUmVjdHMuYXBwZW5kKHJlY3RzKTsKIH0KIAog U2VsZWN0aW9uUmVjdEdhdGhlcmVyOjpOb3RpZmllcjo6Tm90aWZpZXIoU2VsZWN0aW9uUmVjdEdh dGhlcmVyJiBnYXRoZXJlcikK