Changeset 201142 in webkit

Timestamp:

May 19, 2016, 1:40:29 AM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge r200959. rdar://problem/26298247

Location:

branches/safari-602.1.32-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKInspector.cpp (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.cpp (modified) (1 diff)
• UIProcess/WebInspectorProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r200959. rdar://problem/26298247
+
+    2016-05-16  Brian Burg  <bburg@apple.com>
+
+            Web Automation: Automation.inspectBrowsingContext should automatically start page profiling
+            https://bugs.webkit.org/show_bug.cgi?id=157739
+
+            Reviewed by Timothy Hatcher.
+
+            * UIProcess/API/C/WKInspector.cpp:
+            (WKInspectorTogglePageProfiling):
+            Implicitly show the Web Inspector in the C API command to preserve existing behavior.
+
+            * UIProcess/Automation/WebAutomationSession.cpp:
+            (WebKit::WebAutomationSession::inspectorFrontendLoaded):
+            If the frontend loaded, it was either because the user opened Web Inspector (and
+            turning on page profiling is harmless), or it was loaded but not shown by the
+            inspectBrowsingContext command. For the latter, we want to start page profiling
+            before processing any additional commands so subsequent execution is captured.
+
+            * UIProcess/WebInspectorProxy.cpp:
+            (WebKit::WebInspectorProxy::togglePageProfiling):
+            Send the start/stop profiling messages directly to the WebInspectorUI process instead of
+            bouncing through the inspected page's process, which does an implicit show() we don't want.
+
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::inspector): Make it const.
+            * UIProcess/WebPageProxy.h:
+
 2016-05-19  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/WKInspector.cpp

@@ -118 +118 @@
 void WKInspectorTogglePageProfiling(WKInspectorRef inspectorRef)
 {
+    toImpl(inspectorRef)->show();
     toImpl(inspectorRef)->togglePageProfiling();
 }

branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp

@@ -460 +460 @@
     if (auto callback = m_pendingInspectorCallbacksPerPage.take(page.pageID()))
         callback->sendSuccess(InspectorObject::create());
+
+    // Start collecting profile information immediately so the entire session is captured.
+    page.inspector()->togglePageProfiling();
 }
 

branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -297 +297 @@
 
     if (m_isProfilingPage)
-        m_inspectedPage->process().send(Messages::WebInspector::StopPageProfiling(), m_inspectedPage->pageID());
+        m_inspectorPage->process().send(Messages::WebInspectorUI::StopPageProfiling(), m_inspectorPage->pageID());
     else
-        m_inspectedPage->process().send(Messages::WebInspector::StartPageProfiling(), m_inspectedPage->pageID());
+        m_inspectorPage->process().send(Messages::WebInspectorUI::StartPageProfiling(), m_inspectorPage->pageID());
 
     // FIXME: have the WebProcess notify us on state changes.

branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4031 +4031 @@
 
 // Inspector
-WebInspectorProxy* WebPageProxy::inspector()
+WebInspectorProxy* WebPageProxy::inspector() const
 {
     if (isClosed() || !isValid())

branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -311 +311 @@
     void didExitFullscreen();
 
-    WebInspectorProxy* inspector();
+    WebInspectorProxy* inspector() const;
 
     bool isControlledByAutomation() const { return m_controlledByAutomation; }