Changeset 8

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/README-linux-linden.txt (modified) (1 diff)
• trunk/llmozlib2/README-linux.txt (modified) (3 diffs)
• trunk/llmozlib2/README-mac.txt (modified) (3 diffs)
• trunk/llmozlib2/build-linux-llmozlib.sh (modified) (2 diffs)
• trunk/llmozlib2/build_mozilla/.mozconfig.debug (modified) (1 diff)
• trunk/llmozlib2/build_mozilla/.mozconfig.optimized (modified) (1 diff)
• trunk/llmozlib2/build_mozilla/linux-checkout_patch_build.sh (modified) (2 diffs)
• trunk/llmozlib2/build_mozilla/linux-libxul-bits/mozconfig (modified) (2 diffs)
• trunk/llmozlib2/build_mozilla/mac-checkout_patch_build.sh (modified) (3 diffs)
• trunk/llmozlib2/build_mozilla/mac-universal-libxul-bits/mozconfig (modified) (2 diffs)
• trunk/llmozlib2/copy_products_linux.sh (modified) (3 diffs)
• trunk/llmozlib2/copy_products_mac.sh (modified) (1 diff)
• trunk/llmozlib2/copy_products_windows.bat (modified) (2 diffs)
• trunk/llmozlib2/llembeddedbrowser.cpp (modified) (11 diffs)
• trunk/llmozlib2/llembeddedbrowser.h (modified) (4 diffs)
• trunk/llmozlib2/llembeddedbrowserwindow.cpp (modified) (36 diffs)
• trunk/llmozlib2/llembeddedbrowserwindow.h (modified) (10 diffs)
• trunk/llmozlib2/repackage_runtime_mac.sh (modified) (4 diffs)
• trunk/llmozlib2/tests/dependencies/include/GL/glut.h (modified) (4 diffs)

trunk/llmozlib2/README-linux-linden.txt

@@ -67 +67 @@
-Probably only of interest if you're a Second Life developer!
-
-
-
+2
+2
-3. copy libraries/i686-linux/lib_release/libprofdirserviceprovider_s.a to ${SLSRC}/libraries/i686-linux/lib_release_client/
-4. copy libraries/i686-linux/runtime_release to ${SLSRC}/indra/newview/app_settings/mozilla-runtime-linux-i686

trunk/llmozlib2/README-linux.txt

@@ -34 +34 @@
-1. ./build-linux-llmozlib.sh
-
-
+2
-
-3. BUILDING THE TEST APPLICATIONS
@@ -46 +46 @@
-downloaded from http://glui.sourceforge.net/
-
-.llmozlib
+
-   * Change CXX if appropriate.
-.llmozlib
+
-2. ./browser-linux-build.sh
-
@@ -54 +54 @@
-
-3. cd ../../libraries/i686-linux/runtime_release
-.llmozlib
+
-

trunk/llmozlib2/README-mac.txt

@@ -3 +3 @@
-If you just need to rebuild the llmozlib library, you can skip ahead to building the xcode project.
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-Once you've got the mozilla libraries in place, open llmozlib.xcodeproj and build the "Release" build style.  If the build fails with a bunch of missing include files, close the project and reopen it, then try again.  (A script phase in the project creates a symlink, but xcode only reevaluates the wildcard header path search when the project is opened.  You should only have to do this once per checkout.)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
------------
-
+2
-
-In order to hide internal symbols in the mozilla library, we have to use an explicit export list when building llmozlib.
@@ -18 +46 @@
-The list of symbols to export is in llmozlib.exp.  The symbols are in "name mangled" form, making them a bit of a pain to read.
-
-
+
+
+
+
-
-- Open up the xcode project
-
-
+
-- Execute the following commands:
-
-build/Release/libllmozlib.dylib
+'build/All Symbols/libllmozlib2.dylib'
-sed -n -e '/.*\.eh/d' -e 's/^single module    \(.*\)/\1/p' <symbols.txt >symbols2.txt
-
@@ -33 +63 @@
-
-Once you've got the new list, paste it into llmozlib.exp and change the "Exported Symbols File" setting back to "llmozlib.exp".
+
+NOTE:  Command line build command:
+
+xcodebuild -project llmozlib2.xcodeproj -target llmozlib2 -configuration Release build
+
+(You can use "clean" instead of "build")
-
------------

trunk/llmozlib2/build-linux-llmozlib.sh

@@ -1 @@
-
+ba
-# This script builds llmozlib itself.  This should happen after
-# mozilla has been built and copy_products_linux.sh has been run.
@@ -5 +5 @@
-CXX='g++-3.4'
-MOZARCH='i686-linux'
-
+2
-
-#------------------------
-
-
+2
-OBJS=`echo ${SRCS} | sed s/\\.cpp/.o/g`
-pkg-config gtk+-2.0 --cflags` `
+
-DEFS='-DMOZILLA_INTERNAL_API -DLL_LINUX=1'
-OPTS='-ggdb'

trunk/llmozlib2/build_mozilla/.mozconfig.debug

@@ -27 +27 @@
-ac_add_options --enable-image-decoders=png,gif,jpeg
-ac_add_options --enable-svg
-ac_add_options --enable-svg-renderer=gdiplus
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-activex

