48407 2010-10-27 03:00:57 -0700 Port ContextMenuItemWin.cpp to WinCE 2010-10-28 14:42:15 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga aroben commit-queue oldest_to_newest 300090 0 paroga 2010-10-27 03:00:57 -0700 see patch 300115 1 72005 paroga 2010-10-27 04:41:06 -0700 Created attachment 72005 Patch 300122 2 72005 aroben 2010-10-27 04:48:22 -0700 Comment on attachment 72005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72005&action=review > WebCore/platform/win/ContextMenuItemWin.cpp:73 > +#if OS(WINCE) > + m_platformDescription->fMask = MIIM_TYPE; > +#else > m_platformDescription->fMask = MIIM_FTYPE; > +#endif Maybe we could finesse this a little more by using a constant that is defined to MIIM_TYPE on WinCE and MIIM_FTYPE on other versions of Windows? Or we could define MIIM_FTYPE on WinCE. > WebCore/platform/win/ContextMenuItemWin.cpp:88 > if (subMenu) { > - m_platformDescription->fMask |= MIIM_STRING | MIIM_SUBMENU; > + m_platformDescription->fMask |= MIIM_SUBMENU; > m_platformDescription->hSubMenu = subMenu->platformDescription(); > } else > - m_platformDescription->fMask |= MIIM_STRING | MIIM_ID; > + m_platformDescription->fMask |= MIIM_ID; > + > +#if !OS(WINCE) > + m_platformDescription->fMask |= MIIM_STRING; > +#endif …and we could finesse this more by defining MIIM_STRING to 0 on WinCE. 300230 3 72036 paroga 2010-10-27 08:09:19 -0700 Created attachment 72036 Patch (In reply to comment #2) > Maybe we could finesse this a little more... Not sure if it's better now, but it's ok for me too. ;-) 301331 4 commit-queue 2010-10-28 14:19:50 -0700 The commit-queue encountered the following flaky tests while processing attachment 72036: http/tests/appcache/foreign-iframe-main.html http/tests/inspector/console-resource-errors.html Please file bugs against the tests. These tests were authored by ap@webkit.org, caseq@chromium.org, and eric@webkit.org. The commit-queue is continuing to process your patch. 301346 5 72036 commit-queue 2010-10-28 14:42:10 -0700 Comment on attachment 72036 Patch Clearing flags on attachment: 72036 Committed r70812: <http://trac.webkit.org/changeset/70812> 301347 6 commit-queue 2010-10-28 14:42:15 -0700 All reviewed patches have been landed. Closing bug. 72005 2010-10-27 04:41:06 -0700 2010-10-27 08:09:19 -0700 Patch bug-48407.patch text/plain 2132 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzU2ZmE4ZC4uODNjMTNkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMC0yNyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQb3J0IENvbnRleHRNZW51SXRlbVdpbi5jcHAgdG8gV2luQ0UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NDA3CisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbTo6Q29udGV4dE1lbnVJdGVtKToKKwogMjAxMC0xMC0y NCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3dp bi9Db250ZXh0TWVudUl0ZW1XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1l bnVJdGVtV2luLmNwcAppbmRleCBlMjY1Yzk2Li5iOWU4YzRkIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL3dpbi9Db250ZXh0TWVudUl0ZW1XaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vd2luL0NvbnRleHRNZW51SXRlbVdpbi5jcHAKQEAgLTMxLDYgKzMxLDEwIEBACiAjaW5jbHVk ZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHdpbmRvd3MuaD4KIAorI2lmbmRlZiBN RlNfRElTQUJMRUQKKyNkZWZpbmUgTUZTX0RJU0FCTEVEIE1GX0dSQVlFRAorI2VuZGlmCisKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogQ29udGV4dE1lbnVJdGVtOjpDb250ZXh0TWVudUl0ZW0oTFBN RU5VSVRFTUlORk8gaXRlbSkKQEAgLTYyLDIyICs2NiwzMCBAQCBDb250ZXh0TWVudUl0ZW06OkNv bnRleHRNZW51SXRlbShDb250ZXh0TWVudUl0ZW1UeXBlIHR5cGUsIENvbnRleHRNZW51QWN0aW9u IGFjdAogCiAgICAgbWVtc2V0KG1fcGxhdGZvcm1EZXNjcmlwdGlvbiwgMCwgc2l6ZW9mKE1FTlVJ VEVNSU5GTykpOwogICAgIG1fcGxhdGZvcm1EZXNjcmlwdGlvbi0+Y2JTaXplID0gc2l6ZW9mKE1F TlVJVEVNSU5GTyk7CisjaWYgT1MoV0lOQ0UpCisgICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uLT5m TWFzayA9IE1JSU1fVFlQRTsKKyNlbHNlCiAgICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uLT5mTWFz ayA9IE1JSU1fRlRZUEU7CisjZW5kaWYKIAogICAgIGlmICh0eXBlID09IFNlcGFyYXRvclR5cGUp IHsKICAgICAgICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uLT5mVHlwZSA9IE1GVF9TRVBBUkFUT1I7 CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgCisKICAgICBpZiAoc3ViTWVudSkgewotICAg ICAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24tPmZNYXNrIHw9IE1JSU1fU1RSSU5HIHwgTUlJTV9T VUJNRU5VOworICAgICAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24tPmZNYXNrIHw9IE1JSU1fU1VC TUVOVTsKICAgICAgICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uLT5oU3ViTWVudSA9IHN1Yk1lbnUt PnBsYXRmb3JtRGVzY3JpcHRpb24oKTsKICAgICB9IGVsc2UKLSAgICAgICAgbV9wbGF0Zm9ybURl c2NyaXB0aW9uLT5mTWFzayB8PSBNSUlNX1NUUklORyB8IE1JSU1fSUQ7CisgICAgICAgIG1fcGxh dGZvcm1EZXNjcmlwdGlvbi0+Zk1hc2sgfD0gTUlJTV9JRDsKKworI2lmICFPUyhXSU5DRSkKKyAg ICBtX3BsYXRmb3JtRGVzY3JpcHRpb24tPmZNYXNrIHw9IE1JSU1fU1RSSU5HOworI2VuZGlmCiAK ICAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24tPmZUeXBlID0gTUZUX1NUUklORzsKICAgICBtX3Bs YXRmb3JtRGVzY3JpcHRpb24tPndJRCA9IGFjdGlvbjsKLSAgICAKKwogICAgIFN0cmluZyB0ID0g dGl0bGU7CiAgICAgbV9wbGF0Zm9ybURlc2NyaXB0aW9uLT5jY2ggPSB0Lmxlbmd0aCgpOwogICAg IG1fcGxhdGZvcm1EZXNjcmlwdGlvbi0+ZHdUeXBlRGF0YSA9IHdjc2R1cCh0LmNoYXJhY3RlcnNX aXRoTnVsbFRlcm1pbmF0aW9uKCkpOwo= 72036 2010-10-27 08:09:19 -0700 2010-10-28 14:42:10 -0700 Patch bug-48407.patch text/plain 1070 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGU2MmYzMi4uNjMwMzY1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0xMC0yNyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQb3J0IENvbnRleHRNZW51SXRlbVdpbi5jcHAgdG8gV2luQ0UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NDA3CisK KyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcDoKKwogMjAxMC0x MC0yNyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vd2luL0Nv bnRleHRNZW51SXRlbVdpbi5jcHAKaW5kZXggZTI2NWM5Ni4uYWRlMGRiMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVJdGVtV2luLmNwcAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL3dpbi9Db250ZXh0TWVudUl0ZW1XaW4uY3BwCkBAIC0zMSw2ICszMSwxOCBAQAog I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAKKyNp ZiBPUyhXSU5DRSkKKyNpZm5kZWYgTUZTX0RJU0FCTEVECisjZGVmaW5lIE1GU19ESVNBQkxFRCBN Rl9HUkFZRUQKKyNlbmRpZgorI2lmbmRlZiBNSUlNX0ZUWVBFCisjZGVmaW5lIE1JSU1fRlRZUEUg TUlJTV9UWVBFCisjZW5kaWYKKyNpZm5kZWYgTUlJTV9TVFJJTkcKKyNkZWZpbmUgTUlJTV9TVFJJ TkcgMAorI2VuZGlmCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBDb250ZXh0TWVu dUl0ZW06OkNvbnRleHRNZW51SXRlbShMUE1FTlVJVEVNSU5GTyBpdGVtKQo=