95036 2012-08-26 12:08:07 -0700 Prerenderering should gracefully handle no PrerendererClient or PrerenderingPlatform being provided. 2012-08-26 15:15:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gavinp gavinp abarth japhet webkit.review.bot oldest_to_newest 704870 0 gavinp 2012-08-26 12:08:07 -0700 Prerenderering should gracefully handle no PrerendererClient or PrerenderingPlatform being provided. 704871 1 160610 gavinp 2012-08-26 12:11:39 -0700 Created attachment 160610 Patch 704872 2 160610 gavinp 2012-08-26 12:13:50 -0700 Comment on attachment 160610 Patch abarth, WDYT? 704879 3 160610 abarth 2012-08-26 12:46:21 -0700 Comment on attachment 160610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160610&action=review > Source/WebCore/loader/Prerenderer.cpp:140 > - if (!m_client) > + if (!m_initializedClient) { > + m_initializedClient = true; > m_client = PrerendererClient::from(document()->page()); > + } > return m_client; Should we just do this in the constructor? I don't remember the exactly access sequence for these objects. 704890 4 gavinp 2012-08-26 14:25:55 -0700 (In reply to comment #3) > (From update of attachment 160610 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=160610&action=review > > > Source/WebCore/loader/Prerenderer.cpp:140 > > - if (!m_client) > > + if (!m_initializedClient) { > > + m_initializedClient = true; > > m_client = PrerendererClient::from(document()->page()); > > + } > > return m_client; > > Should we just do this in the constructor? I don't remember the exactly access sequence for these objects. The problem is that the client isn't provided until that platform initializes, which can be later. When I did it in the constructor, I had crashes. So I think this logic at a minimum needs to be commented. 704891 5 160615 gavinp 2012-08-26 14:32:10 -0700 Created attachment 160615 Patch 704894 6 160615 webkit.review.bot 2012-08-26 15:15:14 -0700 Comment on attachment 160615 Patch Clearing flags on attachment: 160615 Committed r126714: <http://trac.webkit.org/changeset/126714> 704895 7 webkit.review.bot 2012-08-26 15:15:17 -0700 All reviewed patches have been landed. Closing bug. 160610 2012-08-26 12:11:39 -0700 2012-08-26 14:32:07 -0700 Patch bug-95036-20120826151131.patch text/plain 4427 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFmOGEyOGVkYTM3ZGNj ODc5NjQ1MDg2ZWUzM2Y5YTVmYzI1MGMxYS4uYzhmODZlYWI2NzU5YmEzMzMzMTA2NTFmMTA4YmM4 ZmI4YzRmYTcyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTI2ICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFByZXJlbmRlcmVyaW5n IHNob3VsZCBncmFjZWZ1bGx5IGhhbmRsZSBubyBQcmVyZW5kZXJlckNsaWVudCBvciBQcmVyZW5k ZXJpbmdQbGF0Zm9ybSBiZWluZyBwcm92aWRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU29tZSBhc3NlcnRpb25zIG1hZGUgc3VyZSB0aGVyZSB3YXMg YSBwcmVyZW5kZXJpbmcgcGxhdGZvcm0gYW5kIGNsaWVudCwgYW5kIHRoaXMgY2hhbmdlIHNob3Vs ZCBtYWtlIHByZXJlbmRlcmluZyBqdXN0IGJlIGEgTk9QIHdoZW4gbm8gcGxhdGZvcm0gaXMgcHJv dmlkZWQsIGFuZCBqdXN0IGNvbnRpbnVlIHdpdGhvdXQgYSBjbGllbnQgd2hlbiB0aGVyZSBpcyBu byBjbGllbnQgcHJvdmlkZWQuIFRoZXNlIGFzc2VydGlvbnMgd2VyZSBjYXVzaW5nIGNyYXNoZXMg aW4gY2hyb21pdW0ncyBjb250ZW50X3NoZWxsIHRhcmdldCwgYW5kIHJlYWxseSBmb3Igbm8gZ29v ZCByZWFzb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIER1bXBSZW5kZXJUcmVl IHByb3ZpZGVzIGJvdGggYSBQcmVyZW5kZXJpbmdQbGF0Zm9ybSBhbmQgYSBQcmVyZW5kZXJlckNs aWVudC4gQnV0IHRoZXJlIGlzIGEgbmV3IGxheW91dCB0ZXN0IGluIGNocm9taXVtJ3MgV2ViS2l0 QnJvd3NlclRlc3QgZm9yIHRoaXMgYmVoYXZpb3VyLCBzZWUgaHR0cDovL2NvZGVyZXZpZXcuY2hy b21pdW0ub3JnLzEwODY5MDY4LworCisgICAgICAgICogbG9hZGVyL1ByZXJlbmRlcmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRlcmVyOjpQcmVyZW5kZXJlcik6CisgICAgICAgIChX ZWJDb3JlOjpQcmVyZW5kZXJlcjo6cmVuZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRl cmVyOjpjbGllbnQpOgorICAgICAgICAqIGxvYWRlci9QcmVyZW5kZXJlci5oOgorICAgICAgICAq IGxvYWRlci9QcmVyZW5kZXJlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcmVyZW5k ZXJlckNsaWVudDo6ZnJvbSk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUHJlcmVuZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRlcjo6Y2FuY2VsKToKKwogMjAxMi0wOC0y MiAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjEyNjM4My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9QcmVyZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXIu Y3BwCmluZGV4IGIzYWNiMjQzMTJhYmU3NjFkYzQ1NTBiODljZTg4MDY5ZDY1ZWMyM2UuLjgxYjhh NmM0Y2NkMDUzMmU3Yjg1ZTgwY2ZmNzE3NmEyODA5YzI0MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1ByZXJlbmRlcmVyLmNwcApAQCAtNTksNiArNTksNyBAQCBQYXNzT3duUHRyPFByZXJlbmRlcmVy PiBQcmVyZW5kZXJlcjo6Y3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCkKIAogUHJlcmVuZGVyZXI6 OlByZXJlbmRlcmVyKERvY3VtZW50KiBkb2N1bWVudCkKICAgICA6IEFjdGl2ZURPTU9iamVjdChk b2N1bWVudCwgdGhpcykKKyAgICAsIG1faW5pdGlhbGl6ZWRDbGllbnQoZmFsc2UpCiAgICAgLCBt X2NsaWVudCgwKQogewogfQpAQCAtODAsNyArODEsOCBAQCBQYXNzUmVmUHRyPFByZXJlbmRlckhh bmRsZT4gUHJlcmVuZGVyZXI6OnJlbmRlcihjb25zdCBLVVJMJiB1cmwpCiAKICAgICBSZWZQdHI8 UHJlcmVuZGVySGFuZGxlPiBwcmVyZW5kZXJIYW5kbGUgPSBQcmVyZW5kZXJIYW5kbGU6OmNyZWF0 ZSh1cmwsIHJlZmVycmVyLCByZWZlcnJlclBvbGljeSk7CiAKLSAgICBjbGllbnQoKS0+d2lsbEFk ZFByZXJlbmRlcihwcmVyZW5kZXJIYW5kbGUuZ2V0KCkpOworICAgIGlmIChjbGllbnQoKSkKKyAg ICAgICAgY2xpZW50KCktPndpbGxBZGRQcmVyZW5kZXIocHJlcmVuZGVySGFuZGxlLmdldCgpKTsK ICAgICBwcmVyZW5kZXJIYW5kbGUtPmFkZCgpOwogCiAgICAgbV9hY3RpdmVIYW5kbGVzLmFwcGVu ZChwcmVyZW5kZXJIYW5kbGUpOwpAQCAtMTMxLDggKzEzMywxMCBAQCBEb2N1bWVudCogUHJlcmVu ZGVyZXI6OmRvY3VtZW50KCkKIAogUHJlcmVuZGVyZXJDbGllbnQqIFByZXJlbmRlcmVyOjpjbGll bnQoKQogewotICAgIGlmICghbV9jbGllbnQpCisgICAgaWYgKCFtX2luaXRpYWxpemVkQ2xpZW50 KSB7CisgICAgICAgIG1faW5pdGlhbGl6ZWRDbGllbnQgPSB0cnVlOwogICAgICAgICBtX2NsaWVu dCA9IFByZXJlbmRlcmVyQ2xpZW50Ojpmcm9tKGRvY3VtZW50KCktPnBhZ2UoKSk7CisgICAgfQog ICAgIHJldHVybiBtX2NsaWVudDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1ByZXJlbmRlcmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXIuaApp bmRleCAzMmYzNTA4MzQyZDEyYjQzY2FlYjFlYzA4OTU3ZGYwZDM2OTRiYTA4Li42MWM2ZDhjZDkz OGI1MGE5ZTJiM2JkMmYxOTlhN2E5MGZmZTgzYTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUHJlcmVuZGVyZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVu ZGVyZXIuaApAQCAtNzMsNiArNzMsNyBAQCBwcml2YXRlOgogICAgIERvY3VtZW50KiBkb2N1bWVu dCgpOwogICAgIFByZXJlbmRlcmVyQ2xpZW50KiBjbGllbnQoKTsKIAorICAgIGJvb2wgbV9pbml0 aWFsaXplZENsaWVudDsKICAgICBQcmVyZW5kZXJlckNsaWVudCogbV9jbGllbnQ7CiAgICAgSGFu ZGxlVmVjdG9yIG1fYWN0aXZlSGFuZGxlczsKICAgICBIYW5kbGVWZWN0b3IgbV9zdXNwZW5kZWRI YW5kbGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1ByZXJlbmRlcmVyQ2xp ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlckNsaWVudC5jcHAKaW5k ZXggNzhmMjQ3MGUyNjE2NGE0ZGQxNTkzNTk1YzYzZjEyNzFhZmZlNmMxZi4uZjhjMjk4OTI4YzIy NDViMGM5MmJmNTVhNGQ4Y2VhZGQ4YmQ1MDUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL1ByZXJlbmRlcmVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UHJlcmVuZGVyZXJDbGllbnQuY3BwCkBAIC01MSw3ICs1MSw2IEBAIGNvbnN0IEF0b21pY1N0cmlu ZyYgUHJlcmVuZGVyZXJDbGllbnQ6OnN1cHBsZW1lbnROYW1lKCkKIFByZXJlbmRlcmVyQ2xpZW50 KiBQcmVyZW5kZXJlckNsaWVudDo6ZnJvbShQYWdlKiBwYWdlKQogewogICAgIFByZXJlbmRlcmVy Q2xpZW50KiBzdXBwbGVtZW50ID0gc3RhdGljX2Nhc3Q8UHJlcmVuZGVyZXJDbGllbnQqPihTdXBw bGVtZW50PFBhZ2U+Ojpmcm9tKHBhZ2UsIHN1cHBsZW1lbnROYW1lKCkpKTsKLSAgICBBU1NFUlQo c3VwcGxlbWVudCk7CiAgICAgcmV0dXJuIHN1cHBsZW1lbnQ7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1ByZXJlbmRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QcmVyZW5kZXIuY3BwCmluZGV4IDBlY2U0NDA1NjAwZDY1 ODFkY2NkYzZkNjYwNmY0ZDE4OWQ4NDE5ZWYuLjQzMWE3YWI1OGVkZmJmNzA2MTMwZDJmYjkzMjJm NWU3MTI2YjVjODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1ByZXJlbmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUHJl cmVuZGVyLmNwcApAQCAtNjUsNyArNjUsNiBAQCB2b2lkIFByZXJlbmRlcjo6YWRkKCkKIAogdm9p ZCBQcmVyZW5kZXI6OmNhbmNlbCgpCiB7Ci0gICAgQVNTRVJUKFdlYktpdDo6V2ViUHJlcmVuZGVy aW5nU3VwcG9ydDo6Y3VycmVudCgpKTsKICAgICBXZWJLaXQ6OldlYlByZXJlbmRlcmluZ1N1cHBv cnQqIHBsYXRmb3JtID0gV2ViS2l0OjpXZWJQcmVyZW5kZXJpbmdTdXBwb3J0OjpjdXJyZW50KCk7 CiAgICAgaWYgKCFwbGF0Zm9ybSkKICAgICAgICAgcmV0dXJuOwo= 160615 2012-08-26 14:32:10 -0700 2012-08-26 15:15:13 -0700 Patch bug-95036-20120826173203.patch text/plain 4570 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFmOGEyOGVkYTM3ZGNj ODc5NjQ1MDg2ZWUzM2Y5YTVmYzI1MGMxYS4uYzhmODZlYWI2NzU5YmEzMzMzMTA2NTFmMTA4YmM4 ZmI4YzRmYTcyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTI2ICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFByZXJlbmRlcmVyaW5n IHNob3VsZCBncmFjZWZ1bGx5IGhhbmRsZSBubyBQcmVyZW5kZXJlckNsaWVudCBvciBQcmVyZW5k ZXJpbmdQbGF0Zm9ybSBiZWluZyBwcm92aWRlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU29tZSBhc3NlcnRpb25zIG1hZGUgc3VyZSB0aGVyZSB3YXMg YSBwcmVyZW5kZXJpbmcgcGxhdGZvcm0gYW5kIGNsaWVudCwgYW5kIHRoaXMgY2hhbmdlIHNob3Vs ZCBtYWtlIHByZXJlbmRlcmluZyBqdXN0IGJlIGEgTk9QIHdoZW4gbm8gcGxhdGZvcm0gaXMgcHJv dmlkZWQsIGFuZCBqdXN0IGNvbnRpbnVlIHdpdGhvdXQgYSBjbGllbnQgd2hlbiB0aGVyZSBpcyBu byBjbGllbnQgcHJvdmlkZWQuIFRoZXNlIGFzc2VydGlvbnMgd2VyZSBjYXVzaW5nIGNyYXNoZXMg aW4gY2hyb21pdW0ncyBjb250ZW50X3NoZWxsIHRhcmdldCwgYW5kIHJlYWxseSBmb3Igbm8gZ29v ZCByZWFzb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIER1bXBSZW5kZXJUcmVl IHByb3ZpZGVzIGJvdGggYSBQcmVyZW5kZXJpbmdQbGF0Zm9ybSBhbmQgYSBQcmVyZW5kZXJlckNs aWVudC4gQnV0IHRoZXJlIGlzIGEgbmV3IGxheW91dCB0ZXN0IGluIGNocm9taXVtJ3MgV2ViS2l0 QnJvd3NlclRlc3QgZm9yIHRoaXMgYmVoYXZpb3VyLCBzZWUgaHR0cDovL2NvZGVyZXZpZXcuY2hy b21pdW0ub3JnLzEwODY5MDY4LworCisgICAgICAgICogbG9hZGVyL1ByZXJlbmRlcmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRlcmVyOjpQcmVyZW5kZXJlcik6CisgICAgICAgIChX ZWJDb3JlOjpQcmVyZW5kZXJlcjo6cmVuZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRl cmVyOjpjbGllbnQpOgorICAgICAgICAqIGxvYWRlci9QcmVyZW5kZXJlci5oOgorICAgICAgICAq IGxvYWRlci9QcmVyZW5kZXJlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcmVyZW5k ZXJlckNsaWVudDo6ZnJvbSk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUHJlcmVuZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlByZXJlbmRlcjo6Y2FuY2VsKToKKwogMjAxMi0wOC0y MiAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjEyNjM4My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9QcmVyZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXIu Y3BwCmluZGV4IGIzYWNiMjQzMTJhYmU3NjFkYzQ1NTBiODljZTg4MDY5ZDY1ZWMyM2UuLjg3YmFj Nzc4Y2E5OTNkNTQ2NThiZDdiZjdkNmU2ODUyMjMyYWY1M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1ByZXJlbmRlcmVyLmNwcApAQCAtNTksNiArNTksNyBAQCBQYXNzT3duUHRyPFByZXJlbmRlcmVy PiBQcmVyZW5kZXJlcjo6Y3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCkKIAogUHJlcmVuZGVyZXI6 OlByZXJlbmRlcmVyKERvY3VtZW50KiBkb2N1bWVudCkKICAgICA6IEFjdGl2ZURPTU9iamVjdChk b2N1bWVudCwgdGhpcykKKyAgICAsIG1faW5pdGlhbGl6ZWRDbGllbnQoZmFsc2UpCiAgICAgLCBt X2NsaWVudCgwKQogewogfQpAQCAtODAsNyArODEsOCBAQCBQYXNzUmVmUHRyPFByZXJlbmRlckhh bmRsZT4gUHJlcmVuZGVyZXI6OnJlbmRlcihjb25zdCBLVVJMJiB1cmwpCiAKICAgICBSZWZQdHI8 UHJlcmVuZGVySGFuZGxlPiBwcmVyZW5kZXJIYW5kbGUgPSBQcmVyZW5kZXJIYW5kbGU6OmNyZWF0 ZSh1cmwsIHJlZmVycmVyLCByZWZlcnJlclBvbGljeSk7CiAKLSAgICBjbGllbnQoKS0+d2lsbEFk ZFByZXJlbmRlcihwcmVyZW5kZXJIYW5kbGUuZ2V0KCkpOworICAgIGlmIChjbGllbnQoKSkKKyAg ICAgICAgY2xpZW50KCktPndpbGxBZGRQcmVyZW5kZXIocHJlcmVuZGVySGFuZGxlLmdldCgpKTsK ICAgICBwcmVyZW5kZXJIYW5kbGUtPmFkZCgpOwogCiAgICAgbV9hY3RpdmVIYW5kbGVzLmFwcGVu ZChwcmVyZW5kZXJIYW5kbGUpOwpAQCAtMTMxLDggKzEzMywxMiBAQCBEb2N1bWVudCogUHJlcmVu ZGVyZXI6OmRvY3VtZW50KCkKIAogUHJlcmVuZGVyZXJDbGllbnQqIFByZXJlbmRlcmVyOjpjbGll bnQoKQogewotICAgIGlmICghbV9jbGllbnQpCisgICAgaWYgKCFtX2luaXRpYWxpemVkQ2xpZW50 KSB7CisgICAgICAgIC8vIFdlIGNhbid0IGluaXRpYWxpemUgdGhlIGNsaWVudCBpbiBvdXIgY29u dHJ1Y3RvciwgYmVjYXVzZSB0aGUgcGxhdGZvcm0gbWlnaHQgbm90IGhhdmUKKyAgICAgICAgLy8g cHJvdmlkZWQgb3VyIHN1cHBsZW1lbnQgYnkgdGhlbi4KKyAgICAgICAgbV9pbml0aWFsaXplZENs aWVudCA9IHRydWU7CiAgICAgICAgIG1fY2xpZW50ID0gUHJlcmVuZGVyZXJDbGllbnQ6OmZyb20o ZG9jdW1lbnQoKS0+cGFnZSgpKTsKKyAgICB9CiAgICAgcmV0dXJuIG1fY2xpZW50OwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlci5oCmluZGV4IDMyZjM1MDgzNDJkMTJiNDNjYWViMWVj MDg5NTdkZjBkMzY5NGJhMDguLjYxYzZkOGNkOTM4YjUwYTllMmIzYmQyZjE5OWE3YTkwZmZlODNh MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlci5oCkBAIC03Myw2ICs3Myw3IEBAIHBy aXZhdGU6CiAgICAgRG9jdW1lbnQqIGRvY3VtZW50KCk7CiAgICAgUHJlcmVuZGVyZXJDbGllbnQq IGNsaWVudCgpOwogCisgICAgYm9vbCBtX2luaXRpYWxpemVkQ2xpZW50OwogICAgIFByZXJlbmRl cmVyQ2xpZW50KiBtX2NsaWVudDsKICAgICBIYW5kbGVWZWN0b3IgbV9hY3RpdmVIYW5kbGVzOwog ICAgIEhhbmRsZVZlY3RvciBtX3N1c3BlbmRlZEhhbmRsZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1ByZXJlbmRlcmVyQ2xpZW50LmNwcAppbmRleCA3OGYyNDcwZTI2MTY0YTRkZDE1OTM1OTVj NjNmMTI3MWFmZmU2YzFmLi5mOGMyOTg5MjhjMjI0NWIwYzkyYmY1NWE0ZDhjZWFkZDhiZDUwNTEz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJlcmVuZGVyZXJDbGllbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QcmVyZW5kZXJlckNsaWVudC5jcHAKQEAgLTUx LDcgKzUxLDYgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBQcmVyZW5kZXJlckNsaWVudDo6c3VwcGxl bWVudE5hbWUoKQogUHJlcmVuZGVyZXJDbGllbnQqIFByZXJlbmRlcmVyQ2xpZW50Ojpmcm9tKFBh Z2UqIHBhZ2UpCiB7CiAgICAgUHJlcmVuZGVyZXJDbGllbnQqIHN1cHBsZW1lbnQgPSBzdGF0aWNf Y2FzdDxQcmVyZW5kZXJlckNsaWVudCo+KFN1cHBsZW1lbnQ8UGFnZT46OmZyb20ocGFnZSwgc3Vw cGxlbWVudE5hbWUoKSkpOwotICAgIEFTU0VSVChzdXBwbGVtZW50KTsKICAgICByZXR1cm4gc3Vw cGxlbWVudDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vUHJlcmVuZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1ByZXJl bmRlci5jcHAKaW5kZXggMGVjZTQ0MDU2MDBkNjU4MWRjY2RjNmQ2NjA2ZjRkMTg5ZDg0MTllZi4u NDMxYTdhYjU4ZWRmYmY3MDYxMzBkMmZiOTMyMmY1ZTcxMjZiNWM4MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUHJlcmVuZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QcmVyZW5kZXIuY3BwCkBAIC02NSw3ICs2NSw2IEBA IHZvaWQgUHJlcmVuZGVyOjphZGQoKQogCiB2b2lkIFByZXJlbmRlcjo6Y2FuY2VsKCkKIHsKLSAg ICBBU1NFUlQoV2ViS2l0OjpXZWJQcmVyZW5kZXJpbmdTdXBwb3J0OjpjdXJyZW50KCkpOwogICAg IFdlYktpdDo6V2ViUHJlcmVuZGVyaW5nU3VwcG9ydCogcGxhdGZvcm0gPSBXZWJLaXQ6OldlYlBy ZXJlbmRlcmluZ1N1cHBvcnQ6OmN1cnJlbnQoKTsKICAgICBpZiAoIXBsYXRmb3JtKQogICAgICAg ICByZXR1cm47Cg==