116127 2013-05-14 15:28:24 -0700 Add a preference that can disable the fake SYSV SHM shim 2013-05-14 17:27:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 0 scooper webkit-unassigned commit-queue scooper oldest_to_newest 889045 0 scooper 2013-05-14 15:28:24 -0700 Add a preference that can disable the fake SYSV SHM shim 889046 1 201764 scooper 2013-05-14 15:29:27 -0700 Created attachment 201764 Patch 889053 2 201764 ap 2013-05-14 15:40:18 -0700 Comment on attachment 201764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201764&action=review Looks good, please fix style nits and upload a new patch. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:161 > + static int cachedPrefValue = 0; Please change cachedPrefValue to cachedPreferenceValue. This is not one of the idioms we use in WebKit. I'm OK with this code as is, but for reference, we'd do one of these: 1. static bool preferenceValue = getShimDisabledPreference(); return preferenceValue; 2. dispatch_once(...) #2 is the preferred option these days. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:171 > + if (keyExistsAndHasValidFormat && prefValue) { > + cachedPrefValue = 1; > + } else { > + cachedPrefValue = -1; > + } Please remove braces around single line blocks. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:181 > + if (shim_disabled()) { > + return shmdt(sharedAddress); > + } Please remove braces around single line blocks. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:202 > + if (shim_disabled()) { > + return shmat(sharedMemoryIdentifier, requestedSharedAddress, shmflg); > + } Ditto. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:231 > + if (shim_disabled()) { > + return shmget(key, requestedSizeOfSharedMemory, sharedMemoryFlags); > + } Ditto. > Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:267 > + if (shim_disabled()) { > + return shmctl(sharedMemoryIdentifier, cmd, outputDescriptor); > + } Ditto. 889055 3 201768 scooper 2013-05-14 16:12:26 -0700 Created attachment 201768 Patch 889062 4 201768 ap 2013-05-14 16:31:43 -0700 Comment on attachment 201768 Patch I'm assuming that you wanted commit queue flag on this patch, too. 889073 5 201768 commit-queue 2013-05-14 17:27:01 -0700 Comment on attachment 201768 Patch Clearing flags on attachment: 201768 Committed r150094: <http://trac.webkit.org/changeset/150094> 889074 6 commit-queue 2013-05-14 17:27:02 -0700 All reviewed patches have been landed. Closing bug. 201764 2013-05-14 15:29:27 -0700 2013-05-14 16:12:24 -0700 Patch bug-116127-20130514152824.patch text/plain 3435 scooper U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjY0ODVkZmEwM2IyOTc1 MjE3ZDEyNjY4MzEyMzczZjQ2NzMxZWYxZS4uMWM2MjYxZGQyZWVmMGRhODliNWY3Njg4N2FiOGE3 N2I5N2MwZWRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA1LTE0ICBTaW1v biBDb29wZXIgIDxzY29vcGVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBwcmVmZXJlbmNl IHRoYXQgY2FuIGRpc2FibGUgdGhlIGZha2UgU1lTViBTSE0gc2hpbQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MTI3CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xMzgxMDUyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tOgorICAg ICAgICAoV2ViS2l0OjpzaGltX2Rpc2FibGVkKToKKyAgICAgICAgKFdlYktpdDo6c2hpbV9zaG1k dCk6CisgICAgICAgIChXZWJLaXQ6OnNoaW1fc2htYXQpOgorICAgICAgICAoV2ViS2l0OjpzaGlt X3NobWdldCk6CisgICAgICAgIChXZWJLaXQ6OnNoaW1fc2htY3RsKToKKwogMjAxMy0wNS0xNCAg Sm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAZGlnaWEuY29tPgogCiAgICAgICAg IFtXaW5dIFJFR1JFU1NJT04ocjE0OTk0NCk6IG1tYXAgaXMgbm90IGF2YWlsYWJsZSBvbiBXaW5k b3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzU2hpbS5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblBy b2Nlc3NTaGltLm1tCmluZGV4IGIyNWYxZmYzM2E2ZjJmYjJjNmE3OTA1N2U1NmRiYzdhMDMxMGI5 N2IuLjAwNmM3ZmM4YTUzNDdiZjA0Yjk0ZWVlN2NlMWJmNmY5YWM1MTdjNDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1t CkBAIC0xNTYsOCArMTU2LDMwIEBAIHN0YXRpYyBGYWtlU2hhcmVkTWVtb3J5RGVzY3JpcHRvciog ZmluZEJ5U2hhcmVkTWVtb3J5QWRkcmVzcyhjb25zdCB2b2lkKiBtbWFwZWRBCiAgICAgcmV0dXJu IGRlc2NyaXB0b3JQdHI7CiB9CiAKK3N0YXRpYyBCb29sZWFuIHNoaW1fZGlzYWJsZWQodm9pZCkK K3sKKyAgICBzdGF0aWMgaW50IGNhY2hlZFByZWZWYWx1ZSA9IDA7CisKKyAgICBpZiAoIWNhY2hl ZFByZWZWYWx1ZSkgeworICAgICAgICBCb29sZWFuIGtleUV4aXN0c0FuZEhhc1ZhbGlkRm9ybWF0 ID0gZmFsc2U7CisgICAgICAgIEJvb2xlYW4gcHJlZlZhbHVlID0gQ0ZQcmVmZXJlbmNlc0dldEFw cEJvb2xlYW5WYWx1ZShDRlNUUigiV2ViS2l0RGlzYWJsZUZha2VTWVNWU0hNIiksIGtDRlByZWZl cmVuY2VzQ3VycmVudEFwcGxpY2F0aW9uLCAma2V5RXhpc3RzQW5kSGFzVmFsaWRGb3JtYXQpOwor CisgICAgICAgIGlmIChrZXlFeGlzdHNBbmRIYXNWYWxpZEZvcm1hdCAmJiBwcmVmVmFsdWUpIHsK KyAgICAgICAgICAgIGNhY2hlZFByZWZWYWx1ZSA9IDE7CisgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICBjYWNoZWRQcmVmVmFsdWUgPSAtMTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJl dHVybiAoY2FjaGVkUHJlZlZhbHVlID4gMCkgPyB0cnVlIDogZmFsc2U7Cit9CisKIHN0YXRpYyBp bnQgc2hpbV9zaG1kdChjb25zdCB2b2lkKiBzaGFyZWRBZGRyZXNzKQogeworICAgIGlmIChzaGlt X2Rpc2FibGVkKCkpIHsKKyAgICAgICAgcmV0dXJuIHNobWR0KHNoYXJlZEFkZHJlc3MpOworICAg IH0KKwogICAgIEZha2VTaGFyZWRNZW1vcnlEZXNjcmlwdG9yKiBkZXNjcmlwdG9yUHRyID0gZmlu ZEJ5U2hhcmVkTWVtb3J5QWRkcmVzcyhzaGFyZWRBZGRyZXNzKTsKICAgICBpZiAoIWRlc2NyaXB0 b3JQdHIpIHsKICAgICAgICAgZXJybm8gPSBFSU5WQUw7CkBAIC0xNzUsNiArMTk3LDEwIEBAIHN0 YXRpYyBpbnQgc2hpbV9zaG1kdChjb25zdCB2b2lkKiBzaGFyZWRBZGRyZXNzKQogCiBzdGF0aWMg dm9pZCogc2hpbV9zaG1hdChpbnQgc2hhcmVkTWVtb3J5SWRlbnRpZmllciwgY29uc3Qgdm9pZCog cmVxdWVzdGVkU2hhcmVkQWRkcmVzcywgaW50IHNobWZsZykKIHsKKyAgICBpZiAoc2hpbV9kaXNh YmxlZCgpKSB7CisgICAgICAgIHJldHVybiBzaG1hdChzaGFyZWRNZW1vcnlJZGVudGlmaWVyLCBy ZXF1ZXN0ZWRTaGFyZWRBZGRyZXNzLCBzaG1mbGcpOworICAgIH0KKwogICAgIEZha2VTaGFyZWRN ZW1vcnlEZXNjcmlwdG9yKiBkZXNjcmlwdG9yUHRyID0gZmluZEJ5U2hhcmVkTWVtb3J5SWRlbnRp ZmllcihzaGFyZWRNZW1vcnlJZGVudGlmaWVyKTsKICAgICB2b2lkKiBtYXBwZWRBZGRyZXNzID0g KHZvaWQqKS0xOwogCkBAIC0yMDAsNiArMjI2LDEwIEBAIHN0YXRpYyB2b2lkKiBzaGltX3NobWF0 KGludCBzaGFyZWRNZW1vcnlJZGVudGlmaWVyLCBjb25zdCB2b2lkKiByZXF1ZXN0ZWRTaGFyZWRB CiAKIHN0YXRpYyBpbnQgc2hpbV9zaG1nZXQoa2V5X3Qga2V5LCBzaXplX3QgcmVxdWVzdGVkU2l6 ZU9mU2hhcmVkTWVtb3J5LCBpbnQgc2hhcmVkTWVtb3J5RmxhZ3MpCiB7CisgICAgaWYgKHNoaW1f ZGlzYWJsZWQoKSkgeworICAgICAgICByZXR1cm4gc2htZ2V0KGtleSwgcmVxdWVzdGVkU2l6ZU9m U2hhcmVkTWVtb3J5LCBzaGFyZWRNZW1vcnlGbGFncyk7CisgICAgfQorCiAgICAgRmFrZVNoYXJl ZE1lbW9yeURlc2NyaXB0b3IqIGRlc2NyaXB0b3JQdHIgPSBzaG1EZXNjcmlwdG9yTGlzdDsKIAog ICAgIHdoaWxlIChkZXNjcmlwdG9yUHRyKSB7CkBAIC0yMzIsNiArMjYyLDEwIEBAIHN0YXRpYyBp bnQgc2hpbV9zaG1nZXQoa2V5X3Qga2V5LCBzaXplX3QgcmVxdWVzdGVkU2l6ZU9mU2hhcmVkTWVt b3J5LCBpbnQgc2hhcmVkCiAKIHN0YXRpYyBpbnQgc2hpbV9zaG1jdGwoaW50IHNoYXJlZE1lbW9y eUlkZW50aWZpZXIsIGludCBjbWQsIHN0cnVjdCBzaG1pZF9kcyogb3V0cHV0RGVzY3JpcHRvcikK IHsKKyAgICBpZiAoc2hpbV9kaXNhYmxlZCgpKSB7CisgICAgICAgIHJldHVybiBzaG1jdGwoc2hh cmVkTWVtb3J5SWRlbnRpZmllciwgY21kLCBvdXRwdXREZXNjcmlwdG9yKTsKKyAgICB9CisKICAg ICBGYWtlU2hhcmVkTWVtb3J5RGVzY3JpcHRvciogZGVzY3JpcHRvclB0ciA9IGZpbmRCeVNoYXJl ZE1lbW9yeUlkZW50aWZpZXIoc2hhcmVkTWVtb3J5SWRlbnRpZmllcik7CiAKICAgICBpZiAoIWRl c2NyaXB0b3JQdHIpIHsK 201768 2013-05-14 16:12:26 -0700 2013-05-14 17:27:01 -0700 Patch bug-116127-20130514161123.patch text/plain 3411 scooper U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjY0ODVkZmEwM2IyOTc1 MjE3ZDEyNjY4MzEyMzczZjQ2NzMxZWYxZS4uMWM2MjYxZGQyZWVmMGRhODliNWY3Njg4N2FiOGE3 N2I5N2MwZWRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA1LTE0ICBTaW1v biBDb29wZXIgIDxzY29vcGVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBwcmVmZXJlbmNl IHRoYXQgY2FuIGRpc2FibGUgdGhlIGZha2UgU1lTViBTSE0gc2hpbQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MTI3CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xMzgxMDUyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tOgorICAg ICAgICAoV2ViS2l0OjpzaGltX2Rpc2FibGVkKToKKyAgICAgICAgKFdlYktpdDo6c2hpbV9zaG1k dCk6CisgICAgICAgIChXZWJLaXQ6OnNoaW1fc2htYXQpOgorICAgICAgICAoV2ViS2l0OjpzaGlt X3NobWdldCk6CisgICAgICAgIChXZWJLaXQ6OnNoaW1fc2htY3RsKToKKwogMjAxMy0wNS0xNCAg Sm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAZGlnaWEuY29tPgogCiAgICAgICAg IFtXaW5dIFJFR1JFU1NJT04ocjE0OTk0NCk6IG1tYXAgaXMgbm90IGF2YWlsYWJsZSBvbiBXaW5k b3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzU2hpbS5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblBy b2Nlc3NTaGltLm1tCmluZGV4IGIyNWYxZmYzM2E2ZjJmYjJjNmE3OTA1N2U1NmRiYzdhMDMxMGI5 N2IuLjkxNWExZThiMzI1OTc0NDY0MTU4MTYzZjllMzMyMjc4YTJlM2U0NmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1t CkBAIC0xNTYsOCArMTU2LDI5IEBAIHN0YXRpYyBGYWtlU2hhcmVkTWVtb3J5RGVzY3JpcHRvciog ZmluZEJ5U2hhcmVkTWVtb3J5QWRkcmVzcyhjb25zdCB2b2lkKiBtbWFwZWRBCiAgICAgcmV0dXJu IGRlc2NyaXB0b3JQdHI7CiB9CiAKK3N0YXRpYyBCb29sZWFuIHNoaW1fZGlzYWJsZWQodm9pZCkK K3sKKyAgICBzdGF0aWMgQm9vbGVhbiBpc0Zha2VTSE1EaXNhYmxlZDsKKworICAgIHN0YXRpYyBk aXNwYXRjaF9vbmNlX3Qgb25jZTsKKyAgICBkaXNwYXRjaF9vbmNlKCZvbmNlLCBeKCkgeworICAg ICAgICBCb29sZWFuIGtleUV4aXN0c0FuZEhhc1ZhbGlkRm9ybWF0ID0gZmFsc2U7CisgICAgICAg IEJvb2xlYW4gcHJlZlZhbHVlID0gQ0ZQcmVmZXJlbmNlc0dldEFwcEJvb2xlYW5WYWx1ZShDRlNU UigiV2ViS2l0RGlzYWJsZUZha2VTWVNWU0hNIiksIGtDRlByZWZlcmVuY2VzQ3VycmVudEFwcGxp Y2F0aW9uLCAma2V5RXhpc3RzQW5kSGFzVmFsaWRGb3JtYXQpOworCisgICAgICAgIGlmIChrZXlF eGlzdHNBbmRIYXNWYWxpZEZvcm1hdCAmJiBwcmVmVmFsdWUpCisgICAgICAgICAgICBpc0Zha2VT SE1EaXNhYmxlZCA9IHRydWU7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGlzRmFrZVNITURp c2FibGVkID0gZmFsc2U7CisgICAgfSk7CisKKyAgICByZXR1cm4gaXNGYWtlU0hNRGlzYWJsZWQ7 Cit9CisKIHN0YXRpYyBpbnQgc2hpbV9zaG1kdChjb25zdCB2b2lkKiBzaGFyZWRBZGRyZXNzKQog eworICAgIGlmIChzaGltX2Rpc2FibGVkKCkpCisgICAgICAgIHJldHVybiBzaG1kdChzaGFyZWRB ZGRyZXNzKTsKKwogICAgIEZha2VTaGFyZWRNZW1vcnlEZXNjcmlwdG9yKiBkZXNjcmlwdG9yUHRy ID0gZmluZEJ5U2hhcmVkTWVtb3J5QWRkcmVzcyhzaGFyZWRBZGRyZXNzKTsKICAgICBpZiAoIWRl c2NyaXB0b3JQdHIpIHsKICAgICAgICAgZXJybm8gPSBFSU5WQUw7CkBAIC0xNzUsNiArMTk2LDkg QEAgc3RhdGljIGludCBzaGltX3NobWR0KGNvbnN0IHZvaWQqIHNoYXJlZEFkZHJlc3MpCiAKIHN0 YXRpYyB2b2lkKiBzaGltX3NobWF0KGludCBzaGFyZWRNZW1vcnlJZGVudGlmaWVyLCBjb25zdCB2 b2lkKiByZXF1ZXN0ZWRTaGFyZWRBZGRyZXNzLCBpbnQgc2htZmxnKQogeworICAgIGlmIChzaGlt X2Rpc2FibGVkKCkpCisgICAgICAgIHJldHVybiBzaG1hdChzaGFyZWRNZW1vcnlJZGVudGlmaWVy LCByZXF1ZXN0ZWRTaGFyZWRBZGRyZXNzLCBzaG1mbGcpOworCiAgICAgRmFrZVNoYXJlZE1lbW9y eURlc2NyaXB0b3IqIGRlc2NyaXB0b3JQdHIgPSBmaW5kQnlTaGFyZWRNZW1vcnlJZGVudGlmaWVy KHNoYXJlZE1lbW9yeUlkZW50aWZpZXIpOwogICAgIHZvaWQqIG1hcHBlZEFkZHJlc3MgPSAodm9p ZCopLTE7CiAKQEAgLTIwMCw2ICsyMjQsOSBAQCBzdGF0aWMgdm9pZCogc2hpbV9zaG1hdChpbnQg c2hhcmVkTWVtb3J5SWRlbnRpZmllciwgY29uc3Qgdm9pZCogcmVxdWVzdGVkU2hhcmVkQQogCiBz dGF0aWMgaW50IHNoaW1fc2htZ2V0KGtleV90IGtleSwgc2l6ZV90IHJlcXVlc3RlZFNpemVPZlNo YXJlZE1lbW9yeSwgaW50IHNoYXJlZE1lbW9yeUZsYWdzKQogeworICAgIGlmIChzaGltX2Rpc2Fi bGVkKCkpCisgICAgICAgIHJldHVybiBzaG1nZXQoa2V5LCByZXF1ZXN0ZWRTaXplT2ZTaGFyZWRN ZW1vcnksIHNoYXJlZE1lbW9yeUZsYWdzKTsKKwogICAgIEZha2VTaGFyZWRNZW1vcnlEZXNjcmlw dG9yKiBkZXNjcmlwdG9yUHRyID0gc2htRGVzY3JpcHRvckxpc3Q7CiAKICAgICB3aGlsZSAoZGVz Y3JpcHRvclB0cikgewpAQCAtMjMyLDYgKzI1OSw5IEBAIHN0YXRpYyBpbnQgc2hpbV9zaG1nZXQo a2V5X3Qga2V5LCBzaXplX3QgcmVxdWVzdGVkU2l6ZU9mU2hhcmVkTWVtb3J5LCBpbnQgc2hhcmVk CiAKIHN0YXRpYyBpbnQgc2hpbV9zaG1jdGwoaW50IHNoYXJlZE1lbW9yeUlkZW50aWZpZXIsIGlu dCBjbWQsIHN0cnVjdCBzaG1pZF9kcyogb3V0cHV0RGVzY3JpcHRvcikKIHsKKyAgICBpZiAoc2hp bV9kaXNhYmxlZCgpKQorICAgICAgICByZXR1cm4gc2htY3RsKHNoYXJlZE1lbW9yeUlkZW50aWZp ZXIsIGNtZCwgb3V0cHV0RGVzY3JpcHRvcik7CisKICAgICBGYWtlU2hhcmVkTWVtb3J5RGVzY3Jp cHRvciogZGVzY3JpcHRvclB0ciA9IGZpbmRCeVNoYXJlZE1lbW9yeUlkZW50aWZpZXIoc2hhcmVk TWVtb3J5SWRlbnRpZmllcik7CiAKICAgICBpZiAoIWRlc2NyaXB0b3JQdHIpIHsK