52232 2011-01-11 12:07:31 -0800 [chromium] copy test netscape plugin into TestNetscapePlugin 2011-01-11 15:36:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony commit-queue oldest_to_newest 332523 0 tony 2011-01-11 12:07:31 -0800 [chromium] copy test netscape plugin into TestNetscapePlugin 332525 1 78574 tony 2011-01-11 12:09:04 -0800 Created attachment 78574 Patch 332530 2 tony 2011-01-11 12:12:56 -0800 We used to have 2 test plugins: TestNetscapePlugIn (the chromium fork) and WebKitTestNetscapePlugIn (the version from upstream). I deleted the chromium fork, but now want to rename WebKitTestNetscapePlugIn to TestNetscapePlugIn to match Mac DRT. On the chromium side, we blacklist TestNetscapePlugIn, because it was the forked plugin that we didn't want. So here's the plan to avoid breakage: 1) Put the upstream plugin in both TestNetscapePlugIn and WebKitTestNetscapePlugIn. (this patch) 2) Roll this patch into chromium. 3) Update the blacklist in chromium to blacklist WebKitTestNetscapePlugIn and use TestNetscapePlugIn 4) Remove WebKitTestNetscapePlugIn in webkit.gyp and fix up the test. 332620 3 78574 eric 2011-01-11 13:54:41 -0800 Comment on attachment 78574 Patch OK. 332734 4 78574 commit-queue 2011-01-11 15:36:11 -0800 Comment on attachment 78574 Patch Clearing flags on attachment: 78574 Committed r75561: <http://trac.webkit.org/changeset/75561> 332735 5 commit-queue 2011-01-11 15:36:16 -0800 All reviewed patches have been landed. Closing bug. 78574 2011-01-11 12:09:04 -0800 2011-01-11 15:36:11 -0800 Patch bug-52232-20110111120903.patch text/plain 5072 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE4NWJjMTU5NTM0MDhkOGYxOGY5MjQzZmIwYWY0Njk1MDEyNjNiNTIu LmE4ZmVmNDhhYTJlY2Q3YjY4ZmEwYzU5MDE1ZTcwMDZiYzU4NjY4NzYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDExLTAxLTExICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSBjb3B5IHRlc3QgbmV0c2NhcGUgcGx1Z2luIGludG8gVGVzdE5ldHNjYXBlUGx1Z2lu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjIzMgor CisgICAgICAgICogV2ViS2l0Lmd5cDogTWFrZSBhIGNvcHkgb2YgdGhlIFRlc3ROZXRzY2FwZVBs dWdJbiBpbgorICAgICAgICAgICAgVGVzdE5ldHNjYXBlUGx1Z0luIGFuZCBXZWJLaXRUZXN0TmV0 c2NhcGVQbHVnSW4KKwogMjAxMS0wMS0xMCAgSm9obiBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cCBiL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwCmluZGV4IGRlOTliODNkYmZlNzliMjRjZDZkNWY4OTBjYTAwMmJjNTc2NThlODguLmJlYTYz ZmNkODA2Y2I5YTM5MDIxMzMzOWI4OTRkYzU1ZmFiN2M2M2MgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9XZWJLaXQuZ3lwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDM5LDEwICsxMDM5LDcgQEAKICAgICAgICAgICAgICdjb25kaXRpb25zJzogWwogICAgICAgICAg ICAgICAgIFsnT1M9PSJtYWMiJywgewogICAgICAgICAgICAgICAgICAgICAnbWFjX2J1bmRsZSc6 IDEsCi0gICAgICAgICAgICAgICAgICAgICMgSXQgd291bGQgYmUgbmljZSB0byBuYW1lIHRoaXMK LSAgICAgICAgICAgICAgICAgICAgIyBUZXN0TmV0c2NhcGVQbHVnSW4sIGJ1dCB0aGF0IG5hbWUg aXMgYWxyZWFkeQotICAgICAgICAgICAgICAgICAgICAjIHVzZWQgYnkgdGhlIGZvcmsgb2YgdGhp cyBwbHVnaW4gaW4gQ2hyb21pdW0uCi0gICAgICAgICAgICAgICAgICAgICdwcm9kdWN0X25hbWUn OiAnV2ViS2l0VGVzdE5ldHNjYXBlUGx1Z0luJywKKyAgICAgICAgICAgICAgICAgICAgJ3Byb2R1 Y3RfbmFtZSc6ICdUZXN0TmV0c2NhcGVQbHVnSW4nLAogICAgICAgICAgICAgICAgICAgICAncHJv ZHVjdF9leHRlbnNpb24nOiAncGx1Z2luJywKICAgICAgICAgICAgICAgICAgICAgJ2xpbmtfc2V0 dGluZ3MnOiB7CiAgICAgICAgICAgICAgICAgICAgICAgICAnbGlicmFyaWVzJzogWwpAQCAtMTA1 MywxMiArMTA1MCw3IEBACiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAg ICAgICd4Y29kZV9zZXR0aW5ncyc6IHsKICAgICAgICAgICAgICAgICAgICAgICAgICdHQ0NfU1lN Qk9MU19QUklWQVRFX0VYVEVSTic6ICdOTycsCi0gICAgICAgICAgICAgICAgICAgICAgICAjIFRo aXMgaXMgYSB0ZW1wb3JhcnkgZm9yayBvZgotICAgICAgICAgICAgICAgICAgICAgICAgIyBEUlQv VGVzdE5ldHNjYXBlUGx1Z0luL21hYy9JbmZvLnBsaXN0LiAgT25jZQotICAgICAgICAgICAgICAg ICAgICAgICAgIyB3ZSBnZXQgcmlkIG9mIG91ciBmb3JrZWQgcGx1Z2luIGluIHRoZQotICAgICAg ICAgICAgICAgICAgICAgICAgIyBjaHJvbWl1bSByZXBvLCB3ZSBjYW4gc2hhcmUgdGhlIHNhbWUK LSAgICAgICAgICAgICAgICAgICAgICAgICMgSW5mby5wbGlzdC4KLSAgICAgICAgICAgICAgICAg ICAgICAgICdJTkZPUExJU1RfRklMRSc6ICcuLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0TmV0c2NhcGVQbHVnSW4vSW5mby5wbGlzdCcsCisgICAgICAgICAgICAgICAgICAg ICAgICAnSU5GT1BMSVNUX0ZJTEUnOiAnLi4vLi4vVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5l dHNjYXBlUGx1Z0luL21hYy9JbmZvLnBsaXN0JywKICAgICAgICAgICAgICAgICAgICAgfSwKICAg ICAgICAgICAgICAgICB9XSwKICAgICAgICAgICAgICAgICBbJ09TPT0ibGludXgiIG9yIE9TPT0i ZnJlZWJzZCIgb3IgT1M9PSJvcGVuYnNkIiBvciBPUz09InNvbGFyaXMiJywgewpAQCAtMTA5NSw5 ICsxMDg3LDEzIEBACiAgICAgICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgICAgIH1d LAogICAgICAgICAgICAgICAgIFsnT1M9PSJtYWMiJywgeworICAgICAgICAgICAgICAgICAgICAn ZGVwZW5kZW5jaWVzJzogWydXZWJLaXRUZXN0TmV0c2NhcGVQbHVnSW4nXSwKICAgICAgICAgICAg ICAgICAgICAgJ2NvcGllcyc6IFt7CiAgICAgICAgICAgICAgICAgICAgICAgICAnZGVzdGluYXRp b24nOiAnPChQUk9EVUNUX0RJUikvcGx1Z2lucy8nLAotICAgICAgICAgICAgICAgICAgICAgICAg J2ZpbGVzJzogWyc8KFBST0RVQ1RfRElSKS9XZWJLaXRUZXN0TmV0c2NhcGVQbHVnSW4ucGx1Z2lu LyddLAorICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpbGVzJzogWworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9XZWJLaXRUZXN0TmV0c2NhcGVQbHVnSW4ucGx1 Z2luLycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL1Rlc3RO ZXRzY2FwZVBsdWdJbi5wbHVnaW4vJywKKyAgICAgICAgICAgICAgICAgICAgICAgIF0sCiAgICAg ICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgICAg IFsnT1M9PSJsaW51eCIgb3IgT1M9PSJmcmVlYnNkIiBvciBPUz09Im9wZW5ic2QiIG9yIE9TPT0i c29sYXJpcyInLCB7CkBAIC0xMTM4LDYgKzExMzQsNDEgQEAKICAgICAgICAgICAgICAgICAgICAg ICAgICdmaWxlcyc6IFsnPChQUk9EVUNUX0RJUikvb3NtZXNhLnNvJ10sCiAgICAgICAgICAgICAg ICAgICAgIH1dLAogICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnV2ViS2l0VGVzdE5ldHNjYXBlUGx1Z0luJywK KyAgICAgICAgICAgICAgICAgICAgJ3R5cGUnOiAnbG9hZGFibGVfbW9kdWxlJywKKyAgICAgICAg ICAgICAgICAgICAgJ3NvdXJjZXMnOiBbICc8QCh0ZXN0X3BsdWdpbl9maWxlcyknIF0sCisgICAg ICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICAg ICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9ucGFwaS9ucGFwaS5neXA6bnBhcGkn LAorICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAnaW5jbHVkZV9k aXJzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpciknLAor ICAgICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RO ZXRzY2FwZVBsdWdJbicsCisgICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdE5ldHNjYXBlUGx1Z0luL0ZvcndhcmRpbmdIZWFkZXJz JywKKyAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAgJ21hY19idW5k bGUnOiAxLAorICAgICAgICAgICAgICAgICAgICAjIEl0IHdvdWxkIGJlIG5pY2UgdG8gbmFtZSB0 aGlzCisgICAgICAgICAgICAgICAgICAgICMgVGVzdE5ldHNjYXBlUGx1Z0luLCBidXQgdGhhdCBu YW1lIGlzIGFscmVhZHkKKyAgICAgICAgICAgICAgICAgICAgIyB1c2VkIGJ5IHRoZSBmb3JrIG9m IHRoaXMgcGx1Z2luIGluIENocm9taXVtLgorICAgICAgICAgICAgICAgICAgICAncHJvZHVjdF9u YW1lJzogJ1dlYktpdFRlc3ROZXRzY2FwZVBsdWdJbicsCisgICAgICAgICAgICAgICAgICAgICdw cm9kdWN0X2V4dGVuc2lvbic6ICdwbHVnaW4nLAorICAgICAgICAgICAgICAgICAgICAnbGlua19z ZXR0aW5ncyc6IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICdsaWJyYXJpZXMnOiBbCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJyQoU0RLUk9PVCkvU3lzdGVtL0xpYnJhcnkvRnJhbWV3 b3Jrcy9DYXJib24uZnJhbWV3b3JrJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnJChT REtST09UKS9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL0NvY29hLmZyYW1ld29yaycsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJyQoU0RLUk9PVCkvU3lzdGVtL0xpYnJhcnkvRnJhbWV3 b3Jrcy9RdWFydHpDb3JlLmZyYW1ld29yaycsCisgICAgICAgICAgICAgICAgICAgICAgICBdCisg ICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgICd4Y29kZV9zZXR0aW5n cyc6IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICdHQ0NfU1lNQk9MU19QUklWQVRFX0VYVEVS Tic6ICdOTycsCisgICAgICAgICAgICAgICAgICAgICAgICAjIFRoaXMgaXMgYSB0ZW1wb3Jhcnkg Zm9yayBvZgorICAgICAgICAgICAgICAgICAgICAgICAgIyBEUlQvVGVzdE5ldHNjYXBlUGx1Z0lu L21hYy9JbmZvLnBsaXN0LiAgT25jZQorICAgICAgICAgICAgICAgICAgICAgICAgIyB3ZSBnZXQg cmlkIG9mIG91ciBmb3JrZWQgcGx1Z2luIGluIHRoZQorICAgICAgICAgICAgICAgICAgICAgICAg IyBjaHJvbWl1bSByZXBvLCB3ZSBjYW4gc2hhcmUgdGhlIHNhbWUKKyAgICAgICAgICAgICAgICAg ICAgICAgICMgSW5mby5wbGlzdC4KKyAgICAgICAgICAgICAgICAgICAgICAgICdJTkZPUExJU1Rf RklMRSc6ICcuLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0TmV0c2NhcGVQ bHVnSW4vSW5mby5wbGlzdCcsCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAg ICAgfSwKICAgICAgICAgICAgIF0sCiAgICAgICAgIH1dLAogICAgIF0sICMgY29uZGl0aW9ucwo=