Changeset 70702 in webkit

Timestamp:

Oct 27, 2010 1:38:36 PM (14 years ago)

Author:

jberlin@webkit.org

Message:

Fix the WebKit2 API tests.
​https://bugs.webkit.org/show_bug.cgi?id=48461

Reviewed by Sam Weinig.

The API tests were failing because the tests expect to be able to send messages before the
WebProcess finishes launching.

Instead of dispatching the pending messages in processDidFinishLaunching, dispatch them in
ensureWebProcess but do not make messages pending if the process is launching.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::processDidFinishLaunching):
Move dispatching the pending messages back from here ...
(WebKit::WebContext::ensureWebProcess):
... to here.
(WebKit::WebContext::postMessageToInjectedBundle):
Check whether the process can send messages in order to determine if a message needs to be
sent later.

• UIProcess/WebProcessProxy.h:

(WebKit::WebProcessProxy::canSendMessage):
The WebProcessProxy can send a message if it is valid or if it is launching.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (3 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-27  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix the WebKit2 API tests.
+        https://bugs.webkit.org/show_bug.cgi?id=48461
+
+        The API tests were failing because the tests expect to be able to send messages before the
+        WebProcess finishes launching.
+
+        Instead of dispatching the pending messages in processDidFinishLaunching, dispatch them in
+        ensureWebProcess but do not make messages pending if the process is launching.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::processDidFinishLaunching):
+        Move dispatching the pending messages back from here ...
+        (WebKit::WebContext::ensureWebProcess):
+        ... to here.
+        (WebKit::WebContext::postMessageToInjectedBundle):
+        Check whether the process can send messages in order to determine if a message needs to be
+        sent later.
+
+        * UIProcess/WebProcessProxy.h:
+        (WebKit::WebProcessProxy::canSendMessage):
+        The WebProcessProxy can send a message if it is valid or if it is launching.
+
 2010-10-27  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -179 +179 @@
 
     m_process->send(Messages::WebProcess::InitializeWebProcess(parameters), 0);
-}
-
-void WebContext::processDidFinishLaunching(WebProcessProxy* process)
-{
-    // FIXME: Once we support multiple processes per context, this assertion won't hold.
-    ASSERT(process == m_process);
-
-    m_visitedLinkProvider.populateVisitedLinksIfNeeded();
 
     for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) {
@@ -195 +187 @@
 }
 
+void WebContext::processDidFinishLaunching(WebProcessProxy* process)
+{
+    // FIXME: Once we support multiple processes per context, this assertion won't hold.
+    ASSERT(process == m_process);
+
+    m_visitedLinkProvider.populateVisitedLinksIfNeeded();
+}
+
 void WebContext::processDidClose(WebProcessProxy* process)
 {
@@ -261 +261 @@
 void WebContext::postMessageToInjectedBundle(const String& messageName, APIObject* messageBody)
 {
-    if (!hasValidProcess()) {
+    if (!m_process || !m_process->canSendMessage()) {
         m_pendingMessagesToPostToInjectedBundle.append(make_pair(messageName, messageBody));
         return;

trunk/WebKit2/UIProcess/WebProcessProxy.h

@@ -91 +91 @@
     bool isValid() const { return m_connection; }
     bool isLaunching() const;
+    bool canSendMessage() const { return isValid() || isLaunching(); }
 
     WebFrameProxy* webFrame(uint64_t) const;