Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / osx / webview_webkit.mm

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 3c20abad5490c2a6dddaffa5df267b26463b5b09..f3efc4e2e542fce0d092ef3b06031d57fc3ff547 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -26,6 +26,8 @@
 
 #include "wx/osx/private.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/osx/private.h"
 #include "wx/cocoa/string.h"

+#include "wx/hashmap.h"
+#include "wx/filesys.h"

 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>


@@ -295,7 +297,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 #endif
 
 
 #endif
 

-@interface MyFrameLoadMonitor : NSObject
+@interface WebViewLoadDelegate : NSObject

 {
     wxWebViewWebKit* webKitWindow;
 }
 {
     wxWebViewWebKit* webKitWindow;
 }


@@ -304,7 +306,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 @end
 
 
 @end
 

-@interface MyPolicyDelegate : NSObject
+@interface WebViewPolicyDelegate : NSObject

 {
     wxWebViewWebKit* webKitWindow;
 }
 {
     wxWebViewWebKit* webKitWindow;
 }


@@ -313,6 +315,16 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 @end
 
 
 @end
 

+//We use a hash to map scheme names to wxWebHandlers
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebHandler>, wxStringToWebHandlerMap);
+
+static wxStringToWebHandlerMap g_stringHandlerMap;
+
+@interface WebViewCustomProtocol : NSURLProtocol
+{
+}
+@end
+

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------


@@ -326,51 +338,56 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 {
     m_busy = false;
 
 {
     m_busy = false;
 

+    DontCreatePeer();

     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON
     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON

-    m_peer = new wxMacControl(this);
+    wxMacControl* peer = new wxMacControl(this);

     WebInitForCarbon();
     WebInitForCarbon();

-    HIWebViewCreate( m_peer->GetControlRefAddr() );
+    HIWebViewCreate( peer->GetControlRefAddr() );

 
 

-    m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
+    m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )

-        HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+        HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;

 #endif
 #endif

-    InstallControlEventHandler(m_peer->GetControlRef(),
+    InstallControlEventHandler(peer->GetControlRef(),

                                GetwxWebViewWebKitEventHandlerUPP(),
                                GetEventTypeCount(eventList), eventList, this,
                               (EventHandlerRef *)&m_webKitCtrlEventHandler);
                                GetwxWebViewWebKitEventHandlerUPP(),
                                GetEventTypeCount(eventList), eventList, this,
                               (EventHandlerRef *)&m_webKitCtrlEventHandler);

+    SetPeer(peer);

 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r
                                      frameName:@"webkitFrame"
                                      groupName:@"webkitGroup"];
 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r
                                      frameName:@"webkitFrame"
                                      groupName:@"webkitGroup"];

-    m_peer = new wxWidgetCocoaImpl( this, m_webView );
+    SetPeer(new wxWidgetCocoaImpl( this, m_webView ));

 #endif
 
     MacPostControlCreate(pos, size);
 
 #if wxOSX_USE_CARBON
 #endif
 
     MacPostControlCreate(pos, size);
 
 #if wxOSX_USE_CARBON

-    HIViewSetVisible( m_peer->GetControlRef(), true );
+    HIViewSetVisible( GetPeer()->GetControlRef(), true );

 #endif
     [m_webView setHidden:false];
 
 
 
     // Register event listener interfaces
 #endif
     [m_webView setHidden:false];
 
 
 
     // Register event listener interfaces

-    MyFrameLoadMonitor* myFrameLoadMonitor =
-            [[MyFrameLoadMonitor alloc] initWithWxWindow: this];
+    WebViewLoadDelegate* loadDelegate =
+            [[WebViewLoadDelegate alloc] initWithWxWindow: this];

 
 

-    [m_webView setFrameLoadDelegate:myFrameLoadMonitor];
+    [m_webView setFrameLoadDelegate:loadDelegate];

 
     // this is used to veto page loads, etc.
 
     // this is used to veto page loads, etc.

-    MyPolicyDelegate* myPolicyDelegate =
-            [[MyPolicyDelegate alloc] initWithWxWindow: this];
+    WebViewPolicyDelegate* policyDelegate =
+            [[WebViewPolicyDelegate alloc] initWithWxWindow: this];

 
 

-    [m_webView setPolicyDelegate:myPolicyDelegate];
+    [m_webView setPolicyDelegate:policyDelegate];
+
+    //Register our own class for custom scheme handling
+    [NSURLProtocol registerClass:[WebViewCustomProtocol class]];

 
     LoadUrl(strURL);
     return true;
 
     LoadUrl(strURL);
     return true;


