28277 2009-08-13 13:36:15 -0700 Merge error in SharedWorker code 2009-08-13 15:56:00 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 atwilson atwilson eric oldest_to_newest 140003 0 atwilson 2009-08-13 13:36:15 -0700 There is a merge error in the checked-in shared worker code that is preventing WebKit from compiling with ENABLE_SHARED_WORKERS set. 140006 1 34780 atwilson 2009-08-13 13:39:37 -0700 Created attachment 34780 proposed patch 140008 2 34781 atwilson 2009-08-13 13:41:50 -0700 Created attachment 34781 patch without tabs 140062 3 34781 eric 2009-08-13 15:00:10 -0700 Comment on attachment 34781 patch without tabs Rejecting patch 34781 from commit-queue. This patch will require manual commit. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 cwd: None 140071 4 34781 eric 2009-08-13 15:27:19 -0700 Comment on attachment 34781 patch without tabs bugzilla-tool isn't smart enough yet to notice when someone commits while tests are running and update. Adding this back the commit queue. 140084 5 34781 eric 2009-08-13 15:55:57 -0700 Comment on attachment 34781 patch without tabs Clearing flags on attachment: 34781 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/workers/DefaultSharedWorkerRepository.cpp Committed r47248 M WebCore/ChangeLog M WebCore/workers/DefaultSharedWorkerRepository.cpp r47248 = a0d79bf391b0d757d04794bb3b9f5a415cbc8af0 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/47248 140085 6 eric 2009-08-13 15:56:00 -0700 All reviewed patches have been landed. Closing bug. 34780 2009-08-13 13:39:37 -0700 2009-08-13 13:41:50 -0700 proposed patch x text/plain 2416 atwilson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGEzYTg4OS4uOTY5ZTczNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wOC0xMyAgRHJldyBXaWxzb24g IDxhdHdpbHNvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1lcmdlIGVycm9yIGluIFNoYXJlZFdvcmtlciBjb2RlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODI3NworCisJRml4ZWQg bWVyZ2UgZXJyb3IgdGhhdCBwcmV2ZW50cyBXZWJLaXQgZnJvbSBjb21waWxpbmcgd2l0aCBTSEFS RURfV09SS0VSUyBlbmFibGVkLgorICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAg ICAgICogd29ya2Vycy9EZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHA6CisJUmVtb3Zl ZCBkdXBsaWNhdGVkIGZ1bmN0aW9ucy4KKwogMjAwOS0wOC0wOCAgSm9zZXBoIFBlY29yYXJvICA8 am9lcGVjazAyQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNo ZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9z aXRvcnkuY3BwIGIvV2ViQ29yZS93b3JrZXJzL0RlZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5 LmNwcAppbmRleCA2Y2FkZDRhLi5lNTVkM2UxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3dvcmtlcnMv RGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCisrKyBiL1dlYkNvcmUvd29ya2Vycy9E ZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAKQEAgLTEyNSw4ICsxMjUsOCBAQCB2b2lk IFNoYXJlZFdvcmtlclByb3h5Ojp3b3JrZXJDb250ZXh0Q2xvc2VkKCkKIAogdm9pZCBTaGFyZWRX b3JrZXJQcm94eTo6d29ya2VyQ29udGV4dERlc3Ryb3llZCgpCiB7Ci0gICAgLy8gRklYTUU6IFJl bW92ZSB0aGUgcHJveHkgZnJvbSB0aGUgcmVwb3NpdG9yeSBvbmNlIHRoZSB3b3JrZXIgY29udGV4 dCBpcyBkZXN0cm95ZWQuCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBUaGUgcHJveHkg bWF5IGJlIGZyZWVkIGJ5IHRoaXMgY2FsbCwgc28gZG8gbm90IHJlZmVyZW5jZSBpdCBhbnkgZnVy dGhlci4KKyAgICBEZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeTo6aW5zdGFuY2UoKS5yZW1v dmVQcm94eSh0aGlzKTsKIH0KIAogdm9pZCBTaGFyZWRXb3JrZXJQcm94eTo6YWRkVG9Xb3JrZXJE b2N1bWVudHMoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKQEAgLTE1NywzMCArMTU3 LDYgQEAgdm9pZCBTaGFyZWRXb3JrZXJQcm94eTo6Y2xvc2UoKQogICAgICAgICBtX3RocmVhZC0+ c3RvcCgpOwogfQogCi12b2lkIFNoYXJlZFdvcmtlclByb3h5Ojpwb3N0RXhjZXB0aW9uVG9Xb3Jr ZXJPYmplY3QoY29uc3QgU3RyaW5nJiwgaW50LCBjb25zdCBTdHJpbmcmKQotewotICAgIC8vIEZJ WE1FOiBMb2cgZXhjZXB0aW9ucyB0byBhbGwgcGFyZW50IGRvY3VtZW50cy4KLSAgICBub3RJbXBs ZW1lbnRlZCgpOwotfQotCi12b2lkIFNoYXJlZFdvcmtlclByb3h5Ojpwb3N0Q29uc29sZU1lc3Nh Z2VUb1dvcmtlck9iamVjdChNZXNzYWdlRGVzdGluYXRpb24sIE1lc3NhZ2VTb3VyY2UsIE1lc3Nh Z2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYsIGludCwgY29uc3QgU3RyaW5nJikK LXsKLSAgICAvLyBGSVhNRTogTG9nIGNvbnNvbGUgbWVzc2FnZXMgdG8gYWxsIHBhcmVudCBkb2N1 bWVudHMuCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKLX0KLQotLy8gV2hlbiBjbG9zZSgpIGlzIGlu dm9rZWQsIG1hcmsgdGhlIHByb3h5IGFzIGNsb3Npbmcgc28gd2UgZG9uJ3Qgc2hhcmUgaXQgd2l0 aCBhbnkgbmV3IHJlcXVlc3RzLgotdm9pZCBTaGFyZWRXb3JrZXJQcm94eTo6d29ya2VyQ29udGV4 dENsb3NlZCgpCi17Ci0gICAgbV9jbG9zaW5nID0gdHJ1ZTsKLX0KLQotdm9pZCBTaGFyZWRXb3Jr ZXJQcm94eTo6d29ya2VyQ29udGV4dERlc3Ryb3llZCgpCi17Ci0gICAgLy8gVGhlIHByb3h5IG1h eSBiZSBmcmVlZCBieSB0aGlzIGNhbGwsIHNvIGRvIG5vdCByZWZlcmVuY2UgaXQgYW55IGZ1cnRo ZXIuCi0gICAgRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnk6Omluc3RhbmNlKCkucmVtb3Zl UHJveHkodGhpcyk7Ci19Ci0KIGNsYXNzIFNoYXJlZFdvcmtlckNvbm5lY3RUYXNrIDogcHVibGlj IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2sgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFNoYXJlZFdvcmtlckNvbm5lY3RUYXNrPiBjcmVhdGUoUGFzc093blB0cjxNZXNzYWdl UG9ydENoYW5uZWw+IGNoYW5uZWwpCg== 34781 2009-08-13 13:41:50 -0700 2009-08-13 15:55:57 -0700 patch without tabs x text/plain 2430 atwilson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGEzYTg4OS4uMzZkMzNmYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wOC0xMyAgRHJldyBXaWxzb24g IDxhdHdpbHNvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1lcmdlIGVycm9yIGluIFNoYXJlZFdvcmtlciBjb2RlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODI3NworCisgICAgICAg IEZpeGVkIG1lcmdlIGVycm9yIHRoYXQgcHJldmVudHMgV2ViS2l0IGZyb20gY29tcGlsaW5nIHdp dGggU0hBUkVEX1dPUktFUlMgZW5hYmxlZC4KKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4K KworICAgICAgICAqIHdvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwOgor ICAgICAgICBSZW1vdmVkIGR1cGxpY2F0ZWQgZnVuY3Rpb25zLgorCiAyMDA5LTA4LTA4ICBKb3Nl cGggUGVjb3Jhcm8gIDxqb2VwZWNrMDJAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvd29ya2Vycy9EZWZhdWx0U2hh cmVkV29ya2VyUmVwb3NpdG9yeS5jcHAgYi9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdv cmtlclJlcG9zaXRvcnkuY3BwCmluZGV4IDZjYWRkNGEuLmU1NWQzZTEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvd29ya2Vycy9EZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAKKysrIGIvV2Vi Q29yZS93b3JrZXJzL0RlZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmNwcApAQCAtMTI1LDgg KzEyNSw4IEBAIHZvaWQgU2hhcmVkV29ya2VyUHJveHk6OndvcmtlckNvbnRleHRDbG9zZWQoKQog CiB2b2lkIFNoYXJlZFdvcmtlclByb3h5Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVkKCkKIHsKLSAg ICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBwcm94eSBmcm9tIHRoZSByZXBvc2l0b3J5IG9uY2UgdGhl IHdvcmtlciBjb250ZXh0IGlzIGRlc3Ryb3llZC4KLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAg IC8vIFRoZSBwcm94eSBtYXkgYmUgZnJlZWQgYnkgdGhpcyBjYWxsLCBzbyBkbyBub3QgcmVmZXJl bmNlIGl0IGFueSBmdXJ0aGVyLgorICAgIERlZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5Ojpp bnN0YW5jZSgpLnJlbW92ZVByb3h5KHRoaXMpOwogfQogCiB2b2lkIFNoYXJlZFdvcmtlclByb3h5 OjphZGRUb1dvcmtlckRvY3VtZW50cyhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQpA QCAtMTU3LDMwICsxNTcsNiBAQCB2b2lkIFNoYXJlZFdvcmtlclByb3h5OjpjbG9zZSgpCiAgICAg ICAgIG1fdGhyZWFkLT5zdG9wKCk7CiB9CiAKLXZvaWQgU2hhcmVkV29ya2VyUHJveHk6OnBvc3RF eGNlcHRpb25Ub1dvcmtlck9iamVjdChjb25zdCBTdHJpbmcmLCBpbnQsIGNvbnN0IFN0cmluZyYp Ci17Ci0gICAgLy8gRklYTUU6IExvZyBleGNlcHRpb25zIHRvIGFsbCBwYXJlbnQgZG9jdW1lbnRz LgotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KLXZvaWQgU2hhcmVkV29ya2VyUHJveHk6OnBv c3RDb25zb2xlTWVzc2FnZVRvV29ya2VyT2JqZWN0KE1lc3NhZ2VEZXN0aW5hdGlvbiwgTWVzc2Fn ZVNvdXJjZSwgTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5nJiwgaW50LCBj b25zdCBTdHJpbmcmKQotewotICAgIC8vIEZJWE1FOiBMb2cgY29uc29sZSBtZXNzYWdlcyB0byBh bGwgcGFyZW50IGRvY3VtZW50cy4KLSAgICBub3RJbXBsZW1lbnRlZCgpOwotfQotCi0vLyBXaGVu IGNsb3NlKCkgaXMgaW52b2tlZCwgbWFyayB0aGUgcHJveHkgYXMgY2xvc2luZyBzbyB3ZSBkb24n dCBzaGFyZSBpdCB3aXRoIGFueSBuZXcgcmVxdWVzdHMuCi12b2lkIFNoYXJlZFdvcmtlclByb3h5 Ojp3b3JrZXJDb250ZXh0Q2xvc2VkKCkKLXsKLSAgICBtX2Nsb3NpbmcgPSB0cnVlOwotfQotCi12 b2lkIFNoYXJlZFdvcmtlclByb3h5Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVkKCkKLXsKLSAgICAv LyBUaGUgcHJveHkgbWF5IGJlIGZyZWVkIGJ5IHRoaXMgY2FsbCwgc28gZG8gbm90IHJlZmVyZW5j ZSBpdCBhbnkgZnVydGhlci4KLSAgICBEZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeTo6aW5z dGFuY2UoKS5yZW1vdmVQcm94eSh0aGlzKTsKLX0KLQogY2xhc3MgU2hhcmVkV29ya2VyQ29ubmVj dFRhc2sgOiBwdWJsaWMgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzayB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8U2hhcmVkV29ya2VyQ29ubmVjdFRhc2s+IGNyZWF0ZShQYXNz T3duUHRyPE1lc3NhZ2VQb3J0Q2hhbm5lbD4gY2hhbm5lbCkK