trunk/llmozlib2/build_mozilla/.mozconfig.optimized

@@ -27 +27 @@
-ac_add_options --enable-image-decoders=png,gif,jpeg
-ac_add_options --enable-svg
-ac_add_options --enable-svg-renderer=gdiplus
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-activex

trunk/llmozlib2/build_mozilla/linux-checkout_patch_build.sh

@@ -10 +10 @@
-echo 'use the password "anonymous" if prompted'
-cvs login
-1_5_0_12
+2_0_0_11
-(cd mozilla && make -f client.mk checkout MOZ_CO_PROJECT=xulrunner)
-
@@ -18 +18 @@
-# apply a patch to the mozilla source so that it doesn't try to use the OS 
-# versions of scrollbars, combo boxes, etc.
-ux-libxul-bits/linden_updates
+den
-
-# XXX FIXME: ideally we need to bring custom GTK in-tree and do some magic on its .pc files - yuck.  Only Linden Lab's conservative-deps binary builds really care though.
-#export PKG_CONFIG_PATH=/home/moss/linden
+export PKG_CONFIG_PATH=/tmp
-(cd mozilla && make -f client.mk build)
-

trunk/llmozlib2/build_mozilla/linux-libxul-bits/mozconfig

@@ -61 +61 @@
-CURRENTDIR=`pwd`
-
+# parallel build (adjust to taste)
+mk_add_options MOZ_MAKE_FLAGS=-j4
+
-mk_add_options MOZ_CO_PROJECT=xulrunner
-ac_add_options --enable-application=xulrunner
@@ -99 +102 @@
-#ac_add_options --with-gtk-prefix=/tmp/GTKBUILD
-#ac_add_options --with-glib-prefix=/tmp/GTKBUILD
-
+
+
+
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui

trunk/llmozlib2/build_mozilla/mac-checkout_patch_build.sh

@@ -11 +11 @@
-cvs login
-#cvs checkout -r MOZILLA_1_8_BRANCH mozilla/client.mk
-1_5_0_12
+2_0_0_11
-(cd mozilla && make -f client.mk checkout MOZ_CO_PROJECT=xulrunner)
-
@@ -20 +20 @@
-# shell scripts that I don't want to set up.  Since we don't need to build the 
-# package, just comment this out.
-
+
+
-
-# replace the 'flight.mk' with one that does the right thing for the xulrunner build
@@ -29 +30 @@
-# apply a patch to the mozilla source so that it doesn't try to use the OS 
-# versions of scrollbars, combo boxes, etc.
-mac-universal-libxul-bits/linden-mozilla-mods
+linden
-
-(cd mozilla && make -f client.mk build)

trunk/llmozlib2/build_mozilla/mac-universal-libxul-bits/mozconfig

@@ -107 +107 @@
-fi
-
+
-# parallel build (adjust to taste)
-mk_add_options MOZ_MAKE_FLAGS=-j4
@@ -142 +143 @@
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-
+
+
+
-
-ac_add_options --enable-cpp-rtti

trunk/llmozlib2/copy_products_linux.sh

@@ -1 @@
-
+ba
-
-# This script copies the relevant headers from the mozilla tree to the llmozlib 
@@ -12 +12 @@
-export LIBRARIES_DEST="."
-
-i686
+`uname -m`
-
-# make sure the destination directories exist.  If they don't, the user running the script probably hasn't set them up properly.
@@ -27 +27 @@
-SRC="$MOZ_OBJDIR"
-DST="$LIBRARIES_DEST/libraries/$ARCH"
-
+include/js/ /include/appshell/ /
-        mkdir -p $DST/include/mozilla/${dir}
-        cp -LR $SRC/dist/${dir}/* $DST/include/mozilla/${dir}

trunk/llmozlib2/copy_products_mac.sh

@@ -97 +97 @@
-+ /include/necko/
-+ /include/nkcache/
++ /include/js/
-+ /sdk/
-+ /sdk/include/
-+ /sdk/include/*/
-+ *.h
++ *.tbl
-- *
-EOF

trunk/llmozlib2/copy_products_windows.bat

