37037 2010-04-02 12:02:26 -0700 [Chrome] Clear browsing data dialog never closes if one of the WebSQLDatabase that should be removed is open at the time. 2010-04-02 20:57:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 michaeln michaeln abarth commit-queue ericu eric webkit.review.bot oldest_to_newest 207988 0 michaeln 2010-04-02 12:02:26 -0700 See sister bug... http://code.google.com/p/chromium/issues/detail?id=40245 Not long ago in r56293, the behavior of DatabaseCloseTask was altered. One callsite was updated accordingly, but another callsite was not. The second callsite is busted due to the behavior change. 208045 1 52446 michaeln 2010-04-02 13:33:15 -0700 Created attachment 52446 fix a bug regression 208073 2 ericu 2010-04-02 14:36:24 -0700 LGTM, FWIW. 208074 3 52446 japhet 2010-04-02 14:40:32 -0700 Comment on attachment 52446 fix a bug regression A rather pedantic r- since we'll need to update the ChangeLog before setting commit-queue+ anyway. > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 57019) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,21 @@ > +2010-04-02 Michael Nordman <michaeln@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Set the close policy used the by the DatabaseCloseTask in a constructor argument Typo here and in the other ChangeLog. > @@ -110,18 +110,20 @@ private: > > class DatabaseCloseTask : public DatabaseTask { > public: > - static PassOwnPtr<DatabaseCloseTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer) > + static PassOwnPtr<DatabaseCloseTask> create(Database* db, Database::ClosePolicy closePolicy, DatabaseTaskSynchronizer* synchronizer) > { > - return new DatabaseCloseTask(db, synchronizer); > + return new DatabaseCloseTask(db, closePolicy, synchronizer); > } > > private: > - DatabaseCloseTask(Database*, DatabaseTaskSynchronizer*); > + DatabaseCloseTask(Database*, Database::ClosePolicy, DatabaseTaskSynchronizer*); > > virtual void doPerformTask(); > #ifndef NDEBUG > virtual const char* debugTaskName() const; > #endif > + > + Database::ClosePolicy m_closePolicy; > }; Perhaps we should support closePolicy as an optional parameter on the constructor/create function? I assume in the vast majority of cases we will want DoNotRemoveFromDatabaseContext. I'm willing to be convinced otherwise 208078 4 michaeln 2010-04-02 14:53:26 -0700 > Perhaps we should support closePolicy as an optional parameter on the > constructor/create function? I assume > in the vast majority of cases we will want DoNotRemoveFromDatabaseContext. I'm > willing to be convinced otherwise I'd rather not do that. If there are any other clients of this task out there that aren't in webkit's svn repository, i'd like them to have to figure out what value is appropiate for their callsite. For example, if this explicit approach had been done originally, chrome wouldn't have been built with this subtle bug in it. 208080 5 52453 michaeln 2010-04-02 14:56:14 -0700 Created attachment 52453 fix ChangeLog typos 208083 6 52453 japhet 2010-04-02 15:02:05 -0700 Comment on attachment 52453 fix ChangeLog typos Fair enough. r=me 208158 7 52453 commit-queue 2010-04-02 17:07:03 -0700 Comment on attachment 52453 fix ChangeLog typos Clearing flags on attachment: 52453 Committed r57034: <http://trac.webkit.org/changeset/57034> 208159 8 commit-queue 2010-04-02 17:07:08 -0700 All reviewed patches have been landed. Closing bug. 208189 9 webkit.review.bot 2010-04-02 17:46:27 -0700 http://trac.webkit.org/changeset/57034 might have broken Leopard Intel Release (Tests) 208191 10 michaeln 2010-04-02 18:01:23 -0700 (In reply to comment #9) > http://trac.webkit.org/changeset/57034 might have broken Leopard Intel Release > (Tests) fyi: this change should be a noop for all but chromium, before and after the patch, WebCore::Database::markAsDeletedAndClose() is using the DoNotRemoveDatabaseFromContext policy. 208205 11 abarth 2010-04-02 20:57:17 -0700 > fyi: this change should be a noop for all but chromium, before and after the > patch, WebCore::Database::markAsDeletedAndClose() is using the > DoNotRemoveDatabaseFromContext policy. My apologies, but I think you were bit by https://bugs.webkit.org/show_bug.cgi?id=36646 occurring twice in a row. 52446 2010-04-02 13:33:15 -0700 2010-04-02 14:56:14 -0700 fix a bug regression closePolicy.txt text/plain 5396 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzAxOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDQtMDIgIE1pY2hhZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IHRoZSBjbG9zZSBwb2xpY3kgdXNlZCB0aGUgYnkgdGhlIERhdGFiYXNlQ2xvc2VUYXNr IGluIGEgY29uc3RydWN0b3IgYXJndW1lbnQKKyAgICAgICAgaW5zdGVhZCBvZiBoYXJkIGNvZGlu ZyBpdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3 MDM3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBuZXcgbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAg ICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlLmNwcDogVGhpcyBjYWxsc2l0ZSBwYXNzZXMgaW4gRG9O b3RSZW1vdmVGcm9tRGF0YWJhc2VDb250ZXh0IHRvIHJldGFpbiBpdHMgY3VycmVudCBiZWhhdmlv ci4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlOjptYXJrQXNEZWxldGVkQW5kQ2xvc2UpOgor ICAgICAgICAqIHN0b3JhZ2UvRGF0YWJhc2VUYXNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGFiYXNlQ2xvc2VUYXNrOjpEYXRhYmFzZUNsb3NlVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpE YXRhYmFzZUNsb3NlVGFzazo6ZG9QZXJmb3JtVGFzayk6CisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZVRhc2suaDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlQ2xvc2VUYXNrOjpjcmVhdGUp OgorCiAyMDEwLTA0LTAyICBaaGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2Uu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAJKHJldmlzaW9u IDU3MDExKQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzg0LDcgKzM4NCw3IEBAIHZvaWQgRGF0YWJhc2U6Om1hcmtBc0RlbGV0ZWRBbmRDbG9zZSgp CiAgICAgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5kYXRhYmFzZVRocmVhZCgpLT51bnNjaGVk dWxlRGF0YWJhc2VUYXNrcyh0aGlzKTsKIAogICAgIERhdGFiYXNlVGFza1N5bmNocm9uaXplciBz eW5jaHJvbml6ZXI7Ci0gICAgT3duUHRyPERhdGFiYXNlQ2xvc2VUYXNrPiB0YXNrID0gRGF0YWJh c2VDbG9zZVRhc2s6OmNyZWF0ZSh0aGlzLCAmc3luY2hyb25pemVyKTsKKyAgICBPd25QdHI8RGF0 YWJhc2VDbG9zZVRhc2s+IHRhc2sgPSBEYXRhYmFzZUNsb3NlVGFzazo6Y3JlYXRlKHRoaXMsIERv Tm90UmVtb3ZlRGF0YWJhc2VGcm9tQ29udGV4dCwgJnN5bmNocm9uaXplcik7CiAKICAgICBtX3Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQtPmRhdGFiYXNlVGhyZWFkKCktPnNjaGVkdWxlSW1tZWRpYXRl VGFzayh0YXNrLnJlbGVhc2UoKSk7CiAgICAgc3luY2hyb25pemVyLndhaXRGb3JUYXNrQ29tcGxl dGlvbigpOwpJbmRleDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGFzay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGFzay5jcHAJKHJldmlzaW9uIDU3MDExKQor KysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGFzay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEx MCwxNSArMTEwLDE1IEBAIGNvbnN0IGNoYXIqIERhdGFiYXNlT3BlblRhc2s6OmRlYnVnVGFza04K IC8vICoqKiBEYXRhYmFzZUNsb3NlVGFzayAqKioKIC8vIENsb3NlcyB0aGUgZGF0YWJhc2UuCiAK LURhdGFiYXNlQ2xvc2VUYXNrOjpEYXRhYmFzZUNsb3NlVGFzayhEYXRhYmFzZSogZGF0YWJhc2Us IERhdGFiYXNlVGFza1N5bmNocm9uaXplciogc3luY2hyb25pemVyKQorRGF0YWJhc2VDbG9zZVRh c2s6OkRhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlKiBkYXRhYmFzZSwgRGF0YWJhc2U6OkNsb3Nl UG9saWN5IGNsb3NlUG9saWN5LCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqIHN5bmNocm9uaXpl cikKICAgICA6IERhdGFiYXNlVGFzayhkYXRhYmFzZSwgc3luY2hyb25pemVyKQorICAgICwgbV9j bG9zZVBvbGljeShjbG9zZVBvbGljeSkKIHsKIH0KIAogdm9pZCBEYXRhYmFzZUNsb3NlVGFzazo6 ZG9QZXJmb3JtVGFzaygpCiB7Ci0gICAgLy8gVGVsbCB0aGUgZGF0YWJhc2Ugbm90IHRvIGNhbGwg YmFjayB0byB0aGUgY29udGV4dCB0aHJlYWQ7IHdlJ2xsIGhhbmRsZSBpdC4KLSAgICBkYXRhYmFz ZSgpLT5jbG9zZShEYXRhYmFzZTo6RG9Ob3RSZW1vdmVEYXRhYmFzZUZyb21Db250ZXh0KTsKKyAg ICBkYXRhYmFzZSgpLT5jbG9zZShtX2Nsb3NlUG9saWN5KTsKIH0KIAogI2lmbmRlZiBOREVCVUcK SW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRhc2suaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3N0b3JhZ2UvRGF0YWJhc2VUYXNrLmgJKHJldmlzaW9uIDU3MDExKQorKysgV2ViQ29yZS9z dG9yYWdlL0RhdGFiYXNlVGFzay5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAj ZGVmaW5lIERhdGFiYXNlVGFza19oCiAKICNpZiBFTkFCTEUoREFUQUJBU0UpCisjaW5jbHVkZSAi RGF0YWJhc2UuaCIKICNpbmNsdWRlICJFeGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiUGxhdGZv cm1TdHJpbmcuaCIKICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CkBAIC0zOSw3ICs0MCw2IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgRGF0YWJhc2U7CiBjbGFzcyBEYXRhYmFzZVRh c2s7CiBjbGFzcyBEYXRhYmFzZVRocmVhZDsKIGNsYXNzIFNRTFZhbHVlOwpAQCAtMTEwLDE4ICsx MTAsMjAgQEAgcHJpdmF0ZToKIAogY2xhc3MgRGF0YWJhc2VDbG9zZVRhc2sgOiBwdWJsaWMgRGF0 YWJhc2VUYXNrIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093blB0cjxEYXRhYmFzZUNsb3Nl VGFzaz4gY3JlYXRlKERhdGFiYXNlKiBkYiwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5j aHJvbml6ZXIpCisgICAgc3RhdGljIFBhc3NPd25QdHI8RGF0YWJhc2VDbG9zZVRhc2s+IGNyZWF0 ZShEYXRhYmFzZSogZGIsIERhdGFiYXNlOjpDbG9zZVBvbGljeSBjbG9zZVBvbGljeSwgRGF0YWJh c2VUYXNrU3luY2hyb25pemVyKiBzeW5jaHJvbml6ZXIpCiAgICAgeyAKLSAgICAgICAgcmV0dXJu IG5ldyBEYXRhYmFzZUNsb3NlVGFzayhkYiwgc3luY2hyb25pemVyKTsKKyAgICAgICAgcmV0dXJu IG5ldyBEYXRhYmFzZUNsb3NlVGFzayhkYiwgY2xvc2VQb2xpY3ksIHN5bmNocm9uaXplcik7CiAg ICAgfQogCiBwcml2YXRlOgotICAgIERhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlKiwgRGF0YWJh c2VUYXNrU3luY2hyb25pemVyKik7CisgICAgRGF0YWJhc2VDbG9zZVRhc2soRGF0YWJhc2UqLCBE YXRhYmFzZTo6Q2xvc2VQb2xpY3ksIERhdGFiYXNlVGFza1N5bmNocm9uaXplciopOwogCiAgICAg dmlydHVhbCB2b2lkIGRvUGVyZm9ybVRhc2soKTsKICNpZm5kZWYgTkRFQlVHCiAgICAgdmlydHVh bCBjb25zdCBjaGFyKiBkZWJ1Z1Rhc2tOYW1lKCkgY29uc3Q7CiAjZW5kaWYKKworICAgIERhdGFi YXNlOjpDbG9zZVBvbGljeSBtX2Nsb3NlUG9saWN5OwogfTsKIAogY2xhc3MgRGF0YWJhc2VUcmFu c2FjdGlvblRhc2sgOiBwdWJsaWMgRGF0YWJhc2VUYXNrIHsKSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2 aXNpb24gNTcwMTkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMDIgIE1pY2hhZWwgTm9yZG1hbiAgPG1pY2hhZWxu QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2V0IHRoZSBjbG9zZSBwb2xpY3kgdXNlZCB0aGUgYnkgdGhlIERhdGFiYXNlQ2xvc2VU YXNrIGF0IHRoaXMgY2FsbHNpdGUgdG8KKyAgICAgICAgUmVtb3ZlRGF0YWJhc2VGcm9tQ29udGV4 dC4gVGhpcyByZXN0b3JlcyBpdHMgYmVoYXZpb3IgdG8gd2hhdCBpdCB3YXMgcHJpb3IgdG8KKyAg ICAgICAgcjU2MjkzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzcwMzcKKworICAgICAgICAqIHNyYy9XZWJEYXRhYmFzZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkRhdGFiYXNlOjpjbG9zZURhdGFiYXNlSW1tZWRpYXRlbHkpOgorCiAyMDEwLTA0 LTAyICBaaGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGFiYXNlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGFiYXNlLmNwcAkocmV2aXNp b24gNTcwMTEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGFiYXNlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTE5LDcgKzExOSw3IEBAIHZvaWQgV2ViRGF0YWJhc2U6OmNsb3NlRGF0YWJh c2VJbW1lZGlhdGUKICAgICAgICAgRGF0YWJhc2VUaHJlYWQqIGRhdGFiYXNlVGhyZWFkID0gZGF0 YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ZGF0YWJhc2VUaHJlYWQoKTsKICAgICAg ICAgaWYgKGRhdGFiYXNlVGhyZWFkICYmICFkYXRhYmFzZVRocmVhZC0+dGVybWluYXRpb25SZXF1 ZXN0ZWQoKSkgewogICAgICAgICAgICAgZGF0YWJhc2UtPnN0b3AoKTsKLSAgICAgICAgICAgIGRh dGFiYXNlVGhyZWFkLT5zY2hlZHVsZVRhc2soRGF0YWJhc2VDbG9zZVRhc2s6OmNyZWF0ZShkYXRh YmFzZSwgMCkpOworICAgICAgICAgICAgZGF0YWJhc2VUaHJlYWQtPnNjaGVkdWxlVGFzayhEYXRh YmFzZUNsb3NlVGFzazo6Y3JlYXRlKGRhdGFiYXNlLCBEYXRhYmFzZTo6UmVtb3ZlRGF0YWJhc2VG cm9tQ29udGV4dCwgMCkpOwogICAgICAgICB9CiAgICAgfQogfQo= 52453 2010-04-02 14:56:14 -0700 2010-04-02 17:07:03 -0700 fix ChangeLog typos closePolicy2.txt text/plain 5388 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzAxOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDQtMDIgIE1pY2hhZWwgTm9yZG1hbiAgPG1pY2hhZWxuQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IHRoZSBjbG9zZSBwb2xpY3kgdXNlZCBieSB0aGUgRGF0YWJhc2VDbG9zZVRhc2sgaW4g YSBjb25zdHJ1Y3RvciBhcmd1bWVudAorICAgICAgICBpbnN0ZWFkIG9mIGhhcmQgY29kaW5nIGl0 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwMzcK KworICAgICAgICBObyBuZXcgdGVzdHMsIG5ldyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAg ICAqIHN0b3JhZ2UvRGF0YWJhc2UuY3BwOiBUaGlzIGNhbGxzaXRlIHBhc3NlcyBpbiBEb05vdFJl bW92ZUZyb21EYXRhYmFzZUNvbnRleHQgdG8gcmV0YWluIGl0cyBjdXJyZW50IGJlaGF2aW9yLgor ICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6Om1hcmtBc0RlbGV0ZWRBbmRDbG9zZSk6CisgICAg ICAgICogc3RvcmFnZS9EYXRhYmFzZVRhc2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJh c2VDbG9zZVRhc2s6OkRhdGFiYXNlQ2xvc2VUYXNrKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFi YXNlQ2xvc2VUYXNrOjpkb1BlcmZvcm1UYXNrKToKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNl VGFzay5oOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VDbG9zZVRhc2s6OmNyZWF0ZSk6CisK IDIwMTAtMDQtMDIgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkocmV2aXNpb24gNTcw MTEpCisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z ODQsNyArMzg0LDcgQEAgdm9pZCBEYXRhYmFzZTo6bWFya0FzRGVsZXRlZEFuZENsb3NlKCkKICAg ICBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmRhdGFiYXNlVGhyZWFkKCktPnVuc2NoZWR1bGVE YXRhYmFzZVRhc2tzKHRoaXMpOwogCiAgICAgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyIHN5bmNo cm9uaXplcjsKLSAgICBPd25QdHI8RGF0YWJhc2VDbG9zZVRhc2s+IHRhc2sgPSBEYXRhYmFzZUNs b3NlVGFzazo6Y3JlYXRlKHRoaXMsICZzeW5jaHJvbml6ZXIpOworICAgIE93blB0cjxEYXRhYmFz ZUNsb3NlVGFzaz4gdGFzayA9IERhdGFiYXNlQ2xvc2VUYXNrOjpjcmVhdGUodGhpcywgRG9Ob3RS ZW1vdmVEYXRhYmFzZUZyb21Db250ZXh0LCAmc3luY2hyb25pemVyKTsKIAogICAgIG1fc2NyaXB0 RXhlY3V0aW9uQ29udGV4dC0+ZGF0YWJhc2VUaHJlYWQoKS0+c2NoZWR1bGVJbW1lZGlhdGVUYXNr KHRhc2sucmVsZWFzZSgpKTsKICAgICBzeW5jaHJvbml6ZXIud2FpdEZvclRhc2tDb21wbGV0aW9u KCk7CkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUYXNrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUYXNrLmNwcAkocmV2aXNpb24gNTcwMTEpCisrKyBX ZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUYXNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDE1 ICsxMTAsMTUgQEAgY29uc3QgY2hhciogRGF0YWJhc2VPcGVuVGFzazo6ZGVidWdUYXNrTgogLy8g KioqIERhdGFiYXNlQ2xvc2VUYXNrICoqKgogLy8gQ2xvc2VzIHRoZSBkYXRhYmFzZS4KIAotRGF0 YWJhc2VDbG9zZVRhc2s6OkRhdGFiYXNlQ2xvc2VUYXNrKERhdGFiYXNlKiBkYXRhYmFzZSwgRGF0 YWJhc2VUYXNrU3luY2hyb25pemVyKiBzeW5jaHJvbml6ZXIpCitEYXRhYmFzZUNsb3NlVGFzazo6 RGF0YWJhc2VDbG9zZVRhc2soRGF0YWJhc2UqIGRhdGFiYXNlLCBEYXRhYmFzZTo6Q2xvc2VQb2xp Y3kgY2xvc2VQb2xpY3ksIERhdGFiYXNlVGFza1N5bmNocm9uaXplciogc3luY2hyb25pemVyKQog ICAgIDogRGF0YWJhc2VUYXNrKGRhdGFiYXNlLCBzeW5jaHJvbml6ZXIpCisgICAgLCBtX2Nsb3Nl UG9saWN5KGNsb3NlUG9saWN5KQogewogfQogCiB2b2lkIERhdGFiYXNlQ2xvc2VUYXNrOjpkb1Bl cmZvcm1UYXNrKCkKIHsKLSAgICAvLyBUZWxsIHRoZSBkYXRhYmFzZSBub3QgdG8gY2FsbCBiYWNr IHRvIHRoZSBjb250ZXh0IHRocmVhZDsgd2UnbGwgaGFuZGxlIGl0LgotICAgIGRhdGFiYXNlKCkt PmNsb3NlKERhdGFiYXNlOjpEb05vdFJlbW92ZURhdGFiYXNlRnJvbUNvbnRleHQpOworICAgIGRh dGFiYXNlKCktPmNsb3NlKG1fY2xvc2VQb2xpY3kpOwogfQogCiAjaWZuZGVmIE5ERUJVRwpJbmRl eDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGFzay5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv c3RvcmFnZS9EYXRhYmFzZVRhc2suaAkocmV2aXNpb24gNTcwMTEpCisrKyBXZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUYXNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNkZWZp bmUgRGF0YWJhc2VUYXNrX2gKIAogI2lmIEVOQUJMRShEQVRBQkFTRSkKKyNpbmNsdWRlICJEYXRh YmFzZS5oIgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0 cmluZy5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KQEAgLTM5LDcgKzQwLDYgQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEYXRhYmFzZTsKIGNsYXNzIERhdGFiYXNlVGFzazsK IGNsYXNzIERhdGFiYXNlVGhyZWFkOwogY2xhc3MgU1FMVmFsdWU7CkBAIC0xMTAsMTggKzExMCwy MCBAQCBwcml2YXRlOgogCiBjbGFzcyBEYXRhYmFzZUNsb3NlVGFzayA6IHB1YmxpYyBEYXRhYmFz ZVRhc2sgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPERhdGFiYXNlQ2xvc2VUYXNr PiBjcmVhdGUoRGF0YWJhc2UqIGRiLCBEYXRhYmFzZVRhc2tTeW5jaHJvbml6ZXIqIHN5bmNocm9u aXplcikKKyAgICBzdGF0aWMgUGFzc093blB0cjxEYXRhYmFzZUNsb3NlVGFzaz4gY3JlYXRlKERh dGFiYXNlKiBkYiwgRGF0YWJhc2U6OkNsb3NlUG9saWN5IGNsb3NlUG9saWN5LCBEYXRhYmFzZVRh c2tTeW5jaHJvbml6ZXIqIHN5bmNocm9uaXplcikKICAgICB7IAotICAgICAgICByZXR1cm4gbmV3 IERhdGFiYXNlQ2xvc2VUYXNrKGRiLCBzeW5jaHJvbml6ZXIpOworICAgICAgICByZXR1cm4gbmV3 IERhdGFiYXNlQ2xvc2VUYXNrKGRiLCBjbG9zZVBvbGljeSwgc3luY2hyb25pemVyKTsKICAgICB9 CiAKIHByaXZhdGU6Ci0gICAgRGF0YWJhc2VDbG9zZVRhc2soRGF0YWJhc2UqLCBEYXRhYmFzZVRh c2tTeW5jaHJvbml6ZXIqKTsKKyAgICBEYXRhYmFzZUNsb3NlVGFzayhEYXRhYmFzZSosIERhdGFi YXNlOjpDbG9zZVBvbGljeSwgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyKik7CiAKICAgICB2aXJ0 dWFsIHZvaWQgZG9QZXJmb3JtVGFzaygpOwogI2lmbmRlZiBOREVCVUcKICAgICB2aXJ0dWFsIGNv bnN0IGNoYXIqIGRlYnVnVGFza05hbWUoKSBjb25zdDsKICNlbmRpZgorCisgICAgRGF0YWJhc2U6 OkNsb3NlUG9saWN5IG1fY2xvc2VQb2xpY3k7CiB9OwogCiBjbGFzcyBEYXRhYmFzZVRyYW5zYWN0 aW9uVGFzayA6IHB1YmxpYyBEYXRhYmFzZVRhc2sgewpJbmRleDogV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lv biA1NzAxOSkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNSBAQAorMjAxMC0wNC0wMiAgTWljaGFlbCBOb3JkbWFuICA8bWljaGFlbG5AZ29v Z2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTZXQgdGhlIGNsb3NlIHBvbGljeSB1c2VkIGJ5IHRoZSBEYXRhYmFzZUNsb3NlVGFzayBhdCB0 aGlzIGNhbGxzaXRlIHRvCisgICAgICAgIFJlbW92ZURhdGFiYXNlRnJvbUNvbnRleHQuIFRoaXMg cmVzdG9yZXMgaXRzIGJlaGF2aW9yIHRvIHdoYXQgaXQgd2FzIHByaW9yIHRvCisgICAgICAgIHI1 NjI5My4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3 MDM3CisKKyAgICAgICAgKiBzcmMvV2ViRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJEYXRhYmFzZTo6Y2xvc2VEYXRhYmFzZUltbWVkaWF0ZWx5KToKKwogMjAxMC0wNC0wMiAgWmhl bnlhbyBNbyAgPHptb0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhYmFzZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhYmFzZS5jcHAJKHJldmlzaW9uIDU3MDEx KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhYmFzZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTExOSw3ICsxMTksNyBAQCB2b2lkIFdlYkRhdGFiYXNlOjpjbG9zZURhdGFiYXNlSW1tZWRp YXRlCiAgICAgICAgIERhdGFiYXNlVGhyZWFkKiBkYXRhYmFzZVRocmVhZCA9IGRhdGFiYXNlLT5z Y3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmRhdGFiYXNlVGhyZWFkKCk7CiAgICAgICAgIGlmIChk YXRhYmFzZVRocmVhZCAmJiAhZGF0YWJhc2VUaHJlYWQtPnRlcm1pbmF0aW9uUmVxdWVzdGVkKCkp IHsKICAgICAgICAgICAgIGRhdGFiYXNlLT5zdG9wKCk7Ci0gICAgICAgICAgICBkYXRhYmFzZVRo cmVhZC0+c2NoZWR1bGVUYXNrKERhdGFiYXNlQ2xvc2VUYXNrOjpjcmVhdGUoZGF0YWJhc2UsIDAp KTsKKyAgICAgICAgICAgIGRhdGFiYXNlVGhyZWFkLT5zY2hlZHVsZVRhc2soRGF0YWJhc2VDbG9z ZVRhc2s6OmNyZWF0ZShkYXRhYmFzZSwgRGF0YWJhc2U6OlJlbW92ZURhdGFiYXNlRnJvbUNvbnRl eHQsIDApKTsKICAgICAgICAgfQogICAgIH0KIH0K