70737 2011-10-24 10:24:54 -0700 WebKit doesn't build with recent changes to libdispatch 2011-10-24 13:56:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff oldest_to_newest 489412 0 msaboff 2011-10-24 10:24:54 -0700 From <rdar://problem/10257323>. Changes in libdispatch and dispatch.h are breaking builds of webkit due to defines in Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm. The solution is to move mac dependent code to WebKitSystemInterface. 489457 1 112215 msaboff 2011-10-24 11:11:57 -0700 Created attachment 112215 Proposed Papatch This patch depends on change set r98256 which is already checked in. That change set is the updated WebKitSystemInterface libraries. 489512 2 112215 ggaren 2011-10-24 12:05:33 -0700 Comment on attachment 112215 Proposed Papatch Minor quibble about the name "CreateVMPressureDispatchOnMainQueue": technically, you're creating a "dispatch source", not a "dispatch". I would have called this "CreateVMPressureDispatchSourceOnMainQueue". 489610 3 msaboff 2011-10-24 13:56:57 -0700 Committed r98280: <http://trac.webkit.org/changeset/98280> 112215 2011-10-24 11:11:57 -0700 2011-10-24 12:05:33 -0700 Proposed Papatch 70373.patch text/plain 6935 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4MjUzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMjQgIE1pY2hhZWwg U2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0IGRvZXNuJ3QgYnVp bGQgd2l0aCByZWNlbnQgY2hhbmdlcyB0byBsaWJkaXNwYXRjaAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MzcKKworICAgICAgICBBZGRlZCBpbml0 aWFsaXphdGlvbiBmb3IgbmV3IFdlYktpdFN5c3RlbUludGVyZmFjZSBmdW5jdGlvbiAKKyAgICAg ICAgQ3JlYXRlVk1QcmVzc3VyZURpc3BhdGNoT25NYWluUXVldWUuICBDaGFuZ2VkIE1lbW9yeVBy ZXNzdXJlSGFuZGxlcjo6aW5zdGFsbAorICAgICAgICB0byB1c2UgbmV3IGZ1bmN0aW9uLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cy4gIE1vdmVkIGZ1bmN0aW9uYWxpdHkgdG8gV2ViS2l0U3lzdGVtSW50ZXJmYWNlLgorCisgICAg ICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGxhdGZvcm0vbWFjL01lbW9yeVByZXNz dXJlSGFuZGxlck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeVByZXNzdXJlSGFuZGxl cjo6aW5zdGFsbCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZh Y2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbToK KwogMjAxMS0xMC0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS10gRml4IG1ha2UgZGlzdGNoZWNrIGJ1aWxkCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgkocmV2aXNpb24gOTgyNDgpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMTk4MSwzICsxOTgxLDcgQEAgX19aTjdXZWJDb3JlMTZI VE1MSW5wdXRFbGVtZW50MjFjb25uZWN0VAogX19aTjdXZWJDb3JlN0ludFNpemVDMUVSSzdfTlNT aXplCiBfX1pOSzdXZWJDb3JlN0ludFNpemVjdjdfTlNTaXplRXYKICNlbmRpZgorCisjaWYgIWRl ZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19M RU9QQVJEKQorX3drQ3JlYXRlVk1QcmVzc3VyZURpc3BhdGNoT25NYWluUXVldWUKKyNlbmRpZgpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL01lbW9yeVByZXNzdXJlSGFuZGxlck1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvTWVtb3J5UHJl c3N1cmVIYW5kbGVyTWFjLm1tCShyZXZpc2lvbiA5ODI0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9NZW1vcnlQcmVzc3VyZUhhbmRsZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTMzLDE4ICszMyw4IEBACiAjaW1wb3J0IDx3dGYvRmFzdE1hbGxvYy5oPgogCiAjaWYgIWRlZmlu ZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9Q QVJEKQotI2ltcG9ydCA8ZGlzcGF0Y2gvZGlzcGF0Y2guaD4KKyNpbXBvcnQgIldlYkNvcmVTeXN0 ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgPG5vdGlmeS5oPgotCi0jaWZuZGVmIERJU1BBVENIX1NP VVJDRV9UWVBFX1ZNCi0jZGVmaW5lIERJU1BBVENIX1NPVVJDRV9UWVBFX1ZNICgmX2Rpc3BhdGNo X3NvdXJjZV90eXBlX3ZtKQotRElTUEFUQ0hfRVhQT1JUIGNvbnN0IHN0cnVjdCBkaXNwYXRjaF9z b3VyY2VfdHlwZV9zIF9kaXNwYXRjaF9zb3VyY2VfdHlwZV92bTsKLQotZW51bSB7Ci0gRElTUEFU Q0hfVk1fUFJFU1NVUkUgPSAweDgwMDAwMDAwLAotfTsKLSNlbmRpZgotCiAjZW5kaWYKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtNjYsNyArNTYsNyBAQCB2b2lkIE1lbW9yeVByZXNzdXJlSGFu ZGxlcjo6aW5zdGFsbCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRpc3BhdGNoX2FzeW5jKGRp c3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57Ci0gICAgICAgIF9jYWNoZV9ldmVudF9zb3VyY2Ug PSBkaXNwYXRjaF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX1ZNLCAwLCBESVNQ QVRDSF9WTV9QUkVTU1VSRSwgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSk7CisgICAgICAgIF9j YWNoZV9ldmVudF9zb3VyY2UgPSB3a0NyZWF0ZVZNUHJlc3N1cmVEaXNwYXRjaE9uTWFpblF1ZXVl KCk7CiAgICAgICAgIGlmIChfY2FjaGVfZXZlbnRfc291cmNlKSB7CiAgICAgICAgICAgICBkaXNw YXRjaF9zZXRfY29udGV4dChfY2FjaGVfZXZlbnRfc291cmNlLCB0aGlzKTsKICAgICAgICAgICAg IGRpc3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFuZGxlcihfY2FjaGVfZXZlbnRfc291cmNlLCBe eyBtZW1vcnlQcmVzc3VyZUhhbmRsZXIoKS5yZXNwb25kVG9NZW1vcnlQcmVzc3VyZSgpO30pOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2Uu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3Rl bUludGVyZmFjZS5oCShyZXZpc2lvbiA5ODI0OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxMCw2ICsz MTAsMTMgQEAgZXh0ZXJuIENGQXJyYXlSZWYgKCp3a0NGVVJMUmVxdWVzdENvcHlIVAogZXh0ZXJu IHZvaWQgKCp3a0NGVVJMUmVxdWVzdFNldEhUVFBSZXF1ZXN0Qm9keVBhcnRzKShDRk11dGFibGVV UkxSZXF1ZXN0UmVmLCBDRkFycmF5UmVmIGJvZHlQYXJ0cyk7CiBleHRlcm4gdm9pZCAoKndrU2V0 UmVxdWVzdFN0b3JhZ2VTZXNzaW9uKShDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmLCBDRk11dGFibGVV UkxSZXF1ZXN0UmVmKTsKICNlbmRpZgorICAgIAorI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xF T1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyNpbXBvcnQgPGRp c3BhdGNoL2Rpc3BhdGNoLmg+CisgICAgCitleHRlcm4gZGlzcGF0Y2hfc291cmNlX3QgKCp3a0Ny ZWF0ZVZNUHJlc3N1cmVEaXNwYXRjaE9uTWFpblF1ZXVlKSh2b2lkKTsKKyAgICAKKyNlbmRpZgog fQogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lz dGVtSW50ZXJmYWNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCShyZXZpc2lvbiA5ODI0OCkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0xNzEsMyArMTcxLDggQEAgQ0ZVUkxSZWYgKCp3a0dldENGVVJMUmVzcG9uc2VVUkwp KENGVVJMUgogQ0ZIVFRQTWVzc2FnZVJlZiAoKndrR2V0Q0ZVUkxSZXNwb25zZUhUVFBSZXNwb25z ZSkoQ0ZVUkxSZXNwb25zZVJlZik7CiBDRlN0cmluZ1JlZiAoKndrQ29weUNGVVJMUmVzcG9uc2VT dWdnZXN0ZWRGaWxlbmFtZSkoQ0ZVUkxSZXNwb25zZVJlZik7CiB2b2lkICgqd2tTZXRDRlVSTFJl c3BvbnNlTUlNRVR5cGUpKENGVVJMUmVzcG9uc2VSZWYsIENGU3RyaW5nUmVmIG1pbWVUeXBlKTsK KworI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5H X09OX1NOT1dfTEVPUEFSRCkKK2Rpc3BhdGNoX3NvdXJjZV90ICgqd2tDcmVhdGVWTVByZXNzdXJl RGlzcGF0Y2hPbk1haW5RdWV1ZSkodm9pZCk7CisjZW5kaWYKKwpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gOTgyNTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMC0yNCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFw cGxlLmNvbT4KKworICAgICAgICBXZWJLaXQgZG9lc24ndCBidWlsZCB3aXRoIHJlY2VudCBjaGFu Z2VzIHRvIGxpYmRpc3BhdGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MDczNworCisgICAgICAgIEFkZGVkIGluaXRpYWxpemF0aW9uIGZvciBuZXcg V2ViS2l0U3lzdGVtSW50ZXJmYWNlIGZ1bmN0aW9uIAorICAgICAgICBDcmVhdGVWTVByZXNzdXJl RGlzcGF0Y2hPbk1haW5RdWV1ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUlu dGVyZmFjZS5tbToKKyAgICAgICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKToKKwogMjAx MS0xMC0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gRml4IG1ha2UgZGlzdGNoZWNrIGJ1aWxkCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMv V2ViU3lzdGVtSW50ZXJmYWNlLm1tCShyZXZpc2lvbiA5ODI0OCkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFjZS5tbQkod29y a2luZyBjb3B5KQpAQCAtMTQ4LDUgKzE0OCwxMCBAQCB2b2lkIEluaXRXZWJDb3JlU3lzdGVtSW50 ZXJmYWNlKHZvaWQpCiAgICAgICAgIElOSVQoR2V0Q0ZVUkxSZXNwb25zZUhUVFBSZXNwb25zZSk7 CiAgICAgICAgIElOSVQoQ29weUNGVVJMUmVzcG9uc2VTdWdnZXN0ZWRGaWxlbmFtZSk7CiAgICAg ICAgIElOSVQoU2V0Q0ZVUkxSZXNwb25zZU1JTUVUeXBlKTsKKworI2lmICFkZWZpbmVkKEJVSUxE SU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICAgICAgSU5JVChDcmVhdGVWTVByZXNzdXJlRGlzcGF0 Y2hPbk1haW5RdWV1ZSk7CisjZW5kaWYKKwogICAgIH0pOwogfQpJbmRleDogU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZwkocmV2aXNpb24gOTgyNTMpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMC0yNCAgTWljaGFlbCBTYWJvZmYgIDxt c2Fib2ZmQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQgZG9lc24ndCBidWlsZCB3aXRoIHJl Y2VudCBjaGFuZ2VzIHRvIGxpYmRpc3BhdGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MDczNworCisgICAgICAgIEFkZGVkIGluaXRpYWxpemF0aW9u IGZvciBuZXcgV2ViS2l0U3lzdGVtSW50ZXJmYWNlIGZ1bmN0aW9uIAorICAgICAgICBDcmVhdGVW TVByZXNzdXJlRGlzcGF0Y2hPbk1haW5RdWV1ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFj ZS5tbToKKyAgICAgICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKToKKwogMjAxMS0xMC0y MyAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJl bW92ZSBnZXRDb25zdHJ1Y3REYXRhVmlydHVhbApJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViU3lzdGVtSW50ZXJmYWNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQkocmV2aXNpb24g OTgyNDgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRl cmZhY2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2Miw1ICsxNjIsOSBAQCB2b2lkIEluaXRXZWJD b3JlU3lzdGVtSW50ZXJmYWNlKHZvaWQpCiAgICAgSU5JVChDb3B5Q0ZVUkxSZXNwb25zZVN1Z2dl c3RlZEZpbGVuYW1lKTsKICAgICBJTklUKFNldENGVVJMUmVzcG9uc2VNSU1FVHlwZSk7CiAKKyNp ZiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9T Tk9XX0xFT1BBUkQpCisgICAgSU5JVChDcmVhdGVWTVByZXNzdXJlRGlzcGF0Y2hPbk1haW5RdWV1 ZSk7CisjZW5kaWYKKwogICAgIGRpZEluaXQgPSB0cnVlOwogfQo=