RequestContext now implements CefWrapper

ThrowIfDisposed(); called in each method now

Author: amaitland

CefSharp.Core/RequestContext.h

@@ -11,6 +11,7 @@
 #include "RequestContextHandler.h"
 #include "Internals\CefCompletionCallbackAdapter.h"
 #include "Internals\CookieManager.h"
+#include "Internals\CefWrapper.h"
 
 using namespace System::Runtime::InteropServices;
 
@@ -29,7 +30,7 @@ namespace CefSharp
     /// This will be the first request context passed into a CefBrowserHost static factory method
     /// and all other request context objects will be ignored. 
     /// </summary>
-    public ref class RequestContext : public IRequestContext
+    public ref class RequestContext : public IRequestContext, public CefWrapper
     {
     private:
         MCefRefPtr<CefRequestContext> _requestContext;
@@ -74,24 +75,32 @@ namespace CefSharp
             this->!RequestContext();
 
             delete _settings;
+
+            _disposed = true;
         }
 
         virtual bool IsSame(IRequestContext^ context)
         {
+            ThrowIfDisposed();
+
             auto requestContext = (RequestContext^)context;
 
             return _requestContext->IsSame(requestContext);
         }
 
         virtual bool IsSharingWith(IRequestContext^ context)
         {
+            ThrowIfDisposed();
+
             auto requestContext = (RequestContext^)context;
 
             return _requestContext->IsSharingWith(requestContext);
         }
 
         virtual ICookieManager^ GetDefaultCookieManager(ICompletionCallback^ callback)
         {
+            ThrowIfDisposed();
+
             CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
 
             auto cookieManager = _requestContext->GetDefaultCookieManager(wrapper);
@@ -104,17 +113,25 @@ namespace CefSharp
 
         virtual property bool IsGlobal
         {
-            bool get() { return _requestContext->IsGlobal(); }
+            bool get()
+            {
+                ThrowIfDisposed();
+                return _requestContext->IsGlobal();
+            }
         }
 
         virtual bool RegisterSchemeHandlerFactory(String^ schemeName, String^ domainName, ISchemeHandlerFactory^ factory)
         {
+            ThrowIfDisposed();
+
             auto wrapper = new SchemeHandlerFactoryWrapper(factory);
             return _requestContext->RegisterSchemeHandlerFactory(StringUtils::ToNative(schemeName), StringUtils::ToNative(domainName), wrapper);
         }
 
         virtual bool ClearSchemeHandlerFactories()
         {
+            ThrowIfDisposed();
+
             return _requestContext->ClearSchemeHandlerFactories();
         }
 
@@ -125,7 +142,12 @@ namespace CefSharp
         /*--cef()--*/
         virtual property String^ CachePath
         {
-            String^ get() { return StringUtils::ToClr(_requestContext->GetCachePath()); }
+            String^ get()
+            {
+                ThrowIfDisposed();
+
+                return StringUtils::ToClr(_requestContext->GetCachePath());
+            }
         }
 
         ///
@@ -137,6 +159,8 @@ namespace CefSharp
         /*--cef()--*/
         virtual void PurgePluginListCache(bool reloadPages)
         {
+            ThrowIfDisposed();
+
             _requestContext->PurgePluginListCache(reloadPages);
         }
 
@@ -147,6 +171,8 @@ namespace CefSharp
         /*--cef()--*/
         virtual bool HasPreference(String^ name)
         {
+            ThrowIfDisposed();
+
             return _requestContext->HasPreference(StringUtils::ToNative(name));
         }
 
@@ -160,6 +186,8 @@ namespace CefSharp
         /*--cef()--*/
         virtual Object^ GetPreference(String^ name)
         {
+            ThrowIfDisposed();
+
             return TypeConversion::FromNative(_requestContext->GetPreference(StringUtils::ToNative(name)));
         }
 
@@ -174,6 +202,8 @@ namespace CefSharp
         /*--cef()--*/
         virtual IDictionary<String^, Object^>^ GetAllPreferences(bool includeDefaults)
         {
+            ThrowIfDisposed();
+
             auto preferences = _requestContext->GetAllPreferences(includeDefaults);
 
             return TypeConversion::FromNative(preferences);
@@ -188,6 +218,8 @@ namespace CefSharp
         /*--cef()--*/
         virtual bool CanSetPreference(String^ name)
         {
+            ThrowIfDisposed();
+
             return _requestContext->CanSetPreference(StringUtils::ToNative(name));
         }
 
@@ -202,6 +234,8 @@ namespace CefSharp
         /*--cef(optional_param=value)--*/
         virtual bool SetPreference(String^ name, Object^ value, [Out] String^ %error)
         {
+            ThrowIfDisposed();
+
             CefString cefError;
 
             auto success = _requestContext->SetPreference(StringUtils::ToNative(name), TypeConversion::ToNative(value), cefError);
@@ -222,6 +256,8 @@ namespace CefSharp
         /*--cef(optional_param=callback)--*/
         virtual void ClearCertificateExceptions(ICompletionCallback^ callback)
         {
+            ThrowIfDisposed();
+
             CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
 
             _requestContext->ClearCertificateExceptions(wrapper);
@@ -236,6 +272,8 @@ namespace CefSharp
         /*--cef(optional_param=callback)--*/
         virtual void CloseAllConnections(ICompletionCallback^ callback)
         {
+            ThrowIfDisposed();
+
             CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
 
             _requestContext->CloseAllConnections(wrapper);