Changeset 2

Timestamp:

11/21/07 18:45:01 (2 years ago)

Author:

callum.linden

Message:

Added option to specify a URL to redirect to when navigateTo results in a 404 HTML status code.
Used for catching 404s from Amazon S3 site in the Web based search panel and displaying a more user-friendly page.
Reviewed by JC.

Files:

• trunk/llembeddedbrowserwindow.cpp (modified) (4 diffs)
• trunk/llembeddedbrowserwindow.h (modified) (3 diffs)
• trunk/llmozlib.cpp (modified) (1 diff)
• trunk/llmozlib.h (modified) (1 diff)
• trunk/tests/ubrowser.llmozlib/ubrowser.cpp (modified) (2 diffs)

trunk/llembeddedbrowserwindow.cpp

@@ -58 +58 @@
-#include "nsIDocument.h"
-#include "nsIFrame.h"
+#include "nsIHttpChannel.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIScrollableView.h"
@@ -93 +94 @@
-        mBackgroundRed( 0xff ),
-        mBackgroundGreen( 0xff ),
-
+
+
-{
-}
@@ -384 +386 @@
-// TODO: ought to check that this change is on the top frame and
-// indicate this to the consumer of this class
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        nsCAutoString newURI;
-aL
+l
-
-        mCurrentUri = newURI.get();
@@ -1078 +1104 @@
-}
-
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLEmbeddedBrowserWindow::set404RedirectUrl( std::string redirect_url )
+{
+        m404RedirectUrl = redirect_url;
+
+        return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLEmbeddedBrowserWindow::clr404RedirectUrl()
+{
+        m404RedirectUrl = std::string( "" );
+
+        return true;
+}
+
-// #define required by this file for LibXUL/Mozilla code to avoid crashes in their debug code
-#ifdef _DEBUG

trunk/llembeddedbrowserwindow.h

@@ -165 +165 @@
-                void navigateForward();
-
+                bool set404RedirectUrl( std::string redirect_url );
+                bool clr404RedirectUrl();
+
-                void mouseDown( PRInt16 xPosIn, PRInt16 yPosIn );
-                void mouseUp( PRInt16 xPosIn, PRInt16 yPosIn );
@@ -183 +186 @@
-                std::string mCurrentUri;
-                std::string mClickHref;
+                std::string m404RedirectUrl;
-
-                nsCOMPtr< nsIWebBrowser > mWebBrowser;
@@ -193 +197 @@
-                PRUint8 mBackgroundGreen;
-                PRUint8 mBackgroundBlue;
-
-
-                unsigned char* mPageBuffer;

trunk/llmozlib.cpp

@@ -514 +514 @@
-}
-
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLMozLib::set404RedirectUrl(  int browser_window_in, std::string redirect_url )
+{
+        LLEmbeddedBrowserWindow* browser_window = getBrowserWindowFromWindowId( browser_window_in );
+        if ( browser_window )
+        {
+                browser_window->set404RedirectUrl( redirect_url );
+
+                return true;
+        };
+
+        return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLMozLib::clr404RedirectUrl( int browser_window_in )
+{
+        LLEmbeddedBrowserWindow* browser_window = getBrowserWindowFromWindowId( browser_window_in );
+        if ( browser_window )
+        {
+                browser_window->clr404RedirectUrl();
+
+                return true;
+        };
+
+        return false;
+}

trunk/llmozlib.h

@@ -143 +143 @@
-                bool canNavigateForward( int browserWindowIdIn );
-                bool navigateForward( int browserWindowIdIn );
+
+                // set/clear URL to redirect to when a 404 page is reached
+                bool set404RedirectUrl( int browser_window_in, std::string redirect_url );
+                bool clr404RedirectUrl( int browser_window_in );
-
-                // access to rendered bitmap data

trunk/tests/ubrowser.llmozlib/ubrowser.cpp

@@ -112 +112 @@
-        mBookmarks.push_back( std::pair< std::string, std::string >( "DHTML Lemmings!", "http://www.elizium.nu/scripts/lemmings/" ) );
-        mBookmarks.push_back( std::pair< std::string, std::string >( "DHTML Demos", "http://www.dhteumeuleu.com/" ) );
+        mBookmarks.push_back( std::pair< std::string, std::string >( "S3 404 test", "http://world.secondlife.com/parcel/jumk" ) );
-        mBookmarks.push_back( std::pair< std::string, std::string >( "about:config", "about:config" ) );
-}
@@ -222 +223 @@
-
-        LLMozLib::getInstance()->setBrowserAgentId( "[uBrowser]" );
+
+        LLMozLib::getInstance()->set404RedirectUrl( mWindowA, "http://secondlife.com/app/search/notfound.html" );
-
-        std::cout << "LLMozLib version: " << LLMozLib::getInstance()->getVersion() << std::endl;