86413 2012-05-14 16:46:14 -0700 MainResourceLoader::load() always returns true 2012-05-15 16:31:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap darin webkit.review.bot oldest_to_newest 623447 0 japhet 2012-05-14 16:46:14 -0700 ...so we should be able to make it return void and remove the codepath handling the false case. 623452 1 141812 japhet 2012-05-14 16:51:12 -0700 Created attachment 141812 patch 623460 2 141812 ap 2012-05-14 16:59:10 -0700 Comment on attachment 141812 patch View in context: https://bugs.webkit.org/attachment.cgi?id=141812&action=review > Source/WebCore/loader/MainResourceLoader.h:57 > - virtual bool load(const ResourceRequest&, const SubstituteData&); > + virtual void load(const ResourceRequest&, const SubstituteData&); Is it also not really virtual? 623464 3 japhet 2012-05-14 17:02:10 -0700 (In reply to comment #2) > (From update of attachment 141812 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=141812&action=review > > > Source/WebCore/loader/MainResourceLoader.h:57 > > - virtual bool load(const ResourceRequest&, const SubstituteData&); > > + virtual void load(const ResourceRequest&, const SubstituteData&); > > Is it also not really virtual? So it appears. 623469 4 141816 japhet 2012-05-14 17:05:40 -0700 Created attachment 141816 make load() non-virtual 623731 5 141816 darin 2012-05-15 00:14:43 -0700 Comment on attachment 141816 make load() non-virtual View in context: https://bugs.webkit.org/attachment.cgi?id=141816&action=review > Source/WebCore/loader/DocumentLoader.cpp:-842 > - // Protect MainResourceLoader::load() method chain from clearMainResourceLoader() stomping m_mainResourceLoader. > - RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader); What proves this is no longer needed? It seems to have nothing to do with the return value from load. 623785 6 141816 ap 2012-05-15 01:19:48 -0700 Comment on attachment 141816 make load() non-virtual View in context: https://bugs.webkit.org/attachment.cgi?id=141816&action=review >> Source/WebCore/loader/DocumentLoader.cpp:-842 >> - RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader); > > What proves this is no longer needed? It seems to have nothing to do with the return value from load. I think that this is just following a general pattern in WebKit - a function that needs to protect a variable needs to do that itself. Since load() is now the last line here, RefPtr is clearly out of place. An investigation of why this RefPtr was added, and whether that's covered by regression tests would be useful indeed. 624211 7 141816 darin 2012-05-15 10:07:51 -0700 Comment on attachment 141816 make load() non-virtual View in context: https://bugs.webkit.org/attachment.cgi?id=141816&action=review >>> Source/WebCore/loader/DocumentLoader.cpp:-842 >>> - RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader); >> >> What proves this is no longer needed? It seems to have nothing to do with the return value from load. > > I think that this is just following a general pattern in WebKit - a function that needs to protect a variable needs to do that itself. Since load() is now the last line here, RefPtr is clearly out of place. > > An investigation of why this RefPtr was added, and whether that's covered by regression tests would be useful indeed. I see what you mean. The safe thing would be to move the RefPtr into the load function, given that, not remove the RefPtr. Unless we’re certain the load function doesn’t need it. 624229 8 japhet 2012-05-15 10:23:53 -0700 (In reply to comment #7) > (From update of attachment 141816 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=141816&action=review > > >>> Source/WebCore/loader/DocumentLoader.cpp:-842 > >>> - RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader); > >> > >> What proves this is no longer needed? It seems to have nothing to do with the return value from load. > > > > I think that this is just following a general pattern in WebKit - a function that needs to protect a variable needs to do that itself. Since load() is now the last line here, RefPtr is clearly out of place. > > > > An investigation of why this RefPtr was added, and whether that's covered by regression tests would be useful indeed. > > I see what you mean. The safe thing would be to move the RefPtr into the load function, given that, not remove the RefPtr. Unless we’re certain the load function doesn’t need it. I looked briefly before posting the patch and didn't see any problems, but I wasn't as thorough as I should've been. I'll look more carefully and report back, or I'll add the protecting RefPtr to load() before landing. 624260 9 japhet 2012-05-15 10:49:40 -0700 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 141816 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=141816&action=review > > > > >>> Source/WebCore/loader/DocumentLoader.cpp:-842 > > >>> - RefPtr<MainResourceLoader> protectedMainResourceLoader(m_mainResourceLoader); > > >> > > >> What proves this is no longer needed? It seems to have nothing to do with the return value from load. > > > > > > I think that this is just following a general pattern in WebKit - a function that needs to protect a variable needs to do that itself. Since load() is now the last line here, RefPtr is clearly out of place. > > > > > > An investigation of why this RefPtr was added, and whether that's covered by regression tests would be useful indeed. > > > > I see what you mean. The safe thing would be to move the RefPtr into the load function, given that, not remove the RefPtr. Unless we’re certain the load function doesn’t need it. > > I looked briefly before posting the patch and didn't see any problems, but I wasn't as thorough as I should've been. I'll look more carefully and report back, or I'll add the protecting RefPtr to load() before landing. The more I look, the less convinced I am that removing the RefPtr was safe. Adding back in and landing. 624269 10 142006 japhet 2012-05-15 10:59:05 -0700 Created attachment 142006 Patch for landing 624440 11 142006 darin 2012-05-15 13:03:04 -0700 Comment on attachment 142006 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=142006&action=review > Source/WebCore/loader/MainResourceLoader.cpp:657 > + RefPtr<MainResourceLoader> protect(this); Might be worthwhile to add a comment here explaining why we think this is needed. There was a comment in startLoadingMainResource, even though it wasn’t particularly clear. 624449 12 japhet 2012-05-15 13:07:53 -0700 (In reply to comment #11) > (From update of attachment 142006 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=142006&action=review > > > Source/WebCore/loader/MainResourceLoader.cpp:657 > > + RefPtr<MainResourceLoader> protect(this); > > Might be worthwhile to add a comment here explaining why we think this is needed. There was a comment in startLoadingMainResource, even though it wasn’t particularly clear. ap and I briefly debated this in #webkit. I felt the previous comment was pretty vacuous, as it paraphrases to "Prevent us from being deleted by the only place that clears our main RefPtr". It might be a little clearer, regardless of the presence of a comment, if the RefPtr were in loadNow() instead of load(), but I'm not sure. 624456 13 darin 2012-05-15 13:16:04 -0700 Here’s my comment on the comment: Maybe there’s nothing to say in the comment because we know nothing. If we know anything about why this is helpful, saying what little we do know in the comment can help people later. 624458 14 darin 2012-05-15 13:16:17 -0700 Re: the old comment being vacuous, I agree. 624466 15 142006 japhet 2012-05-15 13:20:06 -0700 Comment on attachment 142006 Patch for landing Fair enough. 624494 16 142041 japhet 2012-05-15 13:37:16 -0700 Created attachment 142041 Patch for landing 624721 17 142041 webkit.review.bot 2012-05-15 16:30:59 -0700 Comment on attachment 142041 Patch for landing Clearing flags on attachment: 142041 Committed r117181: <http://trac.webkit.org/changeset/117181> 624722 18 webkit.review.bot 2012-05-15 16:31:04 -0700 All reviewed patches have been landed. Closing bug. 141812 2012-05-14 16:51:12 -0700 2012-05-14 17:05:40 -0700 patch load.txt text/plain 3586 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA1LTE0ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgTWFpblJlc291cmNlTG9hZGVy Ojpsb2FkKCkgYWx3YXlzIHJldHVybnMgdHJ1ZSwgc28gbWFrZSBpdCByZXR1cm4KKyAgICAgICAg dm9pZCBhbmQgZGVsZXRlIHRoZSByZWxhdGVkIGRlYWQgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjbGVhbnVwIG9ubHku CisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSk6CisgICAgICAgICog bG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVz b3VyY2VMb2FkZXI6OmxvYWQpOgorICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIu aDoKKyAgICAgICAgKE1haW5SZXNvdXJjZUxvYWRlcik6CisKKzIwMTItMDUtMTQgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKwogICAgICAgICBbVjhdIENyYXNoIGluIG5wT2Jq ZWN0R2V0UHJvcGVydHkoKSBpbiBWOE5QT2JqZWN0LmNwcAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYxMzEKIApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTE2MTIyKQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 NCw3ICs1NCw3IEBACiAgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1haW5SZXNvdXJjZUxvYWRl cj4gY3JlYXRlKEZyYW1lKik7CiAgICAgICAgIHZpcnR1YWwgfk1haW5SZXNvdXJjZUxvYWRlcigp OwogCi0gICAgICAgIHZpcnR1YWwgYm9vbCBsb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNv bnN0IFN1YnN0aXR1dGVEYXRhJik7CisgICAgICAgIHZpcnR1YWwgdm9pZCBsb2FkKGNvbnN0IFJl c291cmNlUmVxdWVzdCYsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJik7CiAgICAgICAgIHZpcnR1YWwg dm9pZCBhZGREYXRhKGNvbnN0IGNoYXIqLCBpbnQsIGJvb2wgYWxsQXRPbmNlKTsKIAogICAgICAg ICB2aXJ0dWFsIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxMTYxMjIpCisr KyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjUxLDcgKzY1MSw3IEBACiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIE1h aW5SZXNvdXJjZUxvYWRlcjo6bG9hZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHIsIGNvbnN0IFN1 YnN0aXR1dGVEYXRhJiBzdWJzdGl0dXRlRGF0YSkKK3ZvaWQgTWFpblJlc291cmNlTG9hZGVyOjps b2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgciwgY29uc3QgU3Vic3RpdHV0ZURhdGEmIHN1YnN0 aXR1dGVEYXRhKQogewogICAgIEFTU0VSVCghbV9oYW5kbGUpOwogCkBAIC02NzksOCArNjc5LDYg QEAKICAgICB9CiAgICAgaWYgKGRlZmVyKQogICAgICAgICBtX2luaXRpYWxSZXF1ZXN0ID0gcmVx dWVzdDsKLQotICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6 c2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVycykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudExvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcAkocmV2aXNpb24gMTE2MTIyKQorKysgU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODM3LDE3ICs4Mzcs NyBAQAogICAgIC8vIEZJWE1FOiBJcyB0aGVyZSBhbnkgd2F5IHRoZSBleHRyYSBmaWVsZHMgY291 bGQgaGF2ZSBub3QgYmVlbiBhZGRlZCBieSBub3c/CiAgICAgLy8gSWYgbm90LCBpdCB3b3VsZCBi ZSBncmVhdCB0byByZW1vdmUgdGhpcyBsaW5lIG9mIGNvZGUuCiAgICAgZnJhbWVMb2FkZXIoKS0+ YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QobV9yZXF1ZXN0KTsKLSAgICAKLSAg ICAvLyBQcm90ZWN0IE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZCgpIG1ldGhvZCBjaGFpbiBmcm9t IGNsZWFyTWFpblJlc291cmNlTG9hZGVyKCkgc3RvbXBpbmcgbV9tYWluUmVzb3VyY2VMb2FkZXIu Ci0gICAgUmVmUHRyPE1haW5SZXNvdXJjZUxvYWRlcj4gcHJvdGVjdGVkTWFpblJlc291cmNlTG9h ZGVyKG1fbWFpblJlc291cmNlTG9hZGVyKTsKLSAgICBpZiAoIXByb3RlY3RlZE1haW5SZXNvdXJj ZUxvYWRlci0+bG9hZChtX3JlcXVlc3QsIG1fc3Vic3RpdHV0ZURhdGEpKSB7Ci0gICAgICAgIC8v IEZJWE1FOiBJZiB0aGlzIHNob3VsZCByZWFsbHkgYmUgY2F1Z2h0LCB3ZSBzaG91bGQganVzdCBB U1NFUlQgdGhpcyBkb2Vzbid0IGhhcHBlbjsKLSAgICAgICAgLy8gc2hvdWxkIGl0IGJlIGNhdWdo dCBieSBvdGhlciBwYXJ0cyBvZiBXZWJLaXQgb3Igb3RoZXIgcGFydHMgb2YgdGhlIGFwcD8KLSAg ICAgICAgTE9HX0VSUk9SKCJjb3VsZCBub3QgY3JlYXRlIFdlYlJlc291cmNlSGFuZGxlIGZvciBV UkwgJXMgLS0gc2hvdWxkIGJlIGNhdWdodCBieSBwb2xpY3kgaGFuZGxlciBsZXZlbCIsIG1fcmVx dWVzdC51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAgIG1fbWFpblJlc291 cmNlTG9hZGVyID0gMDsKLSAgICAgICAgQVNTRVJUKCFpc0xvYWRpbmcoKSk7Ci0gICAgICAgIGNo ZWNrTG9hZENvbXBsZXRlKCk7Ci0gICAgfQorICAgIG1fbWFpblJlc291cmNlTG9hZGVyLT5sb2Fk KG1fcmVxdWVzdCwgbV9zdWJzdGl0dXRlRGF0YSk7CiB9CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6 OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCg== 141816 2012-05-14 17:05:40 -0700 2012-05-15 10:59:00 -0700 make load() non-virtual load.txt text/plain 3578 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA1LTE0ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgTWFpblJlc291cmNlTG9hZGVy Ojpsb2FkKCkgYWx3YXlzIHJldHVybnMgdHJ1ZSwgc28gbWFrZSBpdCByZXR1cm4KKyAgICAgICAg dm9pZCBhbmQgZGVsZXRlIHRoZSByZWxhdGVkIGRlYWQgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjbGVhbnVwIG9ubHku CisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSk6CisgICAgICAgICog bG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVz b3VyY2VMb2FkZXI6OmxvYWQpOgorICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIu aDoKKyAgICAgICAgKE1haW5SZXNvdXJjZUxvYWRlcik6CisKKzIwMTItMDUtMTQgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKwogICAgICAgICBbVjhdIENyYXNoIGluIG5wT2Jq ZWN0R2V0UHJvcGVydHkoKSBpbiBWOE5QT2JqZWN0LmNwcAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYxMzEKIApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTE2MTIyKQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 NCw3ICs1NCw3IEBACiAgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1haW5SZXNvdXJjZUxvYWRl cj4gY3JlYXRlKEZyYW1lKik7CiAgICAgICAgIHZpcnR1YWwgfk1haW5SZXNvdXJjZUxvYWRlcigp OwogCi0gICAgICAgIHZpcnR1YWwgYm9vbCBsb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNv bnN0IFN1YnN0aXR1dGVEYXRhJik7CisgICAgICAgIHZvaWQgbG9hZChjb25zdCBSZXNvdXJjZVJl cXVlc3QmLCBjb25zdCBTdWJzdGl0dXRlRGF0YSYpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgYWRk RGF0YShjb25zdCBjaGFyKiwgaW50LCBib29sIGFsbEF0T25jZSk7CiAKICAgICAgICAgdmlydHVh bCB2b2lkIHNldERlZmVyc0xvYWRpbmcoYm9vbCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMTE2MTIyKQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY1MSw3ICs2NTEsNyBAQAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBNYWluUmVzb3Vy Y2VMb2FkZXI6OmxvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByLCBjb25zdCBTdWJzdGl0dXRl RGF0YSYgc3Vic3RpdHV0ZURhdGEpCit2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZChjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHIsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJiBzdWJzdGl0dXRlRGF0 YSkKIHsKICAgICBBU1NFUlQoIW1faGFuZGxlKTsKIApAQCAtNjc5LDggKzY3OSw2IEBACiAgICAg fQogICAgIGlmIChkZWZlcikKICAgICAgICAgbV9pbml0aWFsUmVxdWVzdCA9IHJlcXVlc3Q7Ci0K LSAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OnNldERlZmVy c0xvYWRpbmcoYm9vbCBkZWZlcnMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAJKHJldmlzaW9uIDExNjEyMikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzNywxNyArODM3LDcgQEAKICAg ICAvLyBGSVhNRTogSXMgdGhlcmUgYW55IHdheSB0aGUgZXh0cmEgZmllbGRzIGNvdWxkIGhhdmUg bm90IGJlZW4gYWRkZWQgYnkgbm93PwogICAgIC8vIElmIG5vdCwgaXQgd291bGQgYmUgZ3JlYXQg dG8gcmVtb3ZlIHRoaXMgbGluZSBvZiBjb2RlLgogICAgIGZyYW1lTG9hZGVyKCktPmFkZEV4dHJh RmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KG1fcmVxdWVzdCk7Ci0gICAgCi0gICAgLy8gUHJv dGVjdCBNYWluUmVzb3VyY2VMb2FkZXI6OmxvYWQoKSBtZXRob2QgY2hhaW4gZnJvbSBjbGVhck1h aW5SZXNvdXJjZUxvYWRlcigpIHN0b21waW5nIG1fbWFpblJlc291cmNlTG9hZGVyLgotICAgIFJl ZlB0cjxNYWluUmVzb3VyY2VMb2FkZXI+IHByb3RlY3RlZE1haW5SZXNvdXJjZUxvYWRlcihtX21h aW5SZXNvdXJjZUxvYWRlcik7Ci0gICAgaWYgKCFwcm90ZWN0ZWRNYWluUmVzb3VyY2VMb2FkZXIt PmxvYWQobV9yZXF1ZXN0LCBtX3N1YnN0aXR1dGVEYXRhKSkgewotICAgICAgICAvLyBGSVhNRTog SWYgdGhpcyBzaG91bGQgcmVhbGx5IGJlIGNhdWdodCwgd2Ugc2hvdWxkIGp1c3QgQVNTRVJUIHRo aXMgZG9lc24ndCBoYXBwZW47Ci0gICAgICAgIC8vIHNob3VsZCBpdCBiZSBjYXVnaHQgYnkgb3Ro ZXIgcGFydHMgb2YgV2ViS2l0IG9yIG90aGVyIHBhcnRzIG9mIHRoZSBhcHA/Ci0gICAgICAgIExP R19FUlJPUigiY291bGQgbm90IGNyZWF0ZSBXZWJSZXNvdXJjZUhhbmRsZSBmb3IgVVJMICVzIC0t IHNob3VsZCBiZSBjYXVnaHQgYnkgcG9saWN5IGhhbmRsZXIgbGV2ZWwiLCBtX3JlcXVlc3QudXJs KCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOwotICAgICAgICBtX21haW5SZXNvdXJjZUxvYWRl ciA9IDA7Ci0gICAgICAgIEFTU0VSVCghaXNMb2FkaW5nKCkpOwotICAgICAgICBjaGVja0xvYWRD b21wbGV0ZSgpOwotICAgIH0KKyAgICBtX21haW5SZXNvdXJjZUxvYWRlci0+bG9hZChtX3JlcXVl c3QsIG1fc3Vic3RpdHV0ZURhdGEpOwogfQogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpjYW5jZWxN YWluUmVzb3VyY2VMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQo= 142006 2012-05-15 10:59:05 -0700 2012-05-15 13:37:10 -0700 Patch for landing bug-86413-20120515105904.patch text/plain 3759 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTE0ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFpblJlc291cmNlTG9hZGVy Ojpsb2FkKCkgYWx3YXlzIHJldHVybnMgdHJ1ZSwgc28gbWFrZSBpdCByZXR1cm4KKyAgICAgICAg dm9pZCBhbmQgZGVsZXRlIHRoZSByZWxhdGVkIGRlYWQgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNsZWFudXAg b25seS4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAg ICAgKiBsb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1h aW5SZXNvdXJjZUxvYWRlcjo6bG9hZCk6CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5oOgorICAgICAgICAoTWFpblJlc291cmNlTG9hZGVyKToKKwogMjAxMi0wNS0xNCAgTmF0 ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gQ3Jhc2ggaW4g bnBPYmplY3RHZXRQcm9wZXJ0eSgpIGluIFY4TlBPYmplY3QuY3BwCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDExNjEyMikKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgz NywxNyArODM3LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlcwog ICAgIC8vIEZJWE1FOiBJcyB0aGVyZSBhbnkgd2F5IHRoZSBleHRyYSBmaWVsZHMgY291bGQgaGF2 ZSBub3QgYmVlbiBhZGRlZCBieSBub3c/CiAgICAgLy8gSWYgbm90LCBpdCB3b3VsZCBiZSBncmVh dCB0byByZW1vdmUgdGhpcyBsaW5lIG9mIGNvZGUuCiAgICAgZnJhbWVMb2FkZXIoKS0+YWRkRXh0 cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QobV9yZXF1ZXN0KTsKLSAgICAKLSAgICAvLyBQ cm90ZWN0IE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZCgpIG1ldGhvZCBjaGFpbiBmcm9tIGNsZWFy TWFpblJlc291cmNlTG9hZGVyKCkgc3RvbXBpbmcgbV9tYWluUmVzb3VyY2VMb2FkZXIuCi0gICAg UmVmUHRyPE1haW5SZXNvdXJjZUxvYWRlcj4gcHJvdGVjdGVkTWFpblJlc291cmNlTG9hZGVyKG1f bWFpblJlc291cmNlTG9hZGVyKTsKLSAgICBpZiAoIXByb3RlY3RlZE1haW5SZXNvdXJjZUxvYWRl ci0+bG9hZChtX3JlcXVlc3QsIG1fc3Vic3RpdHV0ZURhdGEpKSB7Ci0gICAgICAgIC8vIEZJWE1F OiBJZiB0aGlzIHNob3VsZCByZWFsbHkgYmUgY2F1Z2h0LCB3ZSBzaG91bGQganVzdCBBU1NFUlQg dGhpcyBkb2Vzbid0IGhhcHBlbjsKLSAgICAgICAgLy8gc2hvdWxkIGl0IGJlIGNhdWdodCBieSBv dGhlciBwYXJ0cyBvZiBXZWJLaXQgb3Igb3RoZXIgcGFydHMgb2YgdGhlIGFwcD8KLSAgICAgICAg TE9HX0VSUk9SKCJjb3VsZCBub3QgY3JlYXRlIFdlYlJlc291cmNlSGFuZGxlIGZvciBVUkwgJXMg LS0gc2hvdWxkIGJlIGNhdWdodCBieSBwb2xpY3kgaGFuZGxlciBsZXZlbCIsIG1fcmVxdWVzdC51 cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAgIG1fbWFpblJlc291cmNlTG9h ZGVyID0gMDsKLSAgICAgICAgQVNTRVJUKCFpc0xvYWRpbmcoKSk7Ci0gICAgICAgIGNoZWNrTG9h ZENvbXBsZXRlKCk7Ci0gICAgfQorICAgIG1fbWFpblJlc291cmNlTG9hZGVyLT5sb2FkKG1fcmVx dWVzdCwgbV9zdWJzdGl0dXRlRGF0YSk7CiB9CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNhbmNl bE1haW5SZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMTE2 MTIyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTY1MSw5ICs2NTEsMTAgQEAgYm9vbCBNYWluUmVzb3VyY2VMb2FkZXI6 OmxvYWROb3coUmVzb3VyYwogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBNYWluUmVzb3Vy Y2VMb2FkZXI6OmxvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByLCBjb25zdCBTdWJzdGl0dXRl RGF0YSYgc3Vic3RpdHV0ZURhdGEpCit2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZChjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHIsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJiBzdWJzdGl0dXRlRGF0 YSkKIHsKICAgICBBU1NFUlQoIW1faGFuZGxlKTsKKyAgICBSZWZQdHI8TWFpblJlc291cmNlTG9h ZGVyPiBwcm90ZWN0KHRoaXMpOwogCiAgICAgbV9zdWJzdGl0dXRlRGF0YSA9IHN1YnN0aXR1dGVE YXRhOwogCkBAIC02NzksOCArNjgwLDYgQEAgYm9vbCBNYWluUmVzb3VyY2VMb2FkZXI6OmxvYWQo Y29uc3QgUmVzbwogICAgIH0KICAgICBpZiAoZGVmZXIpCiAgICAgICAgIG1faW5pdGlhbFJlcXVl c3QgPSByZXF1ZXN0OwotCi0gICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgTWFpblJlc291cmNl TG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQpJbmRleDogU291cmNlL1dlYkNv cmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTE2MTIyKQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBA IC01NCw3ICs1NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIFBhc3NS ZWZQdHI8TWFpblJlc291cmNlTG9hZGVyPiBjcmVhdGUoRnJhbWUqKTsKICAgICAgICAgdmlydHVh bCB+TWFpblJlc291cmNlTG9hZGVyKCk7CiAKLSAgICAgICAgdmlydHVhbCBib29sIGxvYWQoY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3Vic3RpdHV0ZURhdGEmKTsKKyAgICAgICAgdm9p ZCBsb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJik7CiAg ICAgICAgIHZpcnR1YWwgdm9pZCBhZGREYXRhKGNvbnN0IGNoYXIqLCBpbnQsIGJvb2wgYWxsQXRP bmNlKTsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsK 142041 2012-05-15 13:37:16 -0700 2012-05-15 16:30:59 -0700 Patch for landing bug-86413-20120515133715.patch text/plain 3981 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTE0ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFpblJlc291cmNlTG9hZGVy Ojpsb2FkKCkgYWx3YXlzIHJldHVybnMgdHJ1ZSwgc28gbWFrZSBpdCByZXR1cm4KKyAgICAgICAg dm9pZCBhbmQgZGVsZXRlIHRoZSByZWxhdGVkIGRlYWQgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNsZWFudXAg b25seS4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAg ICAgKiBsb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1h aW5SZXNvdXJjZUxvYWRlcjo6bG9hZCk6CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5oOgorICAgICAgICAoTWFpblJlc291cmNlTG9hZGVyKToKKwogMjAxMi0wNS0xNCAgTmF0 ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gQ3Jhc2ggaW4g bnBPYmplY3RHZXRQcm9wZXJ0eSgpIGluIFY4TlBPYmplY3QuY3BwCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDExNjEyMikKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgz NywxNyArODM3LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlcwog ICAgIC8vIEZJWE1FOiBJcyB0aGVyZSBhbnkgd2F5IHRoZSBleHRyYSBmaWVsZHMgY291bGQgaGF2 ZSBub3QgYmVlbiBhZGRlZCBieSBub3c/CiAgICAgLy8gSWYgbm90LCBpdCB3b3VsZCBiZSBncmVh dCB0byByZW1vdmUgdGhpcyBsaW5lIG9mIGNvZGUuCiAgICAgZnJhbWVMb2FkZXIoKS0+YWRkRXh0 cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QobV9yZXF1ZXN0KTsKLSAgICAKLSAgICAvLyBQ cm90ZWN0IE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZCgpIG1ldGhvZCBjaGFpbiBmcm9tIGNsZWFy TWFpblJlc291cmNlTG9hZGVyKCkgc3RvbXBpbmcgbV9tYWluUmVzb3VyY2VMb2FkZXIuCi0gICAg UmVmUHRyPE1haW5SZXNvdXJjZUxvYWRlcj4gcHJvdGVjdGVkTWFpblJlc291cmNlTG9hZGVyKG1f bWFpblJlc291cmNlTG9hZGVyKTsKLSAgICBpZiAoIXByb3RlY3RlZE1haW5SZXNvdXJjZUxvYWRl ci0+bG9hZChtX3JlcXVlc3QsIG1fc3Vic3RpdHV0ZURhdGEpKSB7Ci0gICAgICAgIC8vIEZJWE1F OiBJZiB0aGlzIHNob3VsZCByZWFsbHkgYmUgY2F1Z2h0LCB3ZSBzaG91bGQganVzdCBBU1NFUlQg dGhpcyBkb2Vzbid0IGhhcHBlbjsKLSAgICAgICAgLy8gc2hvdWxkIGl0IGJlIGNhdWdodCBieSBv dGhlciBwYXJ0cyBvZiBXZWJLaXQgb3Igb3RoZXIgcGFydHMgb2YgdGhlIGFwcD8KLSAgICAgICAg TE9HX0VSUk9SKCJjb3VsZCBub3QgY3JlYXRlIFdlYlJlc291cmNlSGFuZGxlIGZvciBVUkwgJXMg LS0gc2hvdWxkIGJlIGNhdWdodCBieSBwb2xpY3kgaGFuZGxlciBsZXZlbCIsIG1fcmVxdWVzdC51 cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAgIG1fbWFpblJlc291cmNlTG9h ZGVyID0gMDsKLSAgICAgICAgQVNTRVJUKCFpc0xvYWRpbmcoKSk7Ci0gICAgICAgIGNoZWNrTG9h ZENvbXBsZXRlKCk7Ci0gICAgfQorICAgIG1fbWFpblJlc291cmNlTG9hZGVyLT5sb2FkKG1fcmVx dWVzdCwgbV9zdWJzdGl0dXRlRGF0YSk7CiB9CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNhbmNl bE1haW5SZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMTE2 MTIyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTY1MSwxMCArNjUxLDE0IEBAIGJvb2wgTWFpblJlc291cmNlTG9hZGVy Ojpsb2FkTm93KFJlc291cmMKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgTWFpblJlc291 cmNlTG9hZGVyOjpsb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgciwgY29uc3QgU3Vic3RpdHV0 ZURhdGEmIHN1YnN0aXR1dGVEYXRhKQordm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmxvYWQoY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByLCBjb25zdCBTdWJzdGl0dXRlRGF0YSYgc3Vic3RpdHV0ZURh dGEpCiB7CiAgICAgQVNTRVJUKCFtX2hhbmRsZSk7CiAKKyAgICAvLyBJdCBhcHBlYXJzIHRoYXQg aXQgaXMgcG9zc2libGUgZm9yIHRoaXMgbG9hZCB0byBiZSBjYW5jZWxsZWQgYW5kIGRlcmVmZW5j ZWQgYnkgdGhlIERvY3VtZW50TG9hZGVyCisgICAgLy8gaW4gd2lsbFNlbmRSZXF1ZXN0KCkgaWYg bG9hZE5vdygpIGlzIGNhbGxlZC4KKyAgICBSZWZQdHI8TWFpblJlc291cmNlTG9hZGVyPiBwcm90 ZWN0KHRoaXMpOworCiAgICAgbV9zdWJzdGl0dXRlRGF0YSA9IHN1YnN0aXR1dGVEYXRhOwogCiAg ICAgQVNTRVJUKGRvY3VtZW50TG9hZGVyKCktPnRpbWluZygpLT5uYXZpZ2F0aW9uU3RhcnQoKSk7 CkBAIC02NzksOCArNjgzLDYgQEAgYm9vbCBNYWluUmVzb3VyY2VMb2FkZXI6OmxvYWQoY29uc3Qg UmVzbwogICAgIH0KICAgICBpZiAoZGVmZXIpCiAgICAgICAgIG1faW5pdGlhbFJlcXVlc3QgPSBy ZXF1ZXN0OwotCi0gICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgTWFpblJlc291cmNlTG9hZGVy OjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTE2MTIyKQorKysgU291cmNlL1dl YkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3 ICs1NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8 TWFpblJlc291cmNlTG9hZGVyPiBjcmVhdGUoRnJhbWUqKTsKICAgICAgICAgdmlydHVhbCB+TWFp blJlc291cmNlTG9hZGVyKCk7CiAKLSAgICAgICAgdmlydHVhbCBib29sIGxvYWQoY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgU3Vic3RpdHV0ZURhdGEmKTsKKyAgICAgICAgdm9pZCBsb2Fk KGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJik7CiAgICAgICAg IHZpcnR1YWwgdm9pZCBhZGREYXRhKGNvbnN0IGNoYXIqLCBpbnQsIGJvb2wgYWxsQXRPbmNlKTsK IAogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsK