[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 22dd4a9d7dfa80ef86c5587067acad97652867a5
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 20:46:27 2010 +0000

    Post any pending messages to the Injected Bundle in WebContext::processDidFinishLaunching
    instead of in WebContext::ensureWebProcess.
    https://bugs.webkit.org/show_bug.cgi?id=48367
    
    Reviewed by Darin Adler.
    
    Send pending injected bundle messages after the process finished launching instead of of
    directly after creating it.
    
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::ensureWebProcess):
    Move the logic to dispatch pending injected bundle messages from here ...
    (WebKit::WebContext::processDidFinishLaunching):
    ... to here.
    Also use a reference instead of a pointer when sending the pending messages.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70568 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a5e8b4d..557374b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-26  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Post any pending messages to the Injected Bundle in WebContext::processDidFinishLaunching
+        instead of in WebContext::ensureWebProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=48367
+
+        Send pending injected bundle messages after the process finished launching instead of of
+        directly after creating it.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        Move the logic to dispatch pending injected bundle messages from here ...
+        (WebKit::WebContext::processDidFinishLaunching):
+        ... to here.
+        Also use a reference instead of a pointer when sending the pending messages.
+
 2010-10-26  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 0b87c21..86ca6f4 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -178,12 +178,6 @@ void WebContext::ensureWebProcess()
     platformInitializeWebProcess(parameters);
 
     m_process->send(Messages::WebProcess::InitializeWebProcess(parameters), 0);
-
-    for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) {
-        pair<String, RefPtr<APIObject> >* message = &m_pendingMessagesToPostToInjectedBundle[i];
-        m_process->send(InjectedBundleMessage::PostMessage, 0, CoreIPC::In(message->first, WebContextUserMessageEncoder(message->second.get())));
-    }
-    m_pendingMessagesToPostToInjectedBundle.clear();
 }
 
 void WebContext::processDidFinishLaunching(WebProcessProxy* process)
@@ -192,6 +186,12 @@ void WebContext::processDidFinishLaunching(WebProcessProxy* process)
     ASSERT(process == m_process);
 
     m_visitedLinkProvider.populateVisitedLinksIfNeeded();
+
+    for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) {
+        pair<String, RefPtr<APIObject> >& message = m_pendingMessagesToPostToInjectedBundle[i];
+        m_process->send(InjectedBundleMessage::PostMessage, 0, CoreIPC::In(message.first, WebContextUserMessageEncoder(message.second.get())));
+    }
+    m_pendingMessagesToPostToInjectedBundle.clear();
 }
 
 void WebContext::processDidClose(WebProcessProxy* process)

-- 
WebKit Debian packaging