80257 2012-03-05 02:10:36 -0800 Lifecycle of InternalSettings should be simplified. 2012-03-05 16:47:44 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 79935 1 morrita morrita oldest_to_newest 570530 0 morrita 2012-03-05 02:10:36 -0800 InternalSettings::create() is simply crazy. We need to simplify it before it becomes worse. 571164 1 130229 morrita 2012-03-05 16:35:24 -0800 Created attachment 130229 Patch 571172 2 130229 rniwa 2012-03-05 16:40:46 -0800 Comment on attachment 130229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130229&action=review rs=me > Source/WebCore/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=80257 > + Lifecycle of InternalSettings should be simplified. The order is wrong :( > Source/WebCore/testing/InternalSettings.cpp:94 > + , m_passwordEchoDurationInSecondsBackup(settings()->passwordEchoDurationInSeconds()) > + , m_passwordEchoEnabledBackup(settings()->passwordEchoEnabled()) It's better to call these two variables m_originalPasswordEchoDurationInSeconds and m_originalPasswordEchoEnabled to be consistent with similar variables in WebKit. 571185 3 morrita 2012-03-05 16:47:44 -0800 Committed r109817: <http://trac.webkit.org/changeset/109817> 130229 2012-03-05 16:35:24 -0800 2012-03-05 16:40:46 -0800 Patch bug-80257-20120306093522.patch text/plain 5915 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5ODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzljNDcyZWYyZTYwYTEw YmEyNjE4Yzk1ODYyOTEwNjc5OWI3YzViOS4uYzc3Y2EzMTk5NjE2ZTFkZTJlYWJlNzM5YzVmN2Mw ZjUxY2JmZGQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTAzLTA1ICBNT1JJ VEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDI1NworICAgICAgICBMaWZlY3ljbGUgb2YgSW50 ZXJuYWxTZXR0aW5ncyBzaG91bGQgYmUgc2ltcGxpZmllZC4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIE1vdmVkIHNldHRpbmdzIHVwZGF0ZSBjb2Rl IHRvIHNlcGFyYXRlIHJlc3RvcmVUbygpIG1ldGhvZC4KKyAgICAgICAgLSBFbGltaW5hdGVkIGZs YWdzIHdoaWNoIGluZGlkYXRlIHRoZSBjaGFuZ2VkIGZpZWxkLgorICAgICAgICAgIE5vdyB0aGVz ZSBtb2RpZmlhYmxlIHBhcmFtZXRlcnMgYXJlIGJhY2tlZCB1cCBhdCB0aGUgaW5pdGlhbGl6YXRp b24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBSZWZhY3RvcmluZy4KKworICAgICAgICAqIHRl c3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbFNl dHRpbmdzOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxTZXR0aW5nczo6SW50 ZXJuYWxTZXR0aW5ncyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu dGVybmFsU2V0dGluZ3M6OnJlc3RvcmVUbyk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNl dHRpbmdzLmg6CisgICAgICAgIChJbnRlcm5hbFNldHRpbmdzKToKKyAgICAgICAgKiB0ZXN0aW5n L0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnJlc2V0KToKKwog MjAxMi0wMy0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIEJlIG1vcmUgYWdncmVzc2l2ZSBhYm91dCByZXBhaW50aW5nIHBhZ2Ugb3ZlcmxheXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAgYi9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCmluZGV4IDI4ODRlNTY2 MTE4Nzg5YzBkZTA3NTAxZTFhMTE0ZWRlNDU4YTE1NzAuLjE0ODhhZDhkNjRmMmE3ZTliNDA4NTlj NWRhZjFmYzA3OWYzZjE2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNl dHRpbmdzLmNwcApAQCAtNzksMjcgKzc5LDI3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIAot UGFzc1JlZlB0cjxJbnRlcm5hbFNldHRpbmdzPiBJbnRlcm5hbFNldHRpbmdzOjpjcmVhdGUoRnJh bWUqIGZyYW1lLCBJbnRlcm5hbFNldHRpbmdzKiBvbGQpCitQYXNzUmVmUHRyPEludGVybmFsU2V0 dGluZ3M+IEludGVybmFsU2V0dGluZ3M6OmNyZWF0ZShGcmFtZSogZnJhbWUpCiB7Ci0gICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBJbnRlcm5hbFNldHRpbmdzKGZyYW1lLCBvbGQpKTsKKyAgICByZXR1 cm4gYWRvcHRSZWYobmV3IEludGVybmFsU2V0dGluZ3MoZnJhbWUpKTsKIH0KIAogSW50ZXJuYWxT ZXR0aW5nczo6fkludGVybmFsU2V0dGluZ3MoKQogewogfQogCi1JbnRlcm5hbFNldHRpbmdzOjpJ bnRlcm5hbFNldHRpbmdzKEZyYW1lKiBmcmFtZSwgSW50ZXJuYWxTZXR0aW5ncyogb2xkKQorSW50 ZXJuYWxTZXR0aW5nczo6SW50ZXJuYWxTZXR0aW5ncyhGcmFtZSogZnJhbWUpCiAgICAgOiBGcmFt ZURlc3RydWN0aW9uT2JzZXJ2ZXIoZnJhbWUpCi0gICAgLCBtX3Bhc3N3b3JkRWNob0R1cmF0aW9u SW5TZWNvbmRzQmFja3VwKDApCi0gICAgLCBtX3Bhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRz QmFja2VkVXAoZmFsc2UpCi0gICAgLCBtX3Bhc3N3b3JkRWNob0VuYWJsZWRCYWNrZWRVcChmYWxz ZSkKLXsKLSAgICBpZiAob2xkICYmIHNldHRpbmdzKCkpIHsKLSAgICAgICAgaWYgKG9sZC0+bV9w YXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kc0JhY2tlZFVwKQotICAgICAgICAgICAgc2V0dGlu Z3MoKS0+c2V0UGFzc3dvcmRFY2hvRHVyYXRpb25JblNlY29uZHMob2xkLT5tX3Bhc3N3b3JkRWNo b0R1cmF0aW9uSW5TZWNvbmRzQmFja3VwKTsKLSAgICAgICAgaWYgKG9sZC0+bV9wYXNzd29yZEVj aG9FbmFibGVkQmFja2VkVXApCi0gICAgICAgICAgICBzZXR0aW5ncygpLT5zZXRQYXNzd29yZEVj aG9FbmFibGVkKG9sZC0+bV9wYXNzd29yZEVjaG9FbmFibGVkQmFja3VwKTsKLSAgICB9CisgICAg LCBtX3Bhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzQmFja3VwKHNldHRpbmdzKCktPnBhc3N3 b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKCkpCisgICAgLCBtX3Bhc3N3b3JkRWNob0VuYWJsZWRC YWNrdXAoc2V0dGluZ3MoKS0+cGFzc3dvcmRFY2hvRW5hYmxlZCgpKQorCit7Cit9CisKK3ZvaWQg SW50ZXJuYWxTZXR0aW5nczo6cmVzdG9yZVRvKFNldHRpbmdzKiBzZXR0aW5ncykKK3sKKyAgICBz ZXR0aW5ncy0+c2V0UGFzc3dvcmRFY2hvRHVyYXRpb25JblNlY29uZHMobV9wYXNzd29yZEVjaG9E dXJhdGlvbkluU2Vjb25kc0JhY2t1cCk7CisgICAgc2V0dGluZ3MtPnNldFBhc3N3b3JkRWNob0Vu YWJsZWQobV9wYXNzd29yZEVjaG9FbmFibGVkQmFja3VwKTsKIH0KIAogU2V0dGluZ3MqIEludGVy bmFsU2V0dGluZ3M6OnNldHRpbmdzKCkgY29uc3QKQEAgLTE3MywyMCArMTczLDEyIEBAIHZvaWQg SW50ZXJuYWxTZXR0aW5nczo6c2V0TW9ja1Njcm9sbGJhcnNFbmFibGVkKGJvb2wgZW5hYmxlZCwg RXhjZXB0aW9uQ29kZSYgZWMpCiB2b2lkIEludGVybmFsU2V0dGluZ3M6OnNldFBhc3N3b3JkRWNo b0VuYWJsZWQoYm9vbCBlbmFibGVkLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBJbnRlcm5h bFNldHRpbmdzR3VhcmRGb3JTZXR0aW5ncygpOwotICAgIGlmICghbV9wYXNzd29yZEVjaG9FbmFi bGVkQmFja2VkVXApIHsKLSAgICAgICAgbV9wYXNzd29yZEVjaG9FbmFibGVkQmFja3VwID0gc2V0 dGluZ3MoKS0+cGFzc3dvcmRFY2hvRW5hYmxlZCgpOwotICAgICAgICBtX3Bhc3N3b3JkRWNob0Vu YWJsZWRCYWNrZWRVcCA9IHRydWU7Ci0gICAgfQogICAgIHNldHRpbmdzKCktPnNldFBhc3N3b3Jk RWNob0VuYWJsZWQoZW5hYmxlZCk7CiB9CiAKIHZvaWQgSW50ZXJuYWxTZXR0aW5nczo6c2V0UGFz c3dvcmRFY2hvRHVyYXRpb25JblNlY29uZHMoZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRzLCBFeGNl cHRpb25Db2RlJiBlYykKIHsKICAgICBJbnRlcm5hbFNldHRpbmdzR3VhcmRGb3JTZXR0aW5ncygp OwotICAgIGlmICghbV9wYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kc0JhY2tlZFVwKSB7Ci0g ICAgICAgIG1fcGFzc3dvcmRFY2hvRHVyYXRpb25JblNlY29uZHNCYWNrdXAgPSBzZXR0aW5ncygp LT5wYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kcygpOwotICAgICAgICBtX3Bhc3N3b3JkRWNo b0R1cmF0aW9uSW5TZWNvbmRzQmFja2VkVXAgPSB0cnVlOwotICAgIH0KICAgICBzZXR0aW5ncygp LT5zZXRQYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kcyhkdXJhdGlvbkluU2Vjb25kcyk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5o IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmgKaW5kZXggZWY2NmM5 OTU5NTIzYzQ4ZWUxYjU4MTg0ODkxY2UwOWVhYWZjOWRlOS4uZjE3ODNlYjllZjVlYjA0ZTMyZmEw YjQ2ODU2MGUwMzNhZDRlZGQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbFNldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNl dHRpbmdzLmgKQEAgLTQzLDcgKzQzLDcgQEAgY2xhc3MgU2V0dGluZ3M7CiBjbGFzcyBJbnRlcm5h bFNldHRpbmdzIDogcHVibGljIFJlZkNvdW50ZWQ8SW50ZXJuYWxTZXR0aW5ncz4sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgcHVibGljIEZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlciB7CiBwdWJs aWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8SW50ZXJuYWxTZXR0aW5ncz4gY3JlYXRlKEZyYW1l KiwgSW50ZXJuYWxTZXR0aW5ncyogb2xkKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnRlcm5h bFNldHRpbmdzPiBjcmVhdGUoRnJhbWUqKTsKICAgICB2aXJ0dWFsIH5JbnRlcm5hbFNldHRpbmdz KCk7CiAKICAgICB2b2lkIHNldEluc3BlY3RvclJlc291cmNlc0RhdGFTaXplTGltaXRzKGludCBt YXhpbXVtUmVzb3VyY2VzQ29udGVudFNpemUsIGludCBtYXhpbXVtU2luZ2xlUmVzb3VyY2VDb250 ZW50U2l6ZSwgRXhjZXB0aW9uQ29kZSYpOwpAQCAtNjIsOCArNjIsMTAgQEAgcHVibGljOgogICAg IHZvaWQgc2V0UGVyVGlsZURyYXdpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCwgRXhjZXB0aW9uQ29k ZSYpOwogICAgIHZvaWQgc2V0VG91Y2hFdmVudEVtdWxhdGlvbkVuYWJsZWQoYm9vbCBlbmFibGVk LCBFeGNlcHRpb25Db2RlJik7CiAKKyAgICB2b2lkIHJlc3RvcmVUbyhTZXR0aW5ncyopOworCiBw cml2YXRlOgotICAgIEludGVybmFsU2V0dGluZ3MoRnJhbWUqLCBJbnRlcm5hbFNldHRpbmdzKiBv bGQpOworICAgIEludGVybmFsU2V0dGluZ3MoRnJhbWUqKTsKIAogICAgIFNldHRpbmdzKiBzZXR0 aW5ncygpIGNvbnN0OwogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0OwpAQCAtNzEsOCAr NzMsNiBAQCBwcml2YXRlOgogCiAgICAgZG91YmxlIG1fcGFzc3dvcmRFY2hvRHVyYXRpb25JblNl Y29uZHNCYWNrdXA7CiAgICAgYm9vbCBtX3Bhc3N3b3JkRWNob0VuYWJsZWRCYWNrdXAgOiAxOwot ICAgIGJvb2wgbV9wYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kc0JhY2tlZFVwIDogMTsKLSAg ICBib29sIG1fcGFzc3dvcmRFY2hvRW5hYmxlZEJhY2tlZFVwIDogMTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCAzMjNl NWFhODRkNmQ2OWEyNzIwMjcxMGZhMTRmNjYyMzdiZTYwOWYxLi4zOTg3MjZmZWYzOTY3NmUyNDc4 YjcxOTlkNjNmMGMyYmMxNjc3ZTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3Bw CkBAIC00MzQsNyArNDM0LDEwIEBAIHZvaWQgSW50ZXJuYWxzOjpyZXNldChEb2N1bWVudCogZG9j dW1lbnQpCiAgICAgICAgIHJldHVybjsKIAogICAgIG9ic2VydmVGcmFtZShkb2N1bWVudC0+ZnJh bWUoKSk7Ci0gICAgbV9zZXR0aW5ncyA9IEludGVybmFsU2V0dGluZ3M6OmNyZWF0ZShkb2N1bWVu dC0+ZnJhbWUoKSwgbV9zZXR0aW5ncy5nZXQoKSk7CisKKyAgICBpZiAobV9zZXR0aW5ncykKKyAg ICAgICAgbV9zZXR0aW5ncy0+cmVzdG9yZVRvKGRvY3VtZW50LT5wYWdlKCktPnNldHRpbmdzKCkp OworICAgIG1fc2V0dGluZ3MgPSBJbnRlcm5hbFNldHRpbmdzOjpjcmVhdGUoZG9jdW1lbnQtPmZy YW1lKCkpOwogICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKSkKICAgICAgICAg cGFnZS0+c2V0UGFnaW5hdGlvbihQYWdlOjpQYWdpbmF0aW9uKCkpOwogfQo=