Changeset 8 for trunk/llmozlib2/llembeddedbrowser.cpp

Timestamp:

02/29/08 19:32:35 (2 years ago)

Author:

rob.linden

Message:

Latest internal snapshot
Last Changed Rev: 80909
Last Changed Date: 2008-02-27 15:08:55 -0800 (Wed, 27 Feb 2008)

Files:

• trunk/llmozlib2/llembeddedbrowser.cpp (modified) (11 diffs)

trunk/llmozlib2/llembeddedbrowser.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// Windows specific switches
@@ -36 +43 @@
-                #define DEBUG 1
-        #endif
-
+ // WIN32
-
-#include "llembeddedbrowser.h"
@@ -42 +49 @@
-
-#ifdef WIN32
- 
- 
+      
+      
-#endif  // WIN32
-
-#include "nsBuildID.h"
-#include "nsNetCID.h"
-#include "nsCWebBrowser.h"
-#include "nsGUIEvent.h"
-#include "nsICacheService.h"
-#include "nsICookieManager.h"
-#include "nsICaret.h"
-#include "nsIComponentRegistrar.h"
-#include "nsIContent.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindow.h"
-#include "nsIDocShell.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDocument.h"
-#include "nsIFactory.h"
-#include "nsIFrame.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIPref.h"
-
-
-
-
-
-
-
-
+
-#include "nsProfileDirServiceProvider.h"
-#include "nsXPCOMGlue.h"
-#include "nsXULAppAPI.h"
-#include "nsWidgetsCID.h" // for NS_APPSHELL_CID
-#include "nsIAppShell.h"
-
+
+
+
+
+
-
-// singleton pattern - initialization
@@ -86 +73 @@
-//
-LLEmbeddedBrowser::LLEmbeddedBrowser() :
-
+
+
-{
-}
@@ -131 +119 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        nsCOMPtr< nsILocalFile > applicationDirNative;
-        nsresult result = NS_NewNativeLocalFile( nsCString( applicationDir.c_str() ), PR_FALSE, getter_AddRefs( applicationDirNative ) );
@@ -193 +192 @@
-        if ( pref )
-        {
-                //pref->SetBoolPref( "viewmanager.do_doublebuffering", PR_FALSE );
-                pref->SetBoolPref( "security.warn_entering_secure", PR_FALSE );
-                pref->SetBoolPref( "security.warn_entering_weak", PR_FALSE );
@@ -208 +206 @@
-        enableProxy( false, "", 0 );
-
-def LL_LINUX
+ defined(LL_LINUX) || defined(LL_DARWIN)
-        // Essential on Linux/GTK to add the gecko pump to the GTK event
-        // loop.  Might be harmless/good on other platforms too.
+        nsresult rv;
-        nsCOMPtr<nsIAppShell> appShell;
-
+
+
-        if (!appShell)
-        {
@@ -233 +233 @@
-bool LLEmbeddedBrowser::reset()
-{
-        if (sAppShell) {
-                // Shutdown the appshell service.
-                sAppShell->Spindown();
-                NS_RELEASE(sAppShell);
-                sAppShell = NULL;
-        }
-
-        XRE_TermEmbedding();
-
-        return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-std::string LLEmbeddedBrowser::getGREVersion()
-{
-        // take the string directly from Mozilla
-        return std::string( GRE_BUILD_ID );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLEmbeddedBrowser::setBrowserAgentId( std::string idIn )
-{
-        nsCOMPtr<nsIPref> pref = do_CreateInstance( NS_PREF_CONTRACTID );
-        if ( pref )
-        {
-                pref->SetCharPref( "general.useragent.extra.* ", idIn.c_str() );
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLEmbeddedBrowserWindow* createWindow(  void* nativeWindowHandleIn, int widthIn, int heightIn, PRUint32 aChromeFlags, nsIWebBrowserChrome* aParent, nsIWebBrowserChrome** aNewWindow )
-{
-        LLEmbeddedBrowserWindow* chrome = new LLEmbeddedBrowserWindow();
-        if ( ! chrome )
-        {
-                return 0;
-        };
-
-        CallQueryInterface( NS_STATIC_CAST( nsIWebBrowserChrome*, chrome ), aNewWindow );
-
-        NS_ADDREF( *aNewWindow );
-
-        chrome->SetChromeFlags( aChromeFlags );
-
-        nsCOMPtr< nsIWebBrowser > newBrowser;
-
-        chrome->createBrowser( nativeWindowHandleIn, widthIn, heightIn, getter_AddRefs( newBrowser ) );
-        if ( ! newBrowser )
-        {
-                return 0;
-        };
-
-        return chrome;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLEmbeddedBrowserWindow* LLEmbeddedBrowser::createBrowserWindow( void* nativeWindowHandleIn, int browserWidthIn, int browserHeightIn )
-{
-    nsCOMPtr< nsIWebBrowserChrome > chrome;
-    LLEmbeddedBrowserWindow* newWin = createWindow( nativeWindowHandleIn, browserWidthIn, browserHeightIn, nsIWebBrowserChrome::CHROME_ALL, nsnull, getter_AddRefs( chrome ) );
-    if ( newWin && chrome )
-    {
-        nsCOMPtr< nsIWebBrowser > newBrowser;
-        chrome->GetWebBrowser( getter_AddRefs( newBrowser ) );
-        nsCOMPtr< nsIWebNavigation > webNav( do_QueryInterface ( newBrowser ) );
-        webNav->LoadURI( NS_ConvertUTF8toUTF16( "about:blank" ).get(), nsIWebNavigation::LOAD_FLAGS_NONE, nsnull, nsnull, nsnull );
-
-
-                clearLastError();
-
-                return newWin;
-    };
-
-        setLastError( 0x2001 );
-
-        return 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//
-bool LLEmbeddedBrowser::destroyBrowserWindow( LLEmbeddedBrowserWindow* browserWindowIn )
-{
-        nsCOMPtr< nsIWebBrowser > webBrowser;
-        nsCOMPtr< nsIWebNavigation > webNavigation;
-
-        browserWindowIn->GetWebBrowser( getter_AddRefs( webBrowser ) );
-        webNavigation = do_QueryInterface( webBrowser );
-        if ( webNavigation )
-        {
-                webNavigation->Stop( nsIWebNavigation::STOP_ALL );
-        };
-
-        nsCOMPtr< nsIWebBrowser > browser = nsnull;
-        browserWindowIn->GetWebBrowser( getter_AddRefs( browser ) );
-        nsCOMPtr< nsIBaseWindow > browserAsWin = do_QueryInterface( browser );
-        if ( browserAsWin )
-        {
-                browserAsWin->Destroy();
-        };
-
-        browserWindowIn->SetWebBrowser( nsnull );
-
-        NS_RELEASE( browserWindowIn );
-
-        delete browserWindowIn;
-
-        clearLastError();
-
-        return true;
@@ -361 +251 @@
-}
-
-
+/
-//
-bool LLEmbeddedBrowser::enableProxy( bool proxyEnabledIn, std::string proxyHostNameIn, int proxyPortIn )
@@ -440 +330 @@
-                        pref->SetBoolPref( "plugin.scan.plid.all", PR_FALSE );
-                        pref->SetBoolPref( "xpinstall-enabled", PR_FALSE );
+                        pref->SetBoolPref( "plugin.scan.4xPluginFolder", PR_FALSE );
+                        pref->SetCharPref( "plugin.scan.Quicktime", "20.0" );
+                        pref->SetCharPref( "plugin.scan.Acrobat", "99.0" );
+                        pref->SetCharPref( "plugin.scan.SunJRE", "99.0" );
+                        pref->SetCharPref( "plugin.scan.WindowsMediaPlayer", "99.0" );
-                };
-
@@ -446 +341 @@
-
-        return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLEmbeddedBrowser::setBrowserAgentId( std::string idIn )
+{
+        nsCOMPtr<nsIPref> pref = do_CreateInstance( NS_PREF_CONTRACTID );
+        if ( pref )
+        {
+                pref->SetCharPref( "general.useragent.extra.* ", idIn.c_str() );
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLEmbeddedBrowserWindow* LLEmbeddedBrowser::createBrowserWindow( int browserWidthIn, int browserHeightIn )
+{
+    nsCOMPtr< nsIWebBrowserChrome > chrome;
+
+        LLEmbeddedBrowserWindow* newWin = new LLEmbeddedBrowserWindow();
+        if ( ! newWin )
+        {
+                return 0;
+        };
+
+        nsIWebBrowserChrome** aNewWindow = getter_AddRefs( chrome );
+
+        CallQueryInterface( NS_STATIC_CAST( nsIWebBrowserChrome*, newWin ), aNewWindow );
+
+        NS_ADDREF( *aNewWindow );
+
+        newWin->SetChromeFlags( nsIWebBrowserChrome::CHROME_ALL );
+
+        nsCOMPtr< nsIWebBrowser > newBrowser;
+
+        newWin->createBrowser( mNativeWindowHandle, browserWidthIn, browserHeightIn, getter_AddRefs( newBrowser ) );
+        if ( ! newBrowser )
+        {
+                return 0;
+        };
+
+    if ( newWin && chrome )
+    {
+                newWin->setParent( this );
+        nsCOMPtr< nsIWebBrowser > newBrowser;
+        chrome->GetWebBrowser( getter_AddRefs( newBrowser ) );
+        nsCOMPtr< nsIWebNavigation > webNav( do_QueryInterface ( newBrowser ) );
+                webNav->LoadURI( NS_ConvertUTF8toUTF16( "about:blank" ).get(), nsIWebNavigation::LOAD_FLAGS_NONE, nsnull, nsnull, nsnull );
+
+                clearLastError();
+
+                return newWin;
+    };
+
+        setLastError( 0x2001 );
+        return 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLEmbeddedBrowser::destroyBrowserWindow( LLEmbeddedBrowserWindow* browserWindowIn )
+{
+        nsCOMPtr< nsIWebBrowser > webBrowser;
+        nsCOMPtr< nsIWebNavigation > webNavigation;
+
+        browserWindowIn->GetWebBrowser( getter_AddRefs( webBrowser ) );
+        webNavigation = do_QueryInterface( webBrowser );
+        if ( webNavigation )
+        {
+                webNavigation->Stop( nsIWebNavigation::STOP_ALL );
+        };
+
+        nsCOMPtr< nsIWebBrowser > browser = nsnull;
+        browserWindowIn->GetWebBrowser( getter_AddRefs( browser ) );
+        nsCOMPtr< nsIBaseWindow > browserAsWin = do_QueryInterface( browser );
+        if ( browserAsWin )
+        {
+                browserAsWin->Destroy();
+        };
+
+        browserWindowIn->SetWebBrowser( nsnull );
+
+        NS_RELEASE( browserWindowIn );
+
+        delete browserWindowIn;
+
+        clearLastError();
+
+        return true;
-}
-
-// Windows specific switches
-#ifdef WIN32
-
-        #pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
-        #pragma warning( 3 : 4291 ) // (no matching operator delete found; memory will not be freed if initialization throws an exception)
+        #pragma warning( 3 : 4265 )     // "class has virtual functions, but destructor is not virtual"
-
-        // #define required by this file for LibXUL/Mozilla code to avoid crashes in their debug code