119387 2013-08-01 02:43:25 -0700 Remove dependency on CoreFoundation from WebIconDatabase 2013-09-15 18:00:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 paroga paroga andersca bfulgham commit-queue oldest_to_newest 913689 0 paroga 2013-08-01 02:43:25 -0700 Remove dependency on CoreFoundation from WebIconDatabase 913690 1 207910 paroga 2013-08-01 02:45:16 -0700 Created attachment 207910 Patch 929519 2 207910 bfulgham 2013-09-15 17:12:09 -0700 Comment on attachment 207910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207910&action=review Looks fine, but I'd like to try using DEFINE_STATIC_LOCAL instead of the static initializer. > Source/WebKit/win/WebIconDatabase.cpp:369 > + static BSTR iconUserInfoURLKey = SysAllocString(WebIconNotificationUserInfoURLKey); Can you change this to be DEFINE_STATIC_LOCAL? We are trying to get rid of these static initializers where possible. 929521 3 207910 paroga 2013-09-15 17:35:47 -0700 Comment on attachment 207910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207910&action=review >> Source/WebKit/win/WebIconDatabase.cpp:369 >> + static BSTR iconUserInfoURLKey = SysAllocString(WebIconNotificationUserInfoURLKey); > > Can you change this to be DEFINE_STATIC_LOCAL? We are trying to get rid of these static initializers where possible. it's now the same as the other functions returning such "key strings" 929526 4 207910 commit-queue 2013-09-15 18:00:07 -0700 Comment on attachment 207910 Patch Clearing flags on attachment: 207910 Committed r155830: <http://trac.webkit.org/changeset/155830> 929527 5 commit-queue 2013-09-15 18:00:08 -0700 All reviewed patches have been landed. Closing bug. 207910 2013-08-01 02:45:16 -0700 2013-09-15 18:00:07 -0700 Patch bug-119248.patch text/plain 5715 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NPTVZhcmlhbnRTZXR0ZXIuaCBiL1NvdXJj ZS9XZWJLaXQvd2luL0NPTVZhcmlhbnRTZXR0ZXIuaAppbmRleCBlMjExZGNhLi44Y2U2NTQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DT01WYXJpYW50U2V0dGVyLmgKKysrIGIvU291 cmNlL1dlYktpdC93aW4vQ09NVmFyaWFudFNldHRlci5oCkBAIC0xNjUsNiArMTY1LDE2IEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgIH0KIAorICAgIFZBUklBTlQqIG9wZXJh dG9yJigpCisgICAgeworICAgICAgICByZXR1cm4gJm1fdmFyaWFudDsKKyAgICB9CisKKyAgICBW QVJJQU5UKiBvcGVyYXRvci0+KCkKKyAgICB7CisgICAgICAgIHJldHVybiAmbV92YXJpYW50Owor ICAgIH0KKwogICAgIHZvaWQgY29weVRvKFZBUklBTlQqIGRlc3QpIGNvbnN0CiAgICAgewogICAg ICAgICA6OlZhcmlhbnRDb3B5KGRlc3QsIGNvbnN0X2Nhc3Q8VkFSSUFOVCo+KCZtX3ZhcmlhbnQp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZwppbmRleCAwNjhlMGJjLi4zNjZlYWZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDgtMDEgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIGRlcGVuZGVuY3kgb24gQ29yZUZvdW5kYXRp b24gZnJvbSBXZWJJY29uRGF0YWJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExOTM4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogQ09NVmFyaWFudFNldHRlci5oOgorICAgICAgICAoQ09NVmFyaWFu dDo6b3BlcmF0b3ImKToKKyAgICAgICAgKENPTVZhcmlhbnQ6Om9wZXJhdG9yLT4pOgorICAgICAg ICAqIFdlYkljb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJJY29uRGF0YWJhc2U6Omljb25E YXRhYmFzZU5vdGlmaWNhdGlvblVzZXJJbmZvVVJMS2V5KToKKyAgICAgICAgKHBvc3REaWRBZGRJ Y29uTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBXZWJJY29uRGF0YWJhc2UuaDoKKyAgICAgICAg KiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6Om5vdGlmeURpZEFkZEljb24pOgorCiAy MDEzLTA3LTI1ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBD aHJvbWVDbGllbnQ6OmZvY3VzZWROb2RlQ2hhbmdlZCgpIHNob3VsZCBiZSBmb2N1c2VkRWxlbWVu dENoYW5nZWQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkljb25EYXRhYmFz ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJJY29uRGF0YWJhc2UuY3BwCmluZGV4IDMxNmEz NTguLjA3NmJkYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkljb25EYXRhYmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViSWNvbkRhdGFiYXNlLmNwcApAQCAtMjcs NyArMjcsNyBAQAogI2luY2x1ZGUgIldlYktpdERMTC5oIgogI2luY2x1ZGUgIldlYkljb25EYXRh YmFzZS5oIgogCi0jaW5jbHVkZSAiQ0ZEaWN0aW9uYXJ5UHJvcGVydHlCYWcuaCIKKyNpbmNsdWRl ICJDT01Qcm9wZXJ0eUJhZy5oIgogI2luY2x1ZGUgIldlYk5vdGlmaWNhdGlvbkNlbnRlci5oIgog I2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAic2hsb2JqLmgiCkBAIC0zNjQs OSArMzY0LDkgQEAgQlNUUiBXZWJJY29uRGF0YWJhc2U6Omljb25EYXRhYmFzZURpZEFkZEljb25O b3RpZmljYXRpb24oKQogICAgIHJldHVybiBkaWRBZGRJY29uTmFtZTsKIH0KIAotQ0ZTdHJpbmdS ZWYgV2ViSWNvbkRhdGFiYXNlOjppY29uRGF0YWJhc2VOb3RpZmljYXRpb25Vc2VySW5mb1VSTEtl eSgpCitCU1RSIFdlYkljb25EYXRhYmFzZTo6aWNvbkRhdGFiYXNlTm90aWZpY2F0aW9uVXNlcklu Zm9VUkxLZXkoKQogewotICAgIHN0YXRpYyBDRlN0cmluZ1JlZiBpY29uVXNlckluZm9VUkxLZXkg PSBTdHJpbmcoV2ViSWNvbk5vdGlmaWNhdGlvblVzZXJJbmZvVVJMS2V5KS5jcmVhdGVDRlN0cmlu ZygpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgQlNUUiBpY29uVXNlckluZm9VUkxLZXkgPSBTeXNB bGxvY1N0cmluZyhXZWJJY29uTm90aWZpY2F0aW9uVXNlckluZm9VUkxLZXkpOwogICAgIHJldHVy biBpY29uVXNlckluZm9VUkxLZXk7CiB9CiAKQEAgLTM4NCwxMyArMzg0LDkgQEAgc3RhdGljIHZv aWQgcG9zdERpZFJlbW92ZUFsbEljb25zTm90aWZpY2F0aW9uKFdlYkljb25EYXRhYmFzZSogaWNv bkRCKQogCiBzdGF0aWMgdm9pZCBwb3N0RGlkQWRkSWNvbk5vdGlmaWNhdGlvbihjb25zdCBTdHJp bmcmIHBhZ2VVUkwsIFdlYkljb25EYXRhYmFzZSogaWNvbkRCKQogewotICAgIFJldGFpblB0cjxD Rk11dGFibGVEaWN0aW9uYXJ5UmVmPiBkaWN0aW9uYXJ5ID0gYWRvcHRDRigKLSAgICBDRkRpY3Rp b25hcnlDcmVhdGVNdXRhYmxlKDAsIDAsICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywg JmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsKLQotICAgIENGRGljdGlvbmFyeUFk ZFZhbHVlKGRpY3Rpb25hcnkuZ2V0KCksIFdlYkljb25EYXRhYmFzZTo6aWNvbkRhdGFiYXNlTm90 aWZpY2F0aW9uVXNlckluZm9VUkxLZXkoKSwgcGFnZVVSTC5jcmVhdGVDRlN0cmluZygpLmdldCgp KTsKLQotICAgIENPTVB0cjxDRkRpY3Rpb25hcnlQcm9wZXJ0eUJhZz4gdXNlckluZm8gPSBDRkRp Y3Rpb25hcnlQcm9wZXJ0eUJhZzo6Y3JlYXRlSW5zdGFuY2UoKTsKLSAgICB1c2VySW5mby0+c2V0 RGljdGlvbmFyeShkaWN0aW9uYXJ5LmdldCgpKTsKKyAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5n PiBkaWN0aW9uYXJ5OworICAgIGRpY3Rpb25hcnkuc2V0KFdlYkljb25EYXRhYmFzZTo6aWNvbkRh dGFiYXNlTm90aWZpY2F0aW9uVXNlckluZm9VUkxLZXkoKSwgcGFnZVVSTCk7CisgICAgQ09NUHRy PElQcm9wZXJ0eUJhZz4gdXNlckluZm8oQWRvcHRDT00sIENPTVByb3BlcnR5QmFnPFN0cmluZz46 OmFkb3B0KGRpY3Rpb25hcnkpKTsKIAogICAgIElXZWJOb3RpZmljYXRpb25DZW50ZXIqIG5vdGlm eUNlbnRlciA9IFdlYk5vdGlmaWNhdGlvbkNlbnRlcjo6ZGVmYXVsdENlbnRlckludGVybmFsKCk7 CiAgICAgbm90aWZ5Q2VudGVyLT5wb3N0Tm90aWZpY2F0aW9uTmFtZShXZWJJY29uRGF0YWJhc2U6 Omljb25EYXRhYmFzZURpZEFkZEljb25Ob3RpZmljYXRpb24oKSwgc3RhdGljX2Nhc3Q8SVdlYklj b25EYXRhYmFzZSo+KGljb25EQiksIHVzZXJJbmZvLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvd2luL1dlYkljb25EYXRhYmFzZS5oIGIvU291cmNlL1dlYktpdC93aW4vV2ViSWNv bkRhdGFiYXNlLmgKaW5kZXggMGZkYWI3Ny4uNGU5ZDE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vV2ViSWNvbkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViSWNv bkRhdGFiYXNlLmgKQEAgLTM2LDggKzM2LDYgQEAKIAogI2luY2x1ZGUgPHdpbmRvd3MuaD4KIAot dHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19DRlN0cmluZyAqIENGU3RyaW5nUmVmOwotCiBuYW1lc3Bh Y2UgV2ViQ29yZQogewogICAgIGNsYXNzIEljb25EYXRhYmFzZTsKQEAgLTExMiw3ICsxMTAsNyBA QCBwdWJsaWM6CiAKICAgICBzdGF0aWMgQlNUUiBpY29uRGF0YWJhc2VEaWRBZGRJY29uTm90aWZp Y2F0aW9uKCk7CiAgICAgc3RhdGljIEJTVFIgaWNvbkRhdGFiYXNlRGlkUmVtb3ZlQWxsSWNvbnNO b3RpZmljYXRpb24oKTsKLSAgICBzdGF0aWMgQ0ZTdHJpbmdSZWYgaWNvbkRhdGFiYXNlTm90aWZp Y2F0aW9uVXNlckluZm9VUkxLZXkoKTsKKyAgICBzdGF0aWMgQlNUUiBpY29uRGF0YWJhc2VOb3Rp ZmljYXRpb25Vc2VySW5mb1VSTEtleSgpOwogcHJvdGVjdGVkOgogICAgIFVMT05HIG1fcmVmQ291 bnQ7CiAgICAgc3RhdGljIFdlYkljb25EYXRhYmFzZSogbV9zaGFyZWRXZWJJY29uRGF0YWJhc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGIyODAxMWIuLjhmZDgxNGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZp ZXcuY3BwCkBAIC0yOCw3ICsyOCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi V2ViVmlldy5oIgogCi0jaW5jbHVkZSAiQ0ZEaWN0aW9uYXJ5UHJvcGVydHlCYWcuaCIKKyNpbmNs dWRlICJDT01WYXJpYW50U2V0dGVyLmgiCiAjaW5jbHVkZSAiRE9NQ29yZUNsYXNzZXMuaCIKICNp bmNsdWRlICJGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiTWFyc2hhbGxp bmdIZWxwZXJzLmgiCkBAIC0yODI4LDI2ICsyODI4LDE5IEBAIEhSRVNVTFQgV2ViVmlldzo6bm90 aWZ5RGlkQWRkSWNvbihJV2ViTm90aWZpY2F0aW9uKiBub3RpZmljYXRpb24pCiAgICAgaWYgKCFw cm9wZXJ0eUJhZykKICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAotICAgIENPTVB0cjxDRkRpY3Rp b25hcnlQcm9wZXJ0eUJhZz4gZGljdGlvbmFyeVByb3BlcnR5QmFnOwotICAgIGhyID0gcHJvcGVy dHlCYWctPlF1ZXJ5SW50ZXJmYWNlKCZkaWN0aW9uYXJ5UHJvcGVydHlCYWcpOworICAgIENPTVZh cmlhbnQgaWNvblVzZXJJbmZvVVJMOworICAgIGhyID0gcHJvcGVydHlCYWctPlJlYWQoV2ViSWNv bkRhdGFiYXNlOjppY29uRGF0YWJhc2VOb3RpZmljYXRpb25Vc2VySW5mb1VSTEtleSgpLCAmaWNv blVzZXJJbmZvVVJMLCAwKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgcmV0dXJuIGhy OwogCi0gICAgQ0ZEaWN0aW9uYXJ5UmVmIGRpY3Rpb25hcnkgPSBkaWN0aW9uYXJ5UHJvcGVydHlC YWctPmRpY3Rpb25hcnkoKTsKLSAgICBpZiAoIWRpY3Rpb25hcnkpCi0gICAgICAgIHJldHVybiBF X0ZBSUw7Ci0KLSAgICBDRlR5cGVSZWYgdmFsdWUgPSBDRkRpY3Rpb25hcnlHZXRWYWx1ZShkaWN0 aW9uYXJ5LCBXZWJJY29uRGF0YWJhc2U6Omljb25EYXRhYmFzZU5vdGlmaWNhdGlvblVzZXJJbmZv VVJMS2V5KCkpOwotICAgIGlmICghdmFsdWUpCi0gICAgICAgIHJldHVybiBFX0ZBSUw7Ci0gICAg aWYgKENGR2V0VHlwZUlEKHZhbHVlKSAhPSBDRlN0cmluZ0dldFR5cGVJRCgpKQorICAgIGlmIChp Y29uVXNlckluZm9VUkwudmFyaWFudFR5cGUoKSAhPSBWVF9CU1RSKQogICAgICAgICByZXR1cm4g RV9GQUlMOwogCiAgICAgU3RyaW5nIG1haW5GcmFtZVVSTDsKICAgICBpZiAobV9tYWluRnJhbWUp CiAgICAgICAgIG1haW5GcmFtZVVSTCA9IG1fbWFpbkZyYW1lLT51cmwoKS5zdHJpbmcoKTsKIAot ICAgIGlmICghbWFpbkZyYW1lVVJMLmlzRW1wdHkoKSAmJiBtYWluRnJhbWVVUkwgPT0gU3RyaW5n KChDRlN0cmluZ1JlZil2YWx1ZSkpCisgICAgaWYgKCFtYWluRnJhbWVVUkwuaXNFbXB0eSgpICYm IG1haW5GcmFtZVVSTCA9PSB0b1N0cmluZyhWX0JTVFIoJmljb25Vc2VySW5mb1VSTCkpKQogICAg ICAgICBkaXNwYXRjaERpZFJlY2VpdmVJY29uRnJvbVdlYkZyYW1lKG1fbWFpbkZyYW1lKTsKIAog ICAgIHJldHVybiBocjsK