livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Tofu Linden 2010-09-23 13:46:11 +01:00
parent 438e42edcf 0f391c6ac9
commit 904776288c
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/media_plugins/webkit/media_plugin_webkit.cpp
View File

@ -304,11 +304,7 @@ private:
LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
// create single browser window
#if LLQTWEBKIT_API_VERSION < 2
mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight);
#else
mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight, mTarget);
#endif
// tell LLQtWebKit about the size of the browser window
LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
@ -509,14 +505,9 @@ private:
void onClickLinkHref(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
#if LLQTWEBKIT_API_VERSION < 2
message.setValue("uri", event.getStringValue());
message.setValue("target", event.getStringValue2());
#else
message.setValue("uri", event.getEventUri());
message.setValue("target", event.getStringValue());
message.setValue("uuid", event.getStringValue2());
#endif
sendMessage(message);
}
@ -525,11 +516,7 @@ private:
void onClickLinkNoFollow(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_nofollow");
#if LLQTWEBKIT_API_VERSION < 2
message.setValue("uri", event.getStringValue());
#else
message.setValue("uri", event.getEventUri());
#endif
sendMessage(message);
}
@ -551,9 +538,7 @@ private:
void onWindowCloseRequested(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "close_request");
#if LLQTWEBKIT_API_VERSION >= 2
message.setValue("uuid", event.getStringValue());
#endif
sendMessage(message);
}
@ -1214,7 +1199,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
}
}
}
#if LLQTWEBKIT_API_VERSION >= 2
else if(message_name == "proxy_window_opened")
{
std::string target = message_in.getValue("target");
@ -1226,7 +1210,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
std::string uuid = message_in.getValue("uuid");
LLQtWebKit::getInstance()->proxyWindowClosed(mBrowserWindowId, uuid);
}
#endif
else
{
// std::cerr << "MediaPluginWebKit::receiveMessage: unknown media_browser message: " << message_string << std::endl;