124866 2013-11-25 15:08:14 -0800 VS2010 doesn't like std::make_unique 2013-12-19 10:22:01 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alex.christensen webkit-unassigned commit-queue sam simon.fraser oldest_to_newest 954122 0 alex.christensen 2013-11-25 15:08:14 -0800 I'm not sure what the status of the std::make_unique standard is, or what it was in 2010, but its use in TiledBackingStore.h causes compile errors in VS2010. Let's use nullptr instead. 954123 1 217837 alex.christensen 2013-11-25 15:10:00 -0800 Created attachment 217837 Patch 954125 2 sam 2013-11-25 15:12:21 -0800 What compile error does it cause? It may just be the missing #include of <wtf/StdLibExtras.h> 954138 3 alex.christensen 2013-11-25 15:41:40 -0800 (In reply to comment #2) > What compile error does it cause? It may just be the missing #include of <wtf/StdLibExtras.h> Even with that included, it makes this error many, many times: 8>c:\cygwin\webkit\source\webcore\platform\graphics\TiledBackingStore.h(45): error C2780: '_Unique_if<T>::_Unknown_bound std::make_unique(size_t)' : expects 1 arguments - 0 provided 8> C:\cygwin\webkit\WebKitBuild\Debug_WinCairo\include\private\wtf/StdLibExtras.h(412) : see declaration of 'std::make_unique' My solution fixes it and doesn't seem to break anything on any other systems. 954329 4 sam 2013-11-26 12:50:20 -0800 (In reply to comment #3) > (In reply to comment #2) > > What compile error does it cause? It may just be the missing #include of <wtf/StdLibExtras.h> > Even with that included, it makes this error many, many times: > 8>c:\cygwin\webkit\source\webcore\platform\graphics\TiledBackingStore.h(45): error C2780: '_Unique_if<T>::_Unknown_bound std::make_unique(size_t)' : expects 1 arguments - 0 provided > 8> C:\cygwin\webkit\WebKitBuild\Debug_WinCairo\include\private\wtf/StdLibExtras.h(412) : see declaration of 'std::make_unique' > > My solution fixes it and doesn't seem to break anything on any other systems. But it changes the semantics. std::make_unique<TiledBackingStoreBackend>() is the equivalent of (new TiledBackingStoreBackend()); nullptr is the equivalent of NULL. So the old code always had a non-null TiledBackingStoreBackend and now it will. A better work around would to be to stop using a default value for the parameter and just have two constructors. 1) TiledBackingStore(TiledBackingStoreClient*); 2) TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend>); Just make sure that in #1's implementation you create the backend. 960361 5 219384 alex.christensen 2013-12-16 19:33:03 -0800 Created attachment 219384 Patch 960363 6 219386 alex.christensen 2013-12-16 19:39:46 -0800 Created attachment 219386 Patch 960531 7 219386 darin 2013-12-17 09:13:33 -0800 Comment on attachment 219386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219386&action=review > Source/WebCore/platform/graphics/TiledBackingStore.h:44 > - TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend> = std::make_unique<TiledBackingStoreBackend>()); > + TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend> = std::unique_ptr<TiledBackingStoreBackend>(new TiledBackingStoreBackend())); Please don’t do this. Is there some other solution? The reason we use make_unique is so that we can search the entire project for "new" to find mistakes. We really don’t want to do this just to accommodate a broken compiler. I suggest we use overloading instead: TiledBackingStore(TiledBackingStoreClient*); TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend>); Then the make_unique can go into the TiledBackingStore.cpp file. I’m hoping we can get it to compile there. By the way, this overloading also makes it clear that the single-non-default-argument constructor needs “explicit” added to it. Please do that. 960532 8 219386 darin 2013-12-17 09:14:14 -0800 Comment on attachment 219386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219386&action=review >> Source/WebCore/platform/graphics/TiledBackingStore.h:44 >> + TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend> = std::unique_ptr<TiledBackingStoreBackend>(new TiledBackingStoreBackend())); > > Please don’t do this. Is there some other solution? The reason we use make_unique is so that we can search the entire project for "new" to find mistakes. We really don’t want to do this just to accommodate a broken compiler. > > I suggest we use overloading instead: > > TiledBackingStore(TiledBackingStoreClient*); > TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend>); > > Then the make_unique can go into the TiledBackingStore.cpp file. I’m hoping we can get it to compile there. > > By the way, this overloading also makes it clear that the single-non-default-argument constructor needs “explicit” added to it. Please do that. I see now that Sam suggested the same thing, but for some reason you did not do what he suggested. 960549 9 alex.christensen 2013-12-17 09:54:46 -0800 > I see now that Sam suggested the same thing, but for some reason you did not do what he suggested. I was trying to minimize changes, and I though I would have had to use the new operator in the implementation of TiledBackingStore(TiledBackingStoreClient*) anyway. I tested it, and std::make_unique works in the implementation, but not as the default parameter. I'll upload a better patch. Sorry for the confusion. 960553 10 219428 alex.christensen 2013-12-17 10:00:50 -0800 Created attachment 219428 Patch 960555 11 alex.christensen 2013-12-17 10:03:40 -0800 I was also trying to avoid the duplicate code that this adds. Less duplicate code is always better, but fewer calls to new is also better. 961431 12 219428 commit-queue 2013-12-19 10:21:58 -0800 Comment on attachment 219428 Patch Clearing flags on attachment: 219428 Committed r160843: <http://trac.webkit.org/changeset/160843> 961432 13 commit-queue 2013-12-19 10:22:01 -0800 All reviewed patches have been landed. Closing bug. 217837 2013-11-25 15:10:00 -0800 2013-12-16 19:32:58 -0800 Patch bug-124866-20131125160959.patch text/plain 1451 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTc2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTExLTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJv XSBDb21waWxlIGZpeCBmb3IgVlMyMDEwIHdoZW4gdXNpbmcgQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ4 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmg6CisgICAgICAgIFVzZSBudWxscHRy IGluc3RlYWQgb2YgbWFrZV91bmlxdWUuCisKIDIwMTMtMTEtMjUgIE5pY2sgRGllZ28gWWFtYW5l ICA8bmljay55YW1hbmVAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBNZWRpYVN0cmVhbVJlZ2lz dHJ5IHNob3VsZCBzdG9yZSBNZWRpYVN0cmVhbXMgaW5zdGVhZCBvZiBNZWRpYVN0cmVhbVByaXZh dGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdT dG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Rp bGVkQmFja2luZ1N0b3JlLmgJKHJldmlzaW9uIDE1OTc2NikKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQx LDcgKzQxLDcgQEAgY2xhc3MgVGlsZWRCYWNraW5nU3RvcmVDbGllbnQ7CiBjbGFzcyBUaWxlZEJh Y2tpbmdTdG9yZSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoVGlsZWRCYWNraW5nU3RvcmUp OyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBUaWxlZEJhY2tpbmdTdG9y ZShUaWxlZEJhY2tpbmdTdG9yZUNsaWVudCosIHN0ZDo6dW5pcXVlX3B0cjxUaWxlZEJhY2tpbmdT dG9yZUJhY2tlbmQ+ID0gc3RkOjptYWtlX3VuaXF1ZTxUaWxlZEJhY2tpbmdTdG9yZUJhY2tlbmQ+ KCkpOworICAgIFRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50Kiwgc3Rk Ojp1bmlxdWVfcHRyPFRpbGVkQmFja2luZ1N0b3JlQmFja2VuZD4gPSBudWxscHRyKTsKICAgICB+ VGlsZWRCYWNraW5nU3RvcmUoKTsKIAogICAgIFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50KiBjbGll bnQoKSB7IHJldHVybiBtX2NsaWVudDsgfQo= 219384 2013-12-16 19:33:03 -0800 2013-12-16 19:39:40 -0800 Patch bug-124866-20131216203304.patch text/plain 1487 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEyLTE2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJv XSBDb21waWxlIGZpeCBmb3IgVlMyMDEwIHdoZW4gdXNpbmcgQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ4 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmg6CisgICAgICAgIFVzZSBudWxscHRy IGluc3RlYWQgb2YgbWFrZV91bmlxdWUuCisKIDIwMTMtMTItMTYgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2ZXJ0IGEgbXlzdGVyaW91cyBhbmQg aW5leHBsaWNhYmxlIHBhcnQgb2YgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTYw Njg1CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdT dG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Rp bGVkQmFja2luZ1N0b3JlLmgJKHJldmlzaW9uIDE2MDY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQx LDcgKzQxLDcgQEAgY2xhc3MgVGlsZWRCYWNraW5nU3RvcmVDbGllbnQ7CiBjbGFzcyBUaWxlZEJh Y2tpbmdTdG9yZSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoVGlsZWRCYWNraW5nU3RvcmUp OyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBUaWxlZEJhY2tpbmdTdG9y ZShUaWxlZEJhY2tpbmdTdG9yZUNsaWVudCosIHN0ZDo6dW5pcXVlX3B0cjxUaWxlZEJhY2tpbmdT dG9yZUJhY2tlbmQ+ID0gc3RkOjptYWtlX3VuaXF1ZTxUaWxlZEJhY2tpbmdTdG9yZUJhY2tlbmQ+ KCkpOworICAgIFRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50Kiwgc3Rk Ojp1bmlxdWVfcHRyPFRpbGVkQmFja2luZ1N0b3JlQmFja2VuZD4gPSBzdGQ6OnVuaXF1ZV9wdHI8 VGlsZWRCYWNraW5nU3RvcmVCYWNrZW5kPigpKTsKICAgICB+VGlsZWRCYWNraW5nU3RvcmUoKTsK IAogICAgIFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50KiBjbGllbnQoKSB7IHJldHVybiBtX2NsaWVu dDsgfQo= 219386 2013-12-16 19:39:46 -0800 2013-12-17 10:00:47 -0800 Patch bug-124866-20131216203947.patch text/plain 1540 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEyLTE2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJv XSBDb21waWxlIGZpeCBmb3IgVlMyMDEzIHdoZW4gdXNpbmcgQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ4 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmg6CisgICAgICAgIFVzZSB1bmlxdWVf cHRyIGNvbnN0cnVjdG9yIGFuZCBuZXcgaW5zdGVhZCBvZiBtYWtlX3VuaXF1ZS4KKwogMjAxMy0x Mi0xNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZlcnQgYSBteXN0ZXJpb3VzIGFuZCBpbmV4cGxpY2FibGUgcGFydCBvZiBodHRwOi8vdHJhYy53 ZWJraXQub3JnL2NoYW5nZXNldC8xNjA2ODUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaAkocmV2aXNpb24gMTYwNjkw KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUu aAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBjbGFzcyBUaWxlZEJhY2tpbmdTdG9y ZUNsaWVudDsKIGNsYXNzIFRpbGVkQmFja2luZ1N0b3JlIHsKICAgICBXVEZfTUFLRV9OT05DT1BZ QUJMRShUaWxlZEJhY2tpbmdTdG9yZSk7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGlj OgotICAgIFRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFja2luZ1N0b3JlQ2xpZW50Kiwgc3RkOjp1 bmlxdWVfcHRyPFRpbGVkQmFja2luZ1N0b3JlQmFja2VuZD4gPSBzdGQ6Om1ha2VfdW5pcXVlPFRp bGVkQmFja2luZ1N0b3JlQmFja2VuZD4oKSk7CisgICAgVGlsZWRCYWNraW5nU3RvcmUoVGlsZWRC YWNraW5nU3RvcmVDbGllbnQqLCBzdGQ6OnVuaXF1ZV9wdHI8VGlsZWRCYWNraW5nU3RvcmVCYWNr ZW5kPiA9IHN0ZDo6dW5pcXVlX3B0cjxUaWxlZEJhY2tpbmdTdG9yZUJhY2tlbmQ+KG5ldyBUaWxl ZEJhY2tpbmdTdG9yZUJhY2tlbmQoKSkpOwogICAgIH5UaWxlZEJhY2tpbmdTdG9yZSgpOwogCiAg ICAgVGlsZWRCYWNraW5nU3RvcmVDbGllbnQqIGNsaWVudCgpIHsgcmV0dXJuIG1fY2xpZW50OyB9 Cg== 219428 2013-12-17 10:00:50 -0800 2013-12-19 10:21:58 -0800 Patch bug-124866-20131217110049.patch text/plain 2881 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDcxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTEyLTE3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJv XSBDb21waWxlIGZpeCBmb3IgVlMyMDEzIHdoZW4gdXNpbmcgQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ4 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlRpbGVkQmFja2luZ1N0b3JlOjpUaWxlZEJhY2tpbmdTdG9yZSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaDoKKyAgICAgICAgQWRkZWQgY29uc3RydWN0 b3Igb3ZlcmxvYWQgdG8gYXZvaWQgY29tcGlsZSBlcnJvcnMKKyAgICAgICAgZnJvbSB1c2luZyBN U1ZDJ3MgbWFrZV91bmlxdWUgYXMgYSBkZWZhdWx0IHBhcmFtZXRlci4KKwogMjAxMy0xMi0xNyAg RnLDqWTDqXJpYyBXYW5nICA8ZnJlZC53YW5nQGZyZWUuZnI+CiAKICAgICAgICAgRW5zdXJlIGlu ZmVycmVkIG1yb3dzIGZvciBtc3FydCwgbXN0eWxlLCBtZXJyb3IsIG1waGFudG9tIGFuZCBtYXRo LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3Rv cmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Rp bGVkQmFja2luZ1N0b3JlLmNwcAkocmV2aXNpb24gMTYwNjkzKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNSw2ICszNSwyMiBAQCBzdGF0aWMgSW50UG9pbnQgaW5uZXJCb3R0b21SaWdodChjb25zdCBJ CiAgICAgcmV0dXJuIEludFBvaW50KHJlY3QubWF4WCgpIC0gMSwgcmVjdC5tYXhZKCkgLSAxKTsK IH0KIAorVGlsZWRCYWNraW5nU3RvcmU6OlRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFja2luZ1N0 b3JlQ2xpZW50KiBjbGllbnQpCisgICAgOiBtX2NsaWVudChjbGllbnQpCisgICAgLCBtX2JhY2tl bmQoc3RkOjptYWtlX3VuaXF1ZTxUaWxlZEJhY2tpbmdTdG9yZUJhY2tlbmQ+KCkpCisgICAgLCBt X3RpbGVCdWZmZXJVcGRhdGVUaW1lcih0aGlzLCAmVGlsZWRCYWNraW5nU3RvcmU6OnRpbGVCdWZm ZXJVcGRhdGVUaW1lckZpcmVkKQorICAgICwgbV9iYWNraW5nU3RvcmVVcGRhdGVUaW1lcih0aGlz LCAmVGlsZWRCYWNraW5nU3RvcmU6OmJhY2tpbmdTdG9yZVVwZGF0ZVRpbWVyRmlyZWQpCisgICAg LCBtX3RpbGVTaXplKGRlZmF1bHRUaWxlRGltZW5zaW9uLCBkZWZhdWx0VGlsZURpbWVuc2lvbikK KyAgICAsIG1fY292ZXJBcmVhTXVsdGlwbGllcigyLjBmKQorICAgICwgbV9jb250ZW50c1NjYWxl KDEuZikKKyAgICAsIG1fcGVuZGluZ1NjYWxlKDApCisgICAgLCBtX2NvbW1pdFRpbGVVcGRhdGVz T25JZGxlRXZlbnRMb29wKGZhbHNlKQorICAgICwgbV9jb250ZW50c0Zyb3plbihmYWxzZSkKKyAg ICAsIG1fc3VwcG9ydHNBbHBoYShmYWxzZSkKKyAgICAsIG1fcGVuZGluZ1RpbGVDcmVhdGlvbihm YWxzZSkKK3sKK30KKwogVGlsZWRCYWNraW5nU3RvcmU6OlRpbGVkQmFja2luZ1N0b3JlKFRpbGVk QmFja2luZ1N0b3JlQ2xpZW50KiBjbGllbnQsIHN0ZDo6dW5pcXVlX3B0cjxUaWxlZEJhY2tpbmdT dG9yZUJhY2tlbmQ+IGJhY2tlbmQpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX2Jh Y2tlbmQoc3RkOjptb3ZlKGJhY2tlbmQpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oCShyZXZpc2lvbiAxNjA2OTMp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5o CSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw4IEBAIGNsYXNzIFRpbGVkQmFja2luZ1N0b3Jl Q2xpZW50OwogY2xhc3MgVGlsZWRCYWNraW5nU3RvcmUgewogICAgIFdURl9NQUtFX05PTkNPUFlB QkxFKFRpbGVkQmFja2luZ1N0b3JlKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6 Ci0gICAgVGlsZWRCYWNraW5nU3RvcmUoVGlsZWRCYWNraW5nU3RvcmVDbGllbnQqLCBzdGQ6OnVu aXF1ZV9wdHI8VGlsZWRCYWNraW5nU3RvcmVCYWNrZW5kPiA9IHN0ZDo6bWFrZV91bmlxdWU8VGls ZWRCYWNraW5nU3RvcmVCYWNrZW5kPigpKTsKKyAgICBUaWxlZEJhY2tpbmdTdG9yZShUaWxlZEJh Y2tpbmdTdG9yZUNsaWVudCopOworICAgIFRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFja2luZ1N0 b3JlQ2xpZW50Kiwgc3RkOjp1bmlxdWVfcHRyPFRpbGVkQmFja2luZ1N0b3JlQmFja2VuZD4pOwog ICAgIH5UaWxlZEJhY2tpbmdTdG9yZSgpOwogCiAgICAgVGlsZWRCYWNraW5nU3RvcmVDbGllbnQq IGNsaWVudCgpIHsgcmV0dXJuIG1fY2xpZW50OyB9Cg==