Title: [272103] branches/safari-611-branch/Source/WebKit
Revision
272103
Author
[email protected]
Date
2021-01-29 21:40:59 -0800 (Fri, 29 Jan 2021)

Log Message

Cherry-pick r271374. rdar://problem/73477142

    Web Inspector: add nullptr check for WebInspectorProxy::m_extensionsController
    https://bugs.webkit.org/show_bug.cgi?id=220485
    <rdar://72496401>

    Reviewed by Devin Rousso.

    * UIProcess/Inspector/WebInspectorProxy.cpp:
    (WebKit::WebInspectorProxy::frontendLoaded):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (272102 => 272103)


--- branches/safari-611-branch/Source/WebKit/ChangeLog	2021-01-30 05:40:56 UTC (rev 272102)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog	2021-01-30 05:40:59 UTC (rev 272103)
@@ -1,5 +1,32 @@
 2021-01-29  Alan Coon  <[email protected]>
 
+        Cherry-pick r271374. rdar://problem/73477142
+
+    Web Inspector: add nullptr check for WebInspectorProxy::m_extensionsController
+    https://bugs.webkit.org/show_bug.cgi?id=220485
+    <rdar://72496401>
+    
+    Reviewed by Devin Rousso.
+    
+    * UIProcess/Inspector/WebInspectorProxy.cpp:
+    (WebKit::WebInspectorProxy::frontendLoaded):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-01-11  BJ Burg  <[email protected]>
+
+            Web Inspector: add nullptr check for WebInspectorProxy::m_extensionsController
+            https://bugs.webkit.org/show_bug.cgi?id=220485
+            <rdar://72496401>
+
+            Reviewed by Devin Rousso.
+
+            * UIProcess/Inspector/WebInspectorProxy.cpp:
+            (WebKit::WebInspectorProxy::frontendLoaded):
+
+2021-01-29  Alan Coon  <[email protected]>
+
         Cherry-pick r271369. rdar://problem/73473654
 
     WebProcessPool::establishWorkerContextConnectionToNetworkProcess should make sure to remove the selected process from the cache

Modified: branches/safari-611-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (272102 => 272103)


--- branches/safari-611-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp	2021-01-30 05:40:56 UTC (rev 272102)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp	2021-01-30 05:40:59 UTC (rev 272103)
@@ -584,7 +584,8 @@
         automationSession->inspectorFrontendLoaded(*m_inspectedPage);
     
 #if ENABLE(INSPECTOR_EXTENSIONS)
-    m_extensionController->inspectorFrontendLoaded();
+    if (m_extensionController)
+        m_extensionController->inspectorFrontendLoaded();
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to