38238 2010-04-27 18:23:17 -0700 Allow both WebKit and WebKit2 to link to the same WebCore.framework 2010-04-27 18:28:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 218118 0 sam 2010-04-27 18:23:17 -0700 Allow both WebKit and WebKit2 to link to the same WebCore.framework. 218122 1 54492 sam 2010-04-27 18:25:17 -0700 Created attachment 54492 patch 218123 2 54492 mjs 2010-04-27 18:26:53 -0700 Comment on attachment 54492 patch r=me 218124 3 sam 2010-04-27 18:28:58 -0700 Fixed in r58367. 54492 2010-04-27 18:25:17 -0700 2010-04-27 18:26:53 -0700 patch patch.diff text/plain 4244 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODM2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMjcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9y IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODIzOAorICAgICAgICBB bGxvdyBib3RoIFdlYktpdCBhbmQgV2ViS2l0MiB0byBsaW5rIHRvIHRoZSBzYW1lIFdlYkNvcmUu ZnJhbWV3b3JrCisKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnOiBV c2UgLWFsbG93YWJsZV9jbGllbnQgV2ViS2l0MiB0byBhZGQKKyAgICAgICAgV2ViS2l0MiB0byB0 aGUgbGlzdCBvZiBmcmFtZXdvcmtzIHRoYXQgY2FuIGxpbmsgZGlyZWN0bHkgdG8gV2ViQ29yZS4g SXQKKyAgICAgICAgaXMgbm90IG5lY2Vzc2FyeSBmb3IgaXQgdG8gYmUgYW4gdW1icmVsbGEgc2lu Y2Ugd2UgZG9uJ3QgbmVlZCB0byByZWV4cG9ydAorICAgICAgICBhbnkgc3ltYm9scy4KKwogMjAx MC0wNC0yNyAgSmVucyBBbGZrZSAgPHNuZWpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvQ29uZmlndXJhdGlvbnMvV2ViQ29y ZS54Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUu eGNjb25maWcJKHJldmlzaW9uIDU4MzQ5KQorKysgV2ViQ29yZS9Db25maWd1cmF0aW9ucy9XZWJD b3JlLnhjY29uZmlnCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIElOU1RBTExfUEFU SCA9ICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmEKIElOU1RBTExIRFJTX0NPUFlfUEhBU0UgPSBZ RVM7CiBJTlNUQUxMSERSU19TQ1JJUFRfUEhBU0UgPSBZRVM7CiBQUk9EVUNUX05BTUUgPSBXZWJD b3JlOwotVU1CUkVMTEFfTERGTEFHUyA9IC11bWJyZWxsYSBXZWJLaXQ7CitVTUJSRUxMQV9MREZM QUdTID0gLXVtYnJlbGxhIFdlYktpdCAtYWxsb3dhYmxlX2NsaWVudCBXZWJLaXQyOwogVklTSUJJ TElUWV9MREZMQUdTID0gOwogT1RIRVJfTERGTEFHUyA9IC1sJChTUUxJVEUzX0xJQlJBUlkpIC1s b2JqYyAtc3ViX2xpYnJhcnkgbGlib2JqYyAkKFVNQlJFTExBX0xERkxBR1MpICQoVklTSUJJTElU WV9MREZMQUdTKTsKIApJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDU4MzYyKQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNC0yNyAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpeCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4 MjM4CisgICAgICAgIEFsbG93IGJvdGggV2ViS2l0IGFuZCBXZWJLaXQyIHRvIGxpbmsgdG8gdGhl IHNhbWUgV2ViQ29yZS5mcmFtZXdvcmsKKworICAgICAgICAqIENvbmZpZ3VyYXRpb25zL1dlYktp dDIueGNjb25maWc6IFJlbW92ZSB0aGUgT1RIRVJfTERGTEFHUy4gV2UgZG9uJ3QKKyAgICAgICAg bmVlZCB0byBzZXQgV2ViQ29yZSBhcyBhIHN1Yl91bWJyZWxsYSBvZiBXZWJLaXQyLCBzaW5jZSB3 ZSBhcmUgbm90CisgICAgICAgIHJlZXhwb3J0aW5nIGFueSBvZiBpdHMgc3ltYm9scy4KKwogMjAx MC0wNC0yNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEdlb2ZmcmV5IEdhcmVuLgpJbmRleDogV2ViS2l0Mi9Db25maWd1cmF0aW9ucy9XZWJLaXQy LnhjY29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ29uZmlndXJhdGlvbnMvV2ViS2l0Mi54 Y2NvbmZpZwkocmV2aXNpb24gNTgzNDkpCisrKyBXZWJLaXQyL0NvbmZpZ3VyYXRpb25zL1dlYktp dDIueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKIFBST0RVQ1RfTkFN RSA9IFdlYktpdDI7CiBJTkZPUExJU1RfRklMRSA9IEluZm8ucGxpc3Q7CiBJTlNUQUxMX1BBVEgg PSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3JrczsKLU9USEVSX0xERkxBR1MgPSAtc3Vi X3VtYnJlbGxhIFdlYkNvcmUgJChPVEhFUl9MREZMQUdTKTsKIAogLy8gRklYTUU6IFdlIG5lZWQg dG8gYWRkIGFuIGV4cG9ydHMgZmlsZSB0byBsaW1pdCB0aGUgc2V0IG9mIGV4cG9ydGVkIHN5bWJv bHMuCiAvLyBFWFBPUlRFRF9TWU1CT0xTX0ZJTEUgPSAkKEVYUE9SVEVEX1NZTUJPTFNfRklMRV8k KENVUlJFTlRfQVJDSCkpOwpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNTgzNjIpCisrKyBXZWJLaXRUb29s cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNC0yNyAg U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM4MjM4CisgICAgICAgIEFsbG93IGJvdGggV2ViS2l0IGFuZCBXZWJLaXQy IHRvIGxpbmsgdG8gdGhlIHNhbWUgV2ViQ29yZS5mcmFtZXdvcmsKKworICAgICAgICAqIFNjcmlw dHMvYnVpbGQtd2Via2l0OiBSZW1vdmUgdGhlIFVNQlJFTExBX0xERkxBR1Mgb3ZlcnJpZGUgd2hl biBidWlsZGluZworICAgICAgICBXZWJDb3JlIGZvciBXZWJLaXQyLCBpdCBpcyBubyBsb25nZXIg bmVjZXNzYXJ5LgorCiAyMDEwLTA0LTI3ICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0 VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWlsZC13ZWJraXQJKHJldmlzaW9uIDU4MzQ5KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTM5NCwxNSArMzk0LDcgQEAgZm9yIG15 ICRkaXIgKEBwcm9qZWN0cykgewogICAgIH0gZWxzaWYgKGlzUXQoKSkgewogICAgICAgICAkcmVz dWx0ID0gYnVpbGRRTWFrZVF0UHJvamVjdCgkZGlyLCAkY2xlYW4sIEBvcHRpb25zKTsKICAgICB9 IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgbXkgQGNvbXBsZXRlT3B0aW9u cyA9IEBvcHRpb25zOwotICAgICAgICBpZiAoJHdlYmtpdDIgJiYgJGRpciBlcSAiV2ViQ29yZSIp IHsKLSAgICAgICAgICAgIG15IEB3ZWJLaXQyU3BlY2lmaWNPdmVycmlkZXMgPSAoCi0gICAgICAg ICAgICAgICAgJ1VNQlJFTExBX0xERkxBR1M9JwotICAgICAgICAgICAgKTsKLSAgICAgICAgICAg IHB1c2ggQGNvbXBsZXRlT3B0aW9ucywgQHdlYktpdDJTcGVjaWZpY092ZXJyaWRlczsKLSAgICAg ICAgfQotCi0gICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgkZGlyLCAkY2xlYW4s IEBjb21wbGV0ZU9wdGlvbnMsIEBBUkdWKTsKKyAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQ cm9qZWN0KCRkaXIsICRjbGVhbiwgQG9wdGlvbnMsIEBBUkdWKTsKICAgICB9IGVsc2lmIChpc0Fw cGxlV2luV2ViS2l0KCkpIHsKICAgICAgICAgaWYgKCRkaXIgZXEgIldlYktpdCIpIHsKICAgICAg ICAgICAgICRyZXN1bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIndpbi9XZWJLaXQudmNw cm9qL1dlYktpdC5zbG4iLCAkY2xlYW4pOwo=