@@ -1 +1 @@
-@rem ===== source/destination dirs that may change depending where you build mozilla =====
-.1.8.0.9
-.1.8.0.9
+
+
-@set DEST_DIR="libraries\i686-win32"
-
-@rem =============== instructions ===============
-@echo This batch file copies the files required to build the 
- (LLMozLib
+2 (LLMozLib2
-@echo.
-@echo It will copy the required files from a Mozilla build in the specified 
-
+2
-@echo.
-@echo The release build will be copied from:
@@ -28 +28 @@
-xcopy %SRC_DIR_OPT%\dist\include\dom\*.*                                                %DEST_DIR%\include\mozilla\include\dom\ /s
-xcopy %SRC_DIR_OPT%\dist\include\gfx\*.*                                                %DEST_DIR%\include\mozilla\include\gfx\ /s
+xcopy %SRC_DIR_OPT%\dist\include\js\*.*                                                 %DEST_DIR%\include\mozilla\include\js\ /s
-xcopy %SRC_DIR_OPT%\dist\include\layout\*.*                                             %DEST_DIR%\include\mozilla\include\layout\ /s
-xcopy %SRC_DIR_OPT%\dist\include\locale\*.*                                             %DEST_DIR%\include\mozilla\include\locale\ /s

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

trunk/llmozlib2/llembeddedbrowser.h

@@ -1 @@
-
-
-
+
+
- *
-
+
+
+
+
- *
-
+
+
+
+
- *
-
-
-
-
-
-
-
+
- *
-
-
-
-
+
+
- *
-
-
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifndef LLEMBEDDEDBROWSER_H
@@ -47 +54 @@
-                static LLEmbeddedBrowser* getInstance();
-
-
+, void* nativeWindowHandleIn
-                bool reset();
-                bool clearCache();
@@ -56 +63 @@
-                std::string getGREVersion();
-                void setBrowserAgentId( std::string idIn );
-void* nativeWindowHandleIn, 
+
-                bool destroyBrowserWindow( LLEmbeddedBrowserWindow* browserWindowIn );
-                bool setCaretColor( int browserWindowIdIn, const int redIn, const int greenIn, const int blueIn );
-                void setLastError( int errorNumIn );
-                void clearLastError();
@@ -65 +71 @@
-        private:
-                static LLEmbeddedBrowser* sInstance;
+                void* mNativeWindowHandle;
-                int mErrorNum;
-};
-
-#endif  // LLEMBEDDEDBROWSER_H
+

trunk/llmozlib2/llembeddedbrowserwindow.cpp

@@ -1 @@
-
-
-
+
+
- *
-
+
+
+
+
- *
-
+
+
+
+
- *
-
-
-
-
-
-
-
+
- *
-
-
-
-
+
+
- *
-
-
-
+
+
- *
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-// undef'd at end of this
-#ifdef _DEBUG
@@ -38 +45 @@
-#endif
-
+// needed for the code in LLEmbeddedBrowserWindow::NotifyInvalidated() which will
+// one day be moved to platform agnostic code when I find out how...
+#ifdef WIN32
+#include "windows.h"
+#endif
+
+#include "llembeddedbrowser.h"
-#include "llembeddedbrowserwindow.h"
-
@@ -73 +87 @@
-#include "nsXULAppAPI.h"
-
+#include "llembeddedbrowserwindow.h"
+
+#include <iostream>
+
-#ifdef WIN32
-#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
@@ -80 +98 @@
-//
-LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow() :
+        mParent( 0 ),
-        mWebBrowser( nsnull ),
-        mBaseWindow( nsnull ),
@@ -87 +106 @@
-        mBrowserHeight( 0 ),
-        mBrowserDepth( 4 ),
-NULL
-PageBufferSize ( 0
+0
+Enabled( true
-        mCurrentUri( "" ),
-        mStatusText( "" ),
-        mClickHref( "" ),
-
-
-
+
+
+
+
+
-        mCaretRed( 0x0 ),
-        mCaretGreen( 0x0 ),
-        mCaretBlue( 0x0 ),
-
+
+
-{
-}
@@ -121 +143 @@
-        {
-                delete[] mPageBuffer;
-
-
+
-        };
-}
@@ -133 +154 @@
-        *aBrowser = nsnull;
-
-
+
+
-        if ( ! mWebBrowser )
+        {
-                return NS_ERROR_FAILURE;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    mBaseWindow->InitWindow( nativeWindowHandleIn, nsnull,  0, 0, mBrowserWidth, mBrowserHeight );
-    mBaseWindow->Create();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        nsresult result;
-        // set the listener to we can catch nsURIContentListener events
-        if ( mWebBrowser )
-        {
-                result = mWebBrowser->SetParentURIContentListener( NS_STATIC_CAST( nsIURIContentListener*, this ) );
-                if ( NS_FAILED( result ) )
-                {
-                };
-        };
-
-        mWebNav = do_QueryInterface( mWebBrowser, &result );
-        if ( NS_FAILED( result ) || ! mWebNav )
-        {
-
-
-
+
+
-
-        setSize( widthIn, heightIn );
-
-mWebBrowser
+ mWebBrowser 
-    {
-                *aBrowser = mWebBrowser;
-
+
+
-                return NS_OK;
-    };
@@ -195 +216 @@
-        NS_INTERFACE_MAP_ENTRY( nsIURIContentListener )
-        NS_INTERFACE_MAP_ENTRY( nsISupportsWeakReference )
+        NS_INTERFACE_MAP_ENTRY( nsIToolkitObserver )
-NS_INTERFACE_MAP_END
-
@@ -220 +242 @@
-        mStatusText = std::string( NS_ConvertUTF16toUTF8( aStatus ).get() );
-
-
+getCurrentUri(), 
-        mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onStatusTextChange, event );
-
@@ -317 +339 @@
-                mPercentComplete = 100;
-
-
+getCurrentUri(), 
-        mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onUpdateProgress, event );
-
@@ -330 +352 @@
-        if ( ( progressStateFlags & STATE_START ) && ( progressStateFlags & STATE_IS_DOCUMENT ) && ( status == NS_OK ) )
-        {
+                // TODO: move this to a better place.
+                enableToolkitObserver( false );
+                enableToolkitObserver( true );
+
-                // page load is starting so remove listener that catches "click" events
-                nsCOMPtr< nsIDOMWindow > window;
@@ -340 +366 @@
-                };
-
+                // set the listener to we can catch nsURIContentListener events
+                if ( mWebBrowser )
+                {
+                        mWebBrowser->SetParentURIContentListener( NS_STATIC_CAST( nsIURIContentListener*, this ) );
+                };
+
-                // emit event that navigation is beginning
-                mStatusText = std::string( "Browser loaded" );
-
+, getCurrentUri(), mStatusText
-                mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onNavigateBegin, event );
+
+                // about to move to a different page so have to stop grabbing a page
+                // but done one final grab in case the app doesn't ever call grabWindow again
+                grabWindow( 0, 0, mBrowserWidth, mBrowserHeight );
-        };
-
@@ -358 +394 @@
-                };
-
+                // pick up raw HTML response status code
+                PRUint32 responseStatus = 0;
+                if ( request )
+                {
+                        nsCOMPtr< nsIHttpChannel > httpChannel = do_QueryInterface( request );
+                        if ( httpChannel )
+                        {
+                                httpChannel->GetResponseStatus( &responseStatus );
+                        };
+                };
+
-                // emit event that navigation is finished
-                mStatusText = std::string( "Done" );
-
+, getCurrentUri(), mStatusText, (int)responseStatus
-                mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onNavigateComplete, event );
+
+                // also set the flag here since back/forward navigation doesn't call progress change
+                grabWindow( 0, 0, mBrowserWidth, mBrowserHeight );
-        };
-
@@ -379 +429 @@
-        };
-
-
+getCurrentUri(), 
-        mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onStatusTextChange, event );
-
@@ -389 +439 @@
-// TODO: ought to check that this change is on the top frame and
-// indicate this to the consumer of this class
-p
-       
-       
+webP
+
+
-{
-        if ( request )
@@ -422 +472 @@
-        mCurrentUri = newURI.get();
-
-mCurrentUri
+getCurrentUri()
-        mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onLocationChange, event );
-
-        return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// change the background color that gets used between pages (usually white)
+void LLEmbeddedBrowserWindow::setBackgroundColor( const PRUint8 redIn, const PRUint8 greenIn, const PRUint8 blueIn )
+{
+        mBkgRed = redIn;
+        mBkgGreen = greenIn;
+        mBkgBlue = blueIn;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// change the caret color (we have different backgrounds to edit fields - black caret on black background == bad)
+void LLEmbeddedBrowserWindow::setCaretColor( const PRUint8 redIn, const PRUint8 greenIn, const PRUint8 blueIn )
+{
+        mCaretRed = redIn;
+        mCaretGreen = greenIn;
+        mCaretBlue = blueIn;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLEmbeddedBrowserWindow::setEnabled( PRBool enabledIn )
+{
+        mEnabled = enabledIn;
-}
-
@@ -468 +543 @@
-{
-        return mClickHref;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// utility method that is used by observers to retrieve data after an event
+const std::string& LLEmbeddedBrowserWindow::getClickLinkTarget()
+{
+        return mClickTarget;
-}
-
@@ -479 +561 @@
-        mStatusText = std::string( NS_ConvertUTF16toUTF8( aMessage ).get() );
-
-
+getCurrentUri(), 
-        mEventEmitter.update( &LLEmbeddedBrowserWindowObserver::onStatusTextChange, event );
-
@@ -495 +577 @@
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        nsCOMPtr< nsIDocShell > docShell = do_GetInterface( mWebBrowser );
-        if ( ! docShell )
-                return PR_FALSE;
-
+        // get pres context
-        nsCOMPtr< nsPresContext > presContext;
-        nsresult result = docShell->GetPresContext( getter_AddRefs( presContext ) );
@@ -507 +601 @@
-                return PR_FALSE;
-
+        // get view manager
-        nsIViewManager* viewManager = presContext->GetViewManager();
-        if ( ! viewManager )
-                return PR_FALSE;
-
+        // get the view
-        nsIScrollableView* scrollableView = NULL;
-        viewManager->GetRootScrollableView( &scrollableView );
-
-        nsIView* view = NULL;
-        if ( scrollableView )
@@ -520 +615 @@
-                viewManager->GetRootView( view );
-
+        // get the rectangle we want to render in twips (this looks odd but takees care of scrolling too)
-        nsRect rect = view->GetBounds() - view->GetPosition() - view->GetPosition();
-        if ( rect.IsEmpty() )
@@ -525 +621 @@
-
-        float p2t = presContext->PixelsToTwips();
-
-
-
+
+
+
+
-        nsCOMPtr< nsIRenderingContext > context;
-ackgroundRed, mBackgroundGreen, mBackgroundBlue
+kgRed, mBkgGreen, mBkgBlue 
-        if ( NS_FAILED( result ) )
-                return 0;
-
+        // retrieve the surface we rendered to
-        nsIDrawingSurface* surface = nsnull;
-        context->GetDrawingSurface( &surface );
@@ -538 +636 @@
-                return 0;
-
-
-
-
-
+
-        PRUint8* data;
-        PRInt32 rowLen;
-
-        // sometime rowspan ! width in pixels * bytes per pixel so save row span value and use in application
-0, 0, width, height
+xIn, yIn, widthIn, heightIn
-        if ( NS_FAILED ( result ) )
-                return 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        surface->Unlock();
-        context->DestroyDrawingSurface( surface );
@@ -579 +675 @@
-
-        return mPageBuffer;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// all this just to render a caret!
+PRBool LLEmbeddedBrowserWindow::renderCaret()
+{
+        nsCOMPtr< nsIWebBrowserFocus > focus = do_QueryInterface( mWebBrowser );
+
+        nsCOMPtr< nsIDOMElement > focusedElement;
+        focus->GetFocusedElement( getter_AddRefs( focusedElement ) );
+        if ( ! focusedElement )
+                return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIContent> focusedContent = do_QueryInterface( focusedElement );
+
+        nsCOMPtr< nsIDOMWindow > domWindow;
+        mWebBrowser->GetContentDOMWindow( getter_AddRefs( domWindow ) );
+        if ( ! domWindow )
+                return NS_ERROR_FAILURE;
+
+        nsCOMPtr< nsIDOMDocument > domDocument;
+        domWindow->GetDocument( getter_AddRefs( domDocument ) );
+        if ( ! domDocument )
+                return NS_ERROR_FAILURE;
+
+        nsCOMPtr< nsIDocument> document = do_QueryInterface( domDocument );
+        if ( ! document )
+                return NS_ERROR_FAILURE;
+
+        nsIPresShell* presShell = document->GetShellAt( 0 );
+        if ( ! presShell )
+                return NS_ERROR_FAILURE;
+
+        nsCOMPtr< nsICaret > caret;
+        presShell->GetCaret( getter_AddRefs( caret ) );
+
+        nsIFrame* frame = nsnull;
+        presShell->GetPrimaryFrameFor( focusedContent, &frame );
+        if ( ! frame )
+                return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsISelectionController> selCtrl;
+        frame->GetSelectionController( presShell->GetPresContext(), getter_AddRefs( selCtrl ) );
+
+        nsCOMPtr<nsISelection> selection;
+        selCtrl->GetSelection( nsISelectionController::SELECTION_NORMAL, getter_AddRefs( selection ) );
+
+        PRBool collapsed;
+        nsRect coords;
+        nsIView* caretView;
+        caret->GetCaretCoordinates( nsICaret::eTopLevelWindowCoordinates, selection, &coords, &collapsed, &caretView );
+
+        float twips2Pixls = presShell->GetPresContext()->TwipsToPixels();
+
+        PRInt32 caretX = NSTwipsToIntPixels( coords.x, twips2Pixls );
+        PRInt32 caretY = NSTwipsToIntPixels( coords.y, twips2Pixls );
+        PRInt32 caretHeight = NSTwipsToIntPixels( coords.height, twips2Pixls );
+
+        if ( caretX > -1 && caretX < mBrowserWidth && caretY > -1 && caretY < mBrowserHeight )
+        {
+                if ( mPageBuffer )
+                {
+                        for( int y = 1; y < caretHeight - 1; ++y )
+                        {
+                                PRInt32 base_pos = caretY + y;
+                                if ( mFlipBitmap )
+                                        base_pos = mBrowserHeight - ( caretY + y );
+
+                                // sometimes the caret seems valid when it really isn't - cap it to size of screen
+                                if ( caretY + y + caretHeight < mBrowserHeight )
+                                {
+                                        mPageBuffer[ base_pos * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 0 ] = mCaretBlue;
+                                        mPageBuffer[ base_pos * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 1 ] = mCaretGreen;
+                                        mPageBuffer[ base_pos * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 2 ] = mCaretRed;
+                                };
+                        };
+                };
+        };
+
+        return NS_OK;
-}
-
@@ -637 +813 @@
-{
-        if ( ! mWebNav )
-
+
+
+
-
-        PRBool canGoBack = PR_FALSE;
@@ -693 +871 @@
-
-////////////////////////////////////////////////////////////////////////////////
-
+ set the size of the browser window
-PRBool LLEmbeddedBrowserWindow::setSize( PRInt16 widthIn, PRInt16 heightIn )
-{
-        if ( widthIn > 2048 )
-                widthIn = 2048;
-
-        if ( heightIn > 2048 )
-                heightIn = 2048;
-
-        if ( mBaseWindow )
-        {
@@ -708 +880 @@
-                {
-                        delete[] mPageBuffer;
-
-
+
-                };
-
-
+ (important: may change after grabWindow() is called);
-                mBrowserWidth = widthIn;
-                mBrowserHeight = heightIn;
+                mBrowserRowSpan = mBrowserWidth * mBrowserDepth;
-
-                // On the Mac, these calls do strange things to the main viewer window, and they don't seem necessary in any case.
-#i
+               #ifde
-                // this is the actual OS (on Win32) Window so it needs to be hidden
-                mBaseWindow->SetVisibility( PR_FALSE );
-
-off screen (and in a place that makes the combobox hack work
+WAY off screen (and in a place that makes the combobox hack work)
-                mBaseWindow->SetPosition( 8000, -6000 );
-
+               
-
-                // tell Mozilla about the new size
@@ -735 +907 @@
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -769 +926 @@
-
-////////////////////////////////////////////////////////////////////////////////
+// higher level mouse event
+void LLEmbeddedBrowserWindow::mouseDown( PRInt16 xPosIn, PRInt16 yPosIn )
+{
+        const PRUint32 clickCount = 1;
+        sendMozillaMouseEvent( NS_MOUSE_LEFT_BUTTON_DOWN, xPosIn, yPosIn, clickCount );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// higher level mouse event
+void LLEmbeddedBrowserWindow::mouseUp( PRInt16 xPosIn, PRInt16 yPosIn )
+{
+        const PRUint32 clickCount = 1;
+        sendMozillaMouseEvent( NS_MOUSE_LEFT_BUTTON_UP, xPosIn, yPosIn, clickCount );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// higher level mouse event
+void LLEmbeddedBrowserWindow::mouseMove( PRInt16 xPosIn, PRInt16 yPosIn )
+{
+        const PRUint32 clickCount = 1;  // ignored?
+        sendMozillaMouseEvent( NS_MOUSE_MOVE, xPosIn, yPosIn, clickCount );
+}
+
+////////////////////////////////////////////////////////////////////////////////
-// utility methods to set an error message so something else can look at it
-void LLEmbeddedBrowserWindow::scrollByLines( PRInt16 linesIn )
@@ -786 +967 @@
-////////////////////////////////////////////////////////////////////////////////
-// synthesizes a mouse event and sends into the embedded instance
-//
-// eventIn - NS_MOUSE_LEFT_BUTTON_DOWN, NS_MOUSE_LEFT_BUTTON_UP, etc.
-?
+
-// clickCountIn - use 1 for single click, 2 for double-click, etc.
-PRBool LLEmbeddedBrowserWindow::sendMozillaMouseEvent( PRInt16 eventIn, PRInt16 xPosIn, PRInt16 yPosIn, PRUint32 clickCountIn )
-{
+        if ( ! mEnabled )
+                return PR_FALSE;
+
+        if ( ! mWebBrowser )
+                return PR_FALSE;
+
-        nsCOMPtr< nsIDocShell > docShell = do_GetInterface( mWebBrowser );
-        if ( ! docShell )
@@ -855 +1041 @@
-PRBool LLEmbeddedBrowserWindow::sendMozillaKeyboardEvent( PRUint32 uni_char, PRUint32 ns_vk_code )
-{
-
+
+
+
+
+
-
-        nsCOMPtr< nsIDocShell > docShell = do_GetInterface( mWebBrowser );
@@ -896 +1086 @@
-
-        nsEventStatus status;
-
+nsresult 
-        if ( NS_FAILED( result ) )
-                return PR_FALSE;
-
-        return PR_TRUE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// all this just to render a caret!
-PRBool LLEmbeddedBrowserWindow::renderCaret()
-{
-        nsCOMPtr< nsIWebBrowserFocus > focus = do_QueryInterface( mWebBrowser );
-
-        nsCOMPtr< nsIDOMElement > focusedElement;
-        focus->GetFocusedElement( getter_AddRefs( focusedElement ) );
-        if ( ! focusedElement )
-                return NS_ERROR_FAILURE;
-
-        nsCOMPtr<nsIContent> focusedContent = do_QueryInterface( focusedElement );
-
-        nsCOMPtr< nsIDOMWindow > domWindow;
-        mWebBrowser->GetContentDOMWindow( getter_AddRefs( domWindow ) );
-        if ( ! domWindow )
-                return NS_ERROR_FAILURE;
-
-        nsCOMPtr< nsIDOMDocument > domDocument;
-        domWindow->GetDocument( getter_AddRefs( domDocument ) );
-        if ( ! domDocument )
-                return NS_ERROR_FAILURE;
-
-        nsCOMPtr< nsIDocument> document = do_QueryInterface( domDocument );
-        if ( ! document )
-                return NS_ERROR_FAILURE;
-
-        nsIPresShell* presShell = document->GetShellAt( 0 );
-        if ( ! presShell )
-                return NS_ERROR_FAILURE;
-
-        nsCOMPtr< nsICaret > caret;
-        presShell->GetCaret( getter_AddRefs( caret ) );
-
-        nsIFrame* frame = nsnull;
-        presShell->GetPrimaryFrameFor( focusedContent, &frame );
-        if ( ! frame )
-                return NS_ERROR_FAILURE;
-
-        nsCOMPtr<nsISelectionController> selCtrl;
-        frame->GetSelectionController( presShell->GetPresContext(), getter_AddRefs( selCtrl ) );
-
-        nsCOMPtr<nsISelection> selection;
-        selCtrl->GetSelection( nsISelectionController::SELECTION_NORMAL, getter_AddRefs( selection ) );
-
-        PRBool collapsed;
-        nsRect coords;
-        nsIView* caretView;
-        caret->GetCaretCoordinates( nsICaret::eTopLevelWindowCoordinates, selection, &coords, &collapsed, &caretView );
-
-        float twips2Pixls = presShell->GetPresContext()->TwipsToPixels();
-
-        PRInt32 caretX = NSTwipsToIntPixels( coords.x, twips2Pixls );
-        PRInt32 caretY = NSTwipsToIntPixels( coords.y, twips2Pixls );
-        PRInt32 caretHeight = NSTwipsToIntPixels( coords.height, twips2Pixls );
-
-        if ( caretX > -1 && caretX < mBrowserWidth && caretY > -1 && caretY < mBrowserHeight )
-        {
-                if ( mPageBuffer )
-                {
-                        for( int y = 1; y < caretHeight - 1; ++y )
-                        {
-                                // sometimes the caret seems valid when it really isn't - cap it to size of screen
-                                if ( caretY + y + caretHeight < mBrowserHeight )
-                                {
-                                        mPageBuffer[ ( caretY + y ) * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 0 ] = mCaretBlue;
-                                        mPageBuffer[ ( caretY + y ) * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 1 ] = mCaretGreen;
-                                        mPageBuffer[ ( caretY + y ) * getBrowserRowSpan() + ( caretX + 1 ) * mBrowserDepth + 2 ] = mCaretRed;
-                                };
-                        };
-                };
-        };
-
-        return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLEmbeddedBrowserWindow::setBackgroundColor( PRUint8 redIn, PRUint8 greenIn, PRUint8 blueIn )
-{
-        mBackgroundRed = redIn;
-        mBackgroundGreen = greenIn;
-        mBackgroundBlue = blueIn;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// change the caret color (we have different backgrounds to edit fields - black caret on black background == bad)
-void LLEmbeddedBrowserWindow::setCaretColor( const PRUint8 redIn, const PRUint8 greenIn, const PRUint8 blueIn )
-{
-        mCaretRed = redIn;
-        mCaretGreen = greenIn;
-        mCaretBlue = blueIn;
-}
-
@@ -1007 +1103 @@
-        if ( linkElement )
-        {
+                // look for an href link
-                nsString name;
-                linkElement->GetAttribute( NS_ConvertUTF8toUTF16( "href" ), name );
-                mClickHref = std::string( NS_ConvertUTF16toUTF8( name ).get() );
-
-
-
+
+
+
+
+
+
+
+
+
+
-        };
-
@@ -1026 +1131 @@
-        std::string rawUri = newURI.get();
-
-
-
-
-
+
+
+
+
+
-
-                // tell browser we're handling things and don't follow link
@@ -1041 +1147 @@
-
-        return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLEmbeddedBrowserWindow::setNoFollowScheme( std::string schemeIn )
+{
+        mNoFollowScheme = schemeIn;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+std::string LLEmbeddedBrowserWindow::getNoFollowScheme()
+{
+        return mNoFollowScheme;
-}
-
@@ -1107 +1227 @@
-void LLEmbeddedBrowserWindow::focusBrowser( PRBool focusBrowserIn )
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-

trunk/llmozlib2/llembeddedbrowserwindow.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifndef LLEMBEDDEDBROWSERWINDOW_H
@@ -48 +55 @@
-#include "nsWeakReference.h"
-#include "nsIWebBrowser.h"
+#include "nsIToolkit.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptGlobalObjectOwner.h"
+#include "nsIScriptContext.h"
+
+#ifdef WIN32
+#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
+#endif
-
-#include <string>
@@ -53 +68 @@
-#include <algorithm>
-
-
+2
-
-///////////////////////////////////////////////////////////////////////////////
-ot
+to
-// of the embedding class can observe
-template< class T >
@@ -124 +139 @@
-        public nsIURIContentListener,
-        public nsSupportsWeakReference,
-
+
+
-{
-        public:
@@ -136 +152 @@
-                NS_DECL_NSIURICONTENTLISTENER
-                NS_DECL_NSIDOMEVENTLISTENER
-
+
+
+
-                nsresult createBrowser( void* nativeWindowHandleIn, PRInt32 widthIn, PRInt32 heightIn, nsIWebBrowser** aBrowser );
+                void setParent( LLEmbeddedBrowser* parentIn ) { mParent = parentIn; };
-                PRBool setSize( PRInt16 widthIn, PRInt16 heightIn );
-                void focusBrowser( PRBool focusBrowserIn );
@@ -144 +163 @@
-                int getWindowId();
-
+                // random accessors
-                const PRInt16 getPercentComplete();
-                const std::string& getStatusMsg();
-                const std::string& getCurrentUri();
-                const std::string& getClickLinkHref();
-
-
+
+
+
+
+
-                unsigned char* getPageBuffer();
-                PRInt16 getBrowserWidth();
@@ -156 +179 @@
-                PRInt32 getBrowserRowSpan();
-
-
+
+
+
+
-                void setCaretColor( const PRUint8 redIn, const PRUint8 greenIn, const PRUint8 blueIn );
-
+                // can turn off updates to a page - e.g. when it's hidden by your windowing system
+                void setEnabled( PRBool enabledIn );
+
+                // navigation
-                void navigateStop();
-                PRBool navigateTo( const std::string uriIn );
@@ -166 +196 @@
-                void navigateForward();
-
+                // javascript access/control
+                std::string evaluateJavascript( std::string scriptIn );
+
+                // redirection when you hit a missing page
-                bool set404RedirectUrl( std::string redirect_url );
-                bool clr404RedirectUrl();
-
+                // mouse & keyboard events
-                void mouseDown( PRInt16 xPosIn, PRInt16 yPosIn );
-                void mouseUp( PRInt16 xPosIn, PRInt16 yPosIn );
@@ -176 +211 @@
-                void unicodeInput( PRUint32 uni_char );
-
+                // allow consumers of this class and to observe browser events
-                bool addObserver( LLEmbeddedBrowserWindowObserver* observerIn );
-                bool remObserver( LLEmbeddedBrowserWindowObserver* observerIn );
+
+                // accessor/mutator for scheme that browser doesn't follow - e.g. secondlife.com://
+                void setNoFollowScheme( std::string schemeIn );
+                std::string getNoFollowScheme();
-
-        private:
@@ -183 +223 @@
-                PRBool sendMozillaKeyboardEvent( PRUint32 keyIn, PRUint32 ns_vk_code );
-                PRBool renderCaret();
+                PRBool enableToolkitObserver( PRBool enableIn );
+
-                LLEmbeddedBrowserWindowEmitter< LLEmbeddedBrowserWindowObserver > mEventEmitter;
+
+                LLEmbeddedBrowser* mParent;
-                PRInt16 mPercentComplete;
-                std::string mStatusText;
-                std::string mCurrentUri;
-                std::string mClickHref;
-404RedirectUrl
-
+ClickTarget
+
-                nsCOMPtr< nsIWebBrowser > mWebBrowser;
-                nsCOMPtr< nsIBaseWindow > mBaseWindow;
-                nsCOMPtr< nsIWebNavigation > mWebNav;
-
-                int mWindowId;
-
-                PRUint8 mBackgroundRed;
-                PRUint8 mBackgroundGreen;
-                PRUint8 mBackgroundBlue;
-                PRUint8 mCaretRed;
-                PRUint8 mCaretGreen;
-                PRUint8 mCaretBlue;
-
-                unsigned char* mPageBuffer;
-
+
+
+
-                PRInt32 mBrowserRowSpan;
-                PRInt16 mBrowserWidth;
-                PRInt16 mBrowserHeight;
-                PRInt16 mBrowserDepth;
+                PRUint8 mBkgRed;
+                PRUint8 mBkgGreen;
+                PRUint8 mBkgBlue;
+                PRUint8 mCaretRed;
+                PRUint8 mCaretGreen;
+                PRUint8 mCaretBlue;
-};
-
-#ifdef WIN32
-#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
-#endif
-
-#endif // LLEMBEDEDDBROWSERWINDOW_H

trunk/llmozlib2/repackage_runtime_mac.sh

@@ -1 +1 @@
-#!/bin/bash
-
-
+2
-sandbox_location="$1"
-
+xcodebuild -project llmozlib2.xcodeproj -target llmozlib2 -configuration 'Release' build
-
-
-
+2
+2
-else
-
+2
-        exit 1
-fi
@@ -30 +31 @@
-(cd mozilla-universal-darwin && tar -zxf ../mozilla-universal-darwin-original.tgz)
-
-
+2
-
-
-
+2
+2
-
-echo "Removing unneeded pieces..."
@@ -48 +49 @@
-echo "Creating mozilla-universal-darwin.tgz..."
-
-
+2
-rm -f ./mozilla-universal-darwin.tgz
-tar -zcf ./mozilla-universal-darwin.tgz \
@@ -62 +63 @@
-
-echo "Copying stub library to $sandbox_location/libraries/universal-darwin/..."
-.dylib $sandbox_location/libraries/universal-darwin/lib_debug/libllmozlib
-.dylib $sandbox_location/libraries/universal-darwin/lib_release/libllmozlib
+2.dylib $sandbox_location/libraries/universal-darwin/lib_debug/libllmozlib2
+2.dylib $sandbox_location/libraries/universal-darwin/lib_release/libllmozlib2
-
-echo "done!"

trunk/llmozlib2/tests/dependencies/include/GL/glut.h

@@ -11 +11 @@
-
-/* GLUT 3.7 now tries to avoid including <windows.h>
- 
+
-   needs APIENTRY and WINGDIAPI defined properly. */
-# if 0
@@ -162 +162 @@
-/**
- GLUT API revision history:
-
+
- GLUT_API_VERSION is updated to reflect incompatible GLUT
- API changes (interface changes, semantic changes, deletions,
- or additions).
-
+
- GLUT_API_VERSION=1  First public release of GLUT.  11/29/94
-
@@ -187 +187 @@
-/**
- GLUT implementation revision history:
-
+
- GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT
- API revisions and implementation revisions (ie, bug fixes).
@@ -195 +195 @@
-
- GLUT_XLIB_IMPLEMENTATION=2  mjk's second public release of
- 
+
- interfaces.
-