112004 2013-03-11 07:26:42 -0700 Add USE(PLATFORM_STRATEGIES) ifdefs to StorageNamespace.cpp 2013-03-18 07:29:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111729 1 cgarcia webkit-unassigned andersca rwlbuis webkit.review.bot oldest_to_newest 852286 0 cgarcia 2013-03-11 07:26:42 -0700 Platform strategies are used there without checking if PLATFORM_STRATEGIES enabled. This breaks the build of ports not using platform strategies yet. 852289 1 192466 cgarcia 2013-03-11 07:29:38 -0700 Created attachment 192466 Patch 852351 2 192466 rwlbuis 2013-03-11 08:34:44 -0700 Comment on attachment 192466 Patch LGTM. 852487 3 192466 ap 2013-03-11 11:15:06 -0700 Comment on attachment 192466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192466&action=review > Source/WebCore/storage/StorageNamespace.cpp:34 > +#if USE(PLATFORM_STRATEGIES) > #include "PlatformStrategies.h" > #include "StorageStrategy.h" > +#else > +#include "StorageNamespaceImpl.h" > +#endif I think that it's best to not add ifdefs around includes, that's just unnecessary extra work. 853276 4 cgarcia 2013-03-12 03:22:19 -0700 (In reply to comment #3) > (From update of attachment 192466 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=192466&action=review > > > Source/WebCore/storage/StorageNamespace.cpp:34 > > +#if USE(PLATFORM_STRATEGIES) > > #include "PlatformStrategies.h" > > #include "StorageStrategy.h" > > +#else > > +#include "StorageNamespaceImpl.h" > > +#endif > > I think that it's best to not add ifdefs around includes, that's just unnecessary extra work. You are right, PlatformStrategies.h and StorageStrategy.h already have the #if USE(PLATFORM_STRATEGIES), I'll submit a new patch. 853281 5 192694 cgarcia 2013-03-12 03:32:27 -0700 Created attachment 192694 Patch for landing. Updated patch to not use the #ifdefs for the headers that don't need it. 853540 6 cgarcia 2013-03-12 09:21:05 -0700 Alexey, could you confirm the new patch is ok for you? 857076 7 192694 rwlbuis 2013-03-18 07:07:28 -0700 Comment on attachment 192694 Patch for landing. LGTM. 857096 8 192694 webkit.review.bot 2013-03-18 07:29:44 -0700 Comment on attachment 192694 Patch for landing. Clearing flags on attachment: 192694 Committed r146065: <http://trac.webkit.org/changeset/146065> 857097 9 webkit.review.bot 2013-03-18 07:29:47 -0700 All reviewed patches have been landed. Closing bug. 192466 2013-03-11 07:29:38 -0700 2013-03-12 03:32:27 -0700 Patch bb-platform-strategies.diff text/plain 2149 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNWQ4NjA1Li40YzNmN2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDMtMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIEFkZCBVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykgaWZkZWZzIHRvIFN0b3Jh Z2VOYW1lc3BhY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTIwMDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDaGVjayBpZiBwbGF0Zm9ybSBzdHJhdGVnaWVzIGlzIGVuYWJsZWQgYmVmb3JlIHVz aW5nIGl0LCBmYWxsaW5nCisgICAgICAgIGJhY2sgdG8gU3RvcmFnZU5hbWVzcGFjZUltcGwgaWYg aXQgaXNuJ3QuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U3RvcmFnZU5hbWVzcGFjZTo6bG9jYWxTdG9yYWdlTmFtZXNwYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNw YWNlKToKKwogMjAxMy0wMy0xMSAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFhTU0F1ZGl0b3IgZG9lc24ndCBuZWVkIGEgY29weSBvZiB0aGUgb3JpZ2luYWwgZG9j dW1lbnQncyBib2R5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdl TmFtZXNwYWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5j cHAKaW5kZXggZjRmODc5Zi4uMGIwY2ZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9TdG9yYWdlTmFtZXNwYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2VOYW1lc3BhY2UuY3BwCkBAIC0yNiw4ICsyNiwxMiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIlN0b3JhZ2VOYW1lc3BhY2UuaCIKIAorI2lmIFVTRShQTEFURk9STV9TVFJB VEVHSUVTKQogI2luY2x1ZGUgIlBsYXRmb3JtU3RyYXRlZ2llcy5oIgogI2luY2x1ZGUgIlN0b3Jh Z2VTdHJhdGVneS5oIgorI2Vsc2UKKyNpbmNsdWRlICJTdG9yYWdlTmFtZXNwYWNlSW1wbC5oIgor I2VuZGlmCiAKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICNlcnJvciAiQ2hyb21pdW0gc2hvdWxk IG5vdCBjb21waWxlIHRoaXMgZmlsZSBhbmQgaW5zdGVhZCBkZWZpbmUgaXRzIG93biB2ZXJzaW9u IG9mIHRoZXNlIGZhY3RvcmllcyB0aGF0IG5hdmlnYXRlIHRoZSBtdWx0aS1wcm9jZXNzIGJvdW5k cnkuIgpAQCAtMzcsMTIgKzQxLDIxIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1JlZlB0 cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9yYWdlTmFtZXNwYWNlOjpsb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UoY29uc3QgU3RyaW5nJiBwYXRoLCB1bnNpZ25lZCBxdW90YSkKIHsKKyNpZiBVU0UoUExBVEZP Uk1fU1RSQVRFR0lFUykKICAgICByZXR1cm4gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnN0b3JhZ2VT dHJhdGVneSgpLT5sb2NhbFN0b3JhZ2VOYW1lc3BhY2UocGF0aCwgcXVvdGEpOworI2Vsc2UKKyAg ICByZXR1cm4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OmxvY2FsU3RvcmFnZU5hbWVzcGFjZShwYXRo LCBxdW90YSk7CisjZW5kaWYKIH0KIAogUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPiBTdG9y YWdlTmFtZXNwYWNlOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShQYWdlKiBwYWdlLCB1bnNpZ25l ZCBxdW90YSkKIHsKKyNpZiBVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykKICAgICByZXR1cm4gcGxh dGZvcm1TdHJhdGVnaWVzKCktPnN0b3JhZ2VTdHJhdGVneSgpLT5zZXNzaW9uU3RvcmFnZU5hbWVz cGFjZShwYWdlLCBxdW90YSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYWdlKTsKKyAgICBy ZXR1cm4gU3RvcmFnZU5hbWVzcGFjZUltcGw6OnNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHF1b3Rh KTsKKyNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 192694 2013-03-12 03:32:27 -0700 2013-03-18 07:29:44 -0700 Patch for landing. bb-storage-strategy.diff text/plain 2078 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNzY2ZjU5Li4zYzExNjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDMtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIEFkZCBVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykgaWZkZWZzIHRvIFN0b3Jh Z2VOYW1lc3BhY2UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTIwMDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDaGVjayBpZiBwbGF0Zm9ybSBzdHJhdGVnaWVzIGlzIGVuYWJsZWQgYmVmb3JlIHVz aW5nIGl0LCBmYWxsaW5nCisgICAgICAgIGJhY2sgdG8gU3RvcmFnZU5hbWVzcGFjZUltcGwgaWYg aXQgaXNuJ3QuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U3RvcmFnZU5hbWVzcGFjZTo6bG9jYWxTdG9yYWdlTmFtZXNwYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VOYW1lc3BhY2U6OnNlc3Npb25TdG9yYWdlTmFtZXNw YWNlKToKKwogMjAxMy0wMy0xMiAgVGFrYXNoaSBTYWthbW90byAgPHRhc2FrQGdvb2dsZS5jb20+ CiAKICAgICAgICAgW1JlZmFjdG9yaW5nXSBJbXBsZW1lbnQgUnVsZUNvbGxlY3RvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZS5jcHAKaW5kZXggZjRmODc5Zi4uODY2 YTRhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2UuY3BwCkBA IC0yOSw2ICsyOSwxMCBAQAogI2luY2x1ZGUgIlBsYXRmb3JtU3RyYXRlZ2llcy5oIgogI2luY2x1 ZGUgIlN0b3JhZ2VTdHJhdGVneS5oIgogCisjaWYgIVVTRShQTEFURk9STV9TVFJBVEVHSUVTKQor I2luY2x1ZGUgIlN0b3JhZ2VOYW1lc3BhY2VJbXBsLmgiCisjZW5kaWYKKwogI2lmIFBMQVRGT1JN KENIUk9NSVVNKQogI2Vycm9yICJDaHJvbWl1bSBzaG91bGQgbm90IGNvbXBpbGUgdGhpcyBmaWxl IGFuZCBpbnN0ZWFkIGRlZmluZSBpdHMgb3duIHZlcnNpb24gb2YgdGhlc2UgZmFjdG9yaWVzIHRo YXQgbmF2aWdhdGUgdGhlIG11bHRpLXByb2Nlc3MgYm91bmRyeS4iCiAjZW5kaWYKQEAgLTM3LDEy ICs0MSwyMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVz cGFjZT4gU3RvcmFnZU5hbWVzcGFjZTo6bG9jYWxTdG9yYWdlTmFtZXNwYWNlKGNvbnN0IFN0cmlu ZyYgcGF0aCwgdW5zaWduZWQgcXVvdGEpCiB7CisjaWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMp CiAgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5zdG9yYWdlU3RyYXRlZ3koKS0+bG9j YWxTdG9yYWdlTmFtZXNwYWNlKHBhdGgsIHF1b3RhKTsKKyNlbHNlCisgICAgcmV0dXJuIFN0b3Jh Z2VOYW1lc3BhY2VJbXBsOjpsb2NhbFN0b3JhZ2VOYW1lc3BhY2UocGF0aCwgcXVvdGEpOworI2Vu ZGlmCiB9CiAKIFBhc3NSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gU3RvcmFnZU5hbWVzcGFjZTo6 c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UoUGFnZSogcGFnZSwgdW5zaWduZWQgcXVvdGEpCiB7Cisj aWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCiAgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2ll cygpLT5zdG9yYWdlU3RyYXRlZ3koKS0+c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UocGFnZSwgcXVv dGEpOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0ocGFnZSk7CisgICAgcmV0dXJuIFN0b3JhZ2VO YW1lc3BhY2VJbXBsOjpzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShxdW90YSk7CisjZW5kaWYKIH0K IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=