From 65d8a5a11b3b6aa2a7d0e972dfaa90a3aaf02e07 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 28 Sep 2009 17:57:51 -0700
Subject: Changed win32 generation of initial 'component_path' for webkit
 plugin. DllMain() captures module handle. Call to GetModuleFilePathA() gets
 the dll filepath, Filename is trimmed off.

---
 indra/media_plugins/webkit/media_plugin_webkit.cpp | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 2928b7e6b3..b1bb5f23b9 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -48,6 +48,18 @@
 #include <stdlib.h>
 #endif
 
+#if LL_WINDOWS
+	// *NOTE:Mani - This captures the module handle fo rthe dll. This is used below
+	// to get the path to this dll for webkit initialization.
+	// I don't know how/if this can be done with apr...
+	namespace {	HMODULE gModuleHandle;};
+	BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+	{
+		gModuleHandle = (HMODULE) hinstDLL;
+		return TRUE;
+	}
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 class MediaPluginWebKit : 
@@ -126,7 +138,31 @@ private:
 			return false;
 		}
 		std::string application_dir = std::string( cwd );
+
+#if LL_WINDOWS
+		//*NOTE:Mani - On windows, at least, the component path is the
+		// location of this dll's image file. 
+		std::string component_dir;
+		char dll_path[_MAX_PATH];
+		DWORD len = GetModuleFileNameA(gModuleHandle, (LPCH)&dll_path, _MAX_PATH);
+		while(len && dll_path[ len ] != ('\\') )
+		{
+			len--;
+		}
+		if(len >= 0)
+		{
+			dll_path[len] = 0;
+			component_dir = dll_path;
+		}
+		else
+		{
+			// *NOTE:Mani - This case should be an rare exception. 
+			// GetModuleFileNameA should always give you a full path, no?
+			component_dir = application_dir;
+		}
+#else
 		std::string component_dir = application_dir;
+#endif
 		std::string profileDir = application_dir + "/" + "browser_profile";		// cross platform?
 
 		// window handle - needed on Windows and must be app window.
-- 
cgit v1.2.3


From 434709680326aa634805afdcf900b7445ef4aac4 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 15 Oct 2009 11:26:52 -0700
Subject: https://jira.lindenlab.com/jira/browse/DEV-40711 Implement name
 fetching capabilities for Webkit and Quicktime plugins Adds support for new
 PluginAPI message (MEDIA_EVENT_NAME_CHANGED) that updates the "title" of the
 media. In WebKit plugin this is the contents of the <title> tag. In The
 QuickTime plugin it is the "display name" from the movie meta data

---
 indra/media_plugins/webkit/media_plugin_webkit.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 1b71ba1769..65872e1596 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -183,7 +183,7 @@ private:
 
 #if LL_WINDOWS
 			// Enable plugins
-			LLQtWebKit::getInstance()->enablePlugins(false);
+			LLQtWebKit::getInstance()->enablePlugins(true);
 #elif LL_DARWIN
 			// Disable plugins
 			LLQtWebKit::getInstance()->enablePlugins(false);
@@ -308,7 +308,16 @@ private:
 		message.setValue("status", event.getStringValue());
 		sendMessage(message);
 	}
-	
+
+	////////////////////////////////////////////////////////////////////////////////
+	// virtual
+	void onTitleChange(const EventType& event)
+	{
+		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text");
+		message.setValue("name", event.getStringValue());
+		sendMessage(message);
+	}
+
 	////////////////////////////////////////////////////////////////////////////////
 	// virtual
 	void onLocationChange(const EventType& event)
-- 
cgit v1.2.3