Bug 48407 – Port ContextMenuItemWin.cpp to WinCE

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Patrick R. Gansterer]

see patch

[Patrick R. Gansterer]

Created attachment 72005 [details]
Patch

[Adam Roben (:aroben)]

Comment on attachment 72005 [details]
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.

[Patrick R. Gansterer]

Created attachment 72036 [details]
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. ;-)

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 72036 [details]:

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 [e-mail], [e-mail], and [e-mail].  The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 72036 [details]
Patch

Clearing flags on attachment: 72036

Committed r70812: <http://trac.webkit.org/changeset/70812>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.