@@ -378,16 +395,16 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
 wxWebViewWebKit::~wxWebViewWebKit()
 {
 
 wxWebViewWebKit::~wxWebViewWebKit()
 {

-    MyFrameLoadMonitor* myFrameLoadMonitor = [m_webView frameLoadDelegate];
-    MyPolicyDelegate* myPolicyDelegate = [m_webView policyDelegate];
+    WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
+    WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];

     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];
 
     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];
 

-    if (myFrameLoadMonitor)
-        [myFrameLoadMonitor release];
+    if (loadDelegate)
+        [loadDelegate release];

 
 

-    if (myPolicyDelegate)
-        [myPolicyDelegate release];
+    if (policyDelegate)
+        [policyDelegate release];

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -415,10 +432,7 @@ void wxWebViewWebKit::GoBack()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    bool result = [(WebView*)m_webView goBack];
-
-    // TODO: return result (if it also exists in other backends...)
-    //return result;
+    [(WebView*)m_webView goBack];

 }
 
 void wxWebViewWebKit::GoForward()
 }
 
 void wxWebViewWebKit::GoForward()


@@ -426,10 +440,7 @@ void wxWebViewWebKit::GoForward()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    bool result = [(WebView*)m_webView goForward];
-
-    // TODO: return result (if it also exists in other backends...)
-    //return result;
+    [(WebView*)m_webView goForward];

 }
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
 }
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)


@@ -716,7 +727,7 @@ void wxWebViewWebKit::OnSize(wxSizeEvent &event)
 
 void wxWebViewWebKit::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
 
 void wxWebViewWebKit::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON

-    bool isHidden = !IsControlVisible( m_peer->GetControlRef());
+    bool isHidden = !IsControlVisible( GetPeer()->GetControlRef());

     if (!isHidden)
         [(WebView*)m_webView display];
 
     if (!isHidden)
         [(WebView*)m_webView display];
 


@@ -971,6 +982,11 @@ void wxWebViewWebKit::Redo()
     [[m_webView undoManager] redo];
 }
 
     [[m_webView undoManager] redo];
 }
 

+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+{
+    g_stringHandlerMap[handler->GetName()] = handler;
+}
+

 //------------------------------------------------------------
 // Listener interfaces
 //------------------------------------------------------------
 //------------------------------------------------------------
 // Listener interfaces
 //------------------------------------------------------------


@@ -980,7 +996,7 @@ void wxWebViewWebKit::Redo()
 // destroyed. Therefore, we must be careful to check both the existence
 // of the Carbon control and the event handler before firing events.
 
 // destroyed. Therefore, we must be careful to check both the existence
 // of the Carbon control and the event handler before firing events.
 

-@implementation MyFrameLoadMonitor
+@implementation WebViewLoadDelegate

 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {
 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {


@@ -1168,7 +1184,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 }
 @end
 
 }
 @end
 

-@implementation MyPolicyDelegate
+@implementation WebViewPolicyDelegate

 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {
 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {


@@ -1226,4 +1242,71 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 }
 @end
 
 }
 @end
 

+@implementation WebViewCustomProtocol
+
++ (BOOL)canInitWithRequest:(NSURLRequest *)request
+{
+    NSString *scheme = [[request URL] scheme];
+
+    wxStringToWebHandlerMap::const_iterator it;
+    for( it = g_stringHandlerMap.begin(); it != g_stringHandlerMap.end(); ++it )
+    {
+        if(it->first.IsSameAs(wxStringWithNSString(scheme)))
+        {
+            return YES;
+        }
+    }
+
+       return NO;
+}
+
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+    //We don't do any processing here as the wxWebHandler classes do it
+    return request;
+}
+
+- (void)startLoading
+{
+    NSURLRequest *request = [self request];
+       NSString* path = [[request URL] absoluteString];
+
+    wxString wxpath = wxStringWithNSString(path);
+    wxString scheme = wxStringWithNSString([[request URL] scheme]);
+    wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
+    size_t length = file->GetStream()->GetLength();
+
+
+    NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
+                                          MIMEType:wxNSStringWithWxString(file->GetMimeType())
+                                          expectedContentLength:length 
+                                          textEncodingName:nil];
+    
+    //Load the data, we malloc it so it is tidied up properly
+    void* buffer = malloc(length);
+    file->GetStream()->Read(buffer, length);
+    NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
+    
+    id<NSURLProtocolClient> client = [self client];
+
+    //We do not support caching anything yet
+       [client URLProtocol:self didReceiveResponse:response 
+            cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+
+    //Set the data
+       [client URLProtocol:self didLoadData:data];
+
+       //Notify that we have finished
+       [client URLProtocolDidFinishLoading:self];
+
+       [response release];
+}
+
+- (void)stopLoading
+{
+
+}
+
+@end
+

 #endif //wxUSE_WEBVIEW_WEBKIT
 #endif //wxUSE_WEBVIEW_WEBKIT