diff -r a359256acfc6 -r c8a366e56285 webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Thu Aug 27 07:44:59 2009 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Thu Sep 24 12:53:48 2009 +0300 @@ -321,8 +321,8 @@ npWindow->y = rect.iTl.iY; npWindow->width = rect.Width(); npWindow->height = rect.Height(); - npWindow->type = NPWindowTypeWindow; - npWindow->window = NULL; + npWindow->type = pluginWin->Windowed() ? NPWindowTypeWindow : NPWindowTypeDrawable; + npWindow->window = pluginWin->Windowed() ? NULL : (MPluginAdapter*) pluginWin; NPRect clipRect = {0,0,0,0}; npWindow->clipRect = clipRect; @@ -389,6 +389,17 @@ } } break; // for code consistency + + case NPNVSupportsWindowless:{ + PluginWin* pluginWin = (PluginWin*)aInstance->ndata; + if (pluginWin) { + *((TBool*) aRetValue) = ETrue; + } + else { + err = NPERR_GENERIC_ERROR; + } + } + break; default: { *((TBool*) aRetValue) = EFalse;