77109 2012-01-26 09:44:40 -0800 WebPreferencesStore: use DEFINE_STATIC_LOCAL for overrides HashMap 2012-01-26 09:59:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cmarcelo cmarcelo oldest_to_newest 543208 0 cmarcelo 2012-01-26 09:44:40 -0800 Wrap static HashMap inside a function and use DEFINE_STATIC_LOCAL 543209 1 cmarcelo 2012-01-26 09:45:39 -0800 This should fix build for Clang. 543211 2 124131 cmarcelo 2012-01-26 09:48:31 -0800 Created attachment 124131 Patch 543212 3 124131 kling 2012-01-26 09:49:29 -0800 Comment on attachment 124131 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124131&action=review > Source/WebKit2/Shared/WebPreferencesStore.cpp:188 > + HashMap<String, bool>::const_iterator it = boolTestRunnerOverridesMap().find(key); You could use BoolOverridesMap::const_iterator here for style points. 543221 4 cmarcelo 2012-01-26 09:59:30 -0800 Committed r106008: <http://trac.webkit.org/changeset/106008> 124131 2012-01-26 09:48:31 -0800 2012-01-26 09:49:29 -0800 Patch bug-77109-20120126144832.patch text/plain 2796 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWVhZDJjYjVlYTQ3YzRk N2YxMzIxMzhmYzBhZTc5YmFjMDIwMGQ0ZC4uMTI3M2IzNTQzMjU0YjZlZjVmODUwOGQ3OTk1NTQ1 MzY2Y2E4NGRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTAxLTI2ICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKKyAgICAgICAgV2ViUHJlZmVyZW5jZXNTdG9yZTogdXNlIERFRklORV9TVEFUSUNfTE9DQUwg Zm9yIG92ZXJyaWRlcyBIYXNoTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NzEwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeCBidWlsZCBmb3IgQ2xhbmcuCisKKyAgICAgICAgKiBTaGFyZWQvV2Vi UHJlZmVyZW5jZXNTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0 Ojpib29sVGVzdFJ1bm5lck92ZXJyaWRlc01hcCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZl cmVuY2VzU3RvcmU6Om92ZXJyaWRlQm9vbFZhbHVlRm9yS2V5KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJlZmVyZW5jZXNTdG9yZTo6cmVtb3ZlVGVzdFJ1bm5lck92ZXJyaWRlcyk6CisgICAgICAg IChXZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OmdldEJvb2xWYWx1ZUZvcktleSk6CisKKzIw MTItMDEtMjYgIENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFA b3BlbmJvc3NhLm9yZz4KKwogICAgICAgICBJbXBsZW1lbnQgb3ZlcnJpZGVQcmVmZXJlbmNlIGZv ciBib29sZWFuIHByZWZlcmVuY2VzIGluIFdlYktpdFRlc3RSdW5uZXIKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MDMzCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcAppbmRleCAxZTRiYjA1OTE4YWIzODA5 OTI4ZmNkNzE2MTlhZGM5YmQ0ZjRiNjkwLi4wMGU4Y2MyODY3ZGFiYTA5NjJiNzgxOWMyYjliNDlh NmFhYThhMmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5j ZXNTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3Rv cmUuY3BwCkBAIC00Nyw4ICs0NywxMyBAQCBuYW1lc3BhY2UgV2ViUHJlZmVyZW5jZXNLZXkgewog CiB9IC8vIG5hbWVzcGFjZSBXZWJQcmVmZXJlbmNlc0tleQogCit0eXBlZGVmIEhhc2hNYXA8U3Ry aW5nLCBib29sPiBCb29sT3ZlcnJpZGVzTWFwOwogCi1zdGF0aWMgSGFzaE1hcDxTdHJpbmcsIGJv b2w+IGJvb2xUZXN0UnVubmVyT3ZlcnJpZGVzTWFwOworc3RhdGljIEJvb2xPdmVycmlkZXNNYXAm IGJvb2xUZXN0UnVubmVyT3ZlcnJpZGVzTWFwKCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FM KEJvb2xPdmVycmlkZXNNYXAsIG1hcCwgKCkpOworICAgIHJldHVybiBtYXA7Cit9CiAKIFdlYlBy ZWZlcmVuY2VzU3RvcmU6OldlYlByZWZlcmVuY2VzU3RvcmUoKQogewpAQCAtNzcsMTIgKzgyLDEy IEBAIGJvb2wgV2ViUHJlZmVyZW5jZXNTdG9yZTo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVj b2RlciogZGVjb2RlciwgV2ViUHJlZmVyZW5jCiAKIHZvaWQgV2ViUHJlZmVyZW5jZXNTdG9yZTo6 b3ZlcnJpZGVCb29sVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiBrZXksIGJvb2wgdmFsdWUpCiB7 Ci0gICAgYm9vbFRlc3RSdW5uZXJPdmVycmlkZXNNYXAuc2V0KGtleSwgdmFsdWUpOworICAgIGJv b2xUZXN0UnVubmVyT3ZlcnJpZGVzTWFwKCkuc2V0KGtleSwgdmFsdWUpOwogfQogCiB2b2lkIFdl YlByZWZlcmVuY2VzU3RvcmU6OnJlbW92ZVRlc3RSdW5uZXJPdmVycmlkZXMoKQogewotICAgIGJv b2xUZXN0UnVubmVyT3ZlcnJpZGVzTWFwLmNsZWFyKCk7CisgICAgYm9vbFRlc3RSdW5uZXJPdmVy cmlkZXNNYXAoKS5jbGVhcigpOwogfQogCiAKQEAgLTE4MCw4ICsxODUsOCBAQCBib29sIFdlYlBy ZWZlcmVuY2VzU3RvcmU6OnNldEJvb2xWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgYm9v bCB2YWx1ZSkKIGJvb2wgV2ViUHJlZmVyZW5jZXNTdG9yZTo6Z2V0Qm9vbFZhbHVlRm9yS2V5KGNv bnN0IFN0cmluZyYga2V5KSBjb25zdAogewogICAgIC8vIEZJWE1FOiBFeHRlbmQgb3ZlcnJpZGlu ZyB0byBvdGhlciBrZXkgdHlwZXMgdXNlZCBmcm9tIExheW91dFRlc3RDb250cm9sbGVyLgotICAg IEhhc2hNYXA8U3RyaW5nLCBib29sPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBib29sVGVzdFJ1bm5l ck92ZXJyaWRlc01hcC5maW5kKGtleSk7Ci0gICAgaWYgKGl0ICE9IGJvb2xUZXN0UnVubmVyT3Zl cnJpZGVzTWFwLmVuZCgpKQorICAgIEhhc2hNYXA8U3RyaW5nLCBib29sPjo6Y29uc3RfaXRlcmF0 b3IgaXQgPSBib29sVGVzdFJ1bm5lck92ZXJyaWRlc01hcCgpLmZpbmQoa2V5KTsKKyAgICBpZiAo aXQgIT0gYm9vbFRlc3RSdW5uZXJPdmVycmlkZXNNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJu IGl0LT5zZWNvbmQ7CiAgICAgcmV0dXJuIHZhbHVlRm9yS2V5KG1fYm9vbFZhbHVlcywga2V5KTsK IH0K