Core - Add IBrowser reference to TitleChangedEventArgs/ConsoleMessageEventArgs

Author: amaitland

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -284,21 +284,22 @@ namespace CefSharp
 
         bool ClientAdapter::OnAutoResize(CefRefPtr<CefBrowser> browser, const CefSize& new_size)
         {
-            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
-
             auto handler = _browserControl->DisplayHandler;
 
             if (handler == nullptr)
             {
                 return false;
             }
 
+            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
+
             return handler->OnAutoResize(_browserControl, browserWrapper, CefSharp::Structs::Size(new_size.width, new_size.height));
         }
 
         void ClientAdapter::OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title)
         {
-            auto args = gcnew TitleChangedEventArgs(StringUtils::ToClr(title));
+            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
+            auto args = gcnew TitleChangedEventArgs(browserWrapper, StringUtils::ToClr(title));
 
             if (browser->IsPopup() && !_browserControl->HasParent)
             {
@@ -384,7 +385,9 @@ namespace CefSharp
 
         bool ClientAdapter::OnConsoleMessage(CefRefPtr<CefBrowser> browser, cef_log_severity_t level, const CefString& message, const CefString& source, int line)
         {
-            auto args = gcnew ConsoleMessageEventArgs((LogSeverity)level, StringUtils::ToClr(message), StringUtils::ToClr(source), line);
+            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
+
+            auto args = gcnew ConsoleMessageEventArgs(browserWrapper, (LogSeverity)level, StringUtils::ToClr(message), StringUtils::ToClr(source), line);
 
             if (!browser->IsPopup() || _browserControl->HasParent)
             {

CefSharp/Event/ConsoleMessageEventArgs.cs

@@ -14,18 +14,25 @@ public class ConsoleMessageEventArgs : EventArgs
         /// <summary>
         /// Creates a new ConsoleMessageEventArgs event argument.
         /// </summary>
+        /// <param name="browser">browser</param>
         /// <param name="level">level</param>
         /// <param name="message">message</param>
         /// <param name="source">source</param>
         /// <param name="line">line number</param>
-        public ConsoleMessageEventArgs(LogSeverity level, string message, string source, int line)
+        public ConsoleMessageEventArgs(IBrowser browser, LogSeverity level, string message, string source, int line)
         {
+            Browser = browser;
             Level = level;
             Message = message;
             Source = source;
             Line = line;
         }
 
+        /// <summary>
+        /// Access to the underlying <see cref="IBrowser"/> object
+        /// </summary>
+        public IBrowser Browser { get; private set; }
+
         /// <summary>
         /// Log level
         /// </summary>

CefSharp/Event/TitleChangedEventArgs.cs

@@ -11,6 +11,11 @@ namespace CefSharp
     /// </summary>
     public class TitleChangedEventArgs : EventArgs
     {
+        /// <summary>
+        /// Access to the underlying <see cref="IBrowser"/> object
+        /// </summary>
+        public IBrowser Browser { get; private set; }
+
         /// <summary>
         /// The new title
         /// </summary>
@@ -19,9 +24,11 @@ public class TitleChangedEventArgs : EventArgs
         /// <summary>
         /// Creates a new TitleChanged event arg
         /// </summary>
+        /// <param name="browser">browser</param>
         /// <param name="title">the new title</param>
-        public TitleChangedEventArgs(string title)
+        public TitleChangedEventArgs(IBrowser browser, string title)
         {
+            Browser = browser;
             Title = title;
         }
     }