Changeset 62190 in webkit

Timestamp:

Jun 30, 2010, 10:00:31 AM (14 years ago)

Author:

andersca@apple.com

Message:

Add reviewer.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.h (modified) (2 diffs)
• UIProcess/ChunkedUpdateDrawingAreaProxy.cpp (modified) (3 diffs)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (18 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.h (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-06-30  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add WebProcessProxy::send
+        https://bugs.webkit.org/show_bug.cgi?id=41416
+
+        * Platform/CoreIPC/Connection.h:
+        * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::setSize):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::setPageIsVisible):
+        (WebKit::ChunkedUpdateDrawingAreaProxy::update):
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::postMessageToInjectedBundle):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::reinitializeWebPage):
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::tryClose):
+        (WebKit::WebPageProxy::loadURL):
+        (WebKit::WebPageProxy::stopLoading):
+        (WebKit::WebPageProxy::reload):
+        (WebKit::WebPageProxy::goForward):
+        (WebKit::WebPageProxy::goBack):
+        (WebKit::WebPageProxy::setFocused):
+        (WebKit::WebPageProxy::setActive):
+        (WebKit::WebPageProxy::mouseEvent):
+        (WebKit::WebPageProxy::wheelEvent):
+        (WebKit::WebPageProxy::keyEvent):
+        (WebKit::WebPageProxy::receivedPolicyDecision):
+        (WebKit::WebPageProxy::runJavaScriptInMainFrame):
+        (WebKit::WebPageProxy::getRenderTreeExternalRepresentation):
+        (WebKit::WebPageProxy::preferencesDidChange):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::WebProcessProxy):
+        (WebKit::WebProcessProxy::sendMessage):
+        * UIProcess/WebProcessProxy.h:
+        (WebKit::WebProcessProxy::connection):
+        (WebKit::WebProcessProxy::send):
+
 2010-06-29  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Platform/CoreIPC/Connection.h

@@ -80 +80 @@
     template<typename E> std::auto_ptr<ArgumentDecoder> waitFor(E messageID, uint64_t destinationID, double timeout);
 
+    bool sendMessage(MessageID, std::auto_ptr<ArgumentEncoder>);
+
 private:
     Connection(Identifier, bool isServer, Client*, RunLoop* clientRunLoop);
@@ -87 +89 @@
     bool isValid() const { return m_client; }
     
-    bool sendMessage(MessageID, std::auto_ptr<ArgumentEncoder>);
     std::auto_ptr<ArgumentDecoder> sendSyncMessage(MessageID, uint64_t syncRequestID, std::auto_ptr<ArgumentEncoder>, double timeout);
     std::auto_ptr<ArgumentDecoder> waitForMessage(MessageID, uint64_t destinationID, double timeout);

trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp

@@ -82 +82 @@
 
     page->process()->responsivenessTimer()->start();
-    page->process()->connection()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(viewSize));
+    page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(viewSize));
 }
 
@@ -98 +98 @@
     if (!m_isVisible) {
         // Tell the web process that it doesn't need to paint anything for now.
-        page->process()->connection()->send(DrawingAreaMessage::SuspendPainting, page->pageID(), CoreIPC::In());
+        page->process()->send(DrawingAreaMessage::SuspendPainting, page->pageID(), CoreIPC::In());
         return;
     }
     
     // The page is now visible.
-    page->process()->connection()->send(DrawingAreaMessage::ResumePainting, page->pageID(), CoreIPC::In());
+    page->process()->send(DrawingAreaMessage::ResumePainting, page->pageID(), CoreIPC::In());
     
     // FIXME: We should request a full repaint here if needed.
@@ -130 +130 @@
 
     WebPageProxy* page = this->page();
-    page->process()->connection()->send(DrawingAreaMessage::DidUpdate, page->pageID(), CoreIPC::In());
+    page->process()->send(DrawingAreaMessage::DidUpdate, page->pageID(), CoreIPC::In());
 }
 

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -160 +160 @@
         return;
 
-    m_process->connection()->send(WebProcessMessage::PostMessage, 0, CoreIPC::In(String(message)));
+    m_process->send(WebProcessMessage::PostMessage, 0, CoreIPC::In(String(message)));
 }
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -140 +140 @@
 
     m_drawingArea = drawingArea;
-    process()->connection()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
 }
 
@@ -149 +149 @@
 
     ASSERT(m_drawingArea);
-    process()->connection()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), *(m_drawingArea.get())));
 }
 
@@ -192 +192 @@
     m_drawingArea.clear();
 
-    process()->connection()->send(WebPageMessage::Close, m_pageID, CoreIPC::In());
+    process()->send(WebPageMessage::Close, m_pageID, CoreIPC::In());
     process()->removeWebPage(m_pageID);
 }
@@ -201 +201 @@
         return true;
 
-    process()->connection()->send(WebPageMessage::TryClose, m_pageID, CoreIPC::In());
+    process()->send(WebPageMessage::TryClose, m_pageID, CoreIPC::In());
     return false;
 }
@@ -211 +211 @@
         revive();
     }
-    process()->connection()->send(WebPageMessage::LoadURL, m_pageID, CoreIPC::In(url));
+    process()->send(WebPageMessage::LoadURL, m_pageID, CoreIPC::In(url));
 }
 
@@ -218 +218 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::StopLoading, m_pageID, CoreIPC::In());
+    process()->send(WebPageMessage::StopLoading, m_pageID, CoreIPC::In());
 }
 
@@ -225 +225 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::Reload, m_pageID, CoreIPC::In(reloadFromOrigin));
+    process()->send(WebPageMessage::Reload, m_pageID, CoreIPC::In(reloadFromOrigin));
 }
 
@@ -232 +232 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::GoForward, m_pageID, CoreIPC::In());
+    process()->send(WebPageMessage::GoForward, m_pageID, CoreIPC::In());
 }
 
@@ -239 +239 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::GoBack, m_pageID, CoreIPC::In());
+    process()->send(WebPageMessage::GoBack, m_pageID, CoreIPC::In());
 }
 
@@ -246 +246 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::SetFocused, m_pageID, CoreIPC::In(isFocused));
+    process()->send(WebPageMessage::SetFocused, m_pageID, CoreIPC::In(isFocused));
 }
 
@@ -253 +253 @@
     if (!isValid())
         return;
-    process()->connection()->send(WebPageMessage::SetActive, m_pageID, CoreIPC::In(active));
+    process()->send(WebPageMessage::SetActive, m_pageID, CoreIPC::In(active));
 }
 
@@ -264 +264 @@
     if (event.type() != WebEvent::MouseMove)
         process()->responsivenessTimer()->start();
-    process()->connection()->send(WebPageMessage::MouseEvent, m_pageID, CoreIPC::In(event));
+    process()->send(WebPageMessage::MouseEvent, m_pageID, CoreIPC::In(event));
 }
 
@@ -273 +273 @@
 
     process()->responsivenessTimer()->start();
-    process()->connection()->send(WebPageMessage::WheelEvent, m_pageID, CoreIPC::In(event));
+    process()->send(WebPageMessage::WheelEvent, m_pageID, CoreIPC::In(event));
 }
 
@@ -282 +282 @@
 
     process()->responsivenessTimer()->start();
-    process()->connection()->send(WebPageMessage::KeyEvent, m_pageID, CoreIPC::In(event));
+    process()->send(WebPageMessage::KeyEvent, m_pageID, CoreIPC::In(event));
 }
 
@@ -290 +290 @@
         return;
 
-    process()->connection()->send(WebPageMessage::DidReceivePolicyDecision, m_pageID, CoreIPC::In(frame->frameID(), listenerID, (uint32_t)action));
+    process()->send(WebPageMessage::DidReceivePolicyDecision, m_pageID, CoreIPC::In(frame->frameID(), listenerID, (uint32_t)action));
 }
 
@@ -306 +306 @@
     uint64_t callbackID = callback->callbackID();
     m_scriptReturnValueCallbacks.set(callbackID, callback.get());
-    process()->connection()->send(WebPageMessage::RunJavaScriptInMainFrame, m_pageID, CoreIPC::In(script, callbackID));
+    process()->send(WebPageMessage::RunJavaScriptInMainFrame, m_pageID, CoreIPC::In(script, callbackID));
 }
 
@@ -314 +314 @@
     uint64_t callbackID = callback->callbackID();
     m_renderTreeExternalRepresentationCallbacks.set(callbackID, callback.get());
-    process()->connection()->send(WebPageMessage::GetRenderTreeExternalRepresentation, m_pageID, callbackID);
+    process()->send(WebPageMessage::GetRenderTreeExternalRepresentation, m_pageID, callbackID);
 }
 
@@ -323 +323 @@
 
     // FIXME: It probably makes more sense to send individual preference changes.
-    process()->connection()->send(WebPageMessage::PreferencesDidChange, m_pageID, CoreIPC::In(pageNamespace()->context()->preferences()->store()));
+    process()->send(WebPageMessage::PreferencesDidChange, m_pageID, CoreIPC::In(pageNamespace()->context()->preferences()->store()));
 }
 

trunk/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -60 +60 @@
     // Would that be better than sending a connection?
     if (!context->injectedBundlePath().isEmpty())
-        connection()->send(WebProcessMessage::LoadInjectedBundle, 0, CoreIPC::In(context->injectedBundlePath()));
+        send(WebProcessMessage::LoadInjectedBundle, 0, CoreIPC::In(context->injectedBundlePath()));
 }
 
@@ -79 +79 @@
     m_connection = info.connection;
     m_platformProcessIdentifier = info.processIdentifier;
+}
+
+bool WebProcessProxy::sendMessage(CoreIPC::MessageID messageID, std::auto_ptr<CoreIPC::ArgumentEncoder> arguments)
+{
+    return m_connection->sendMessage(messageID, arguments);
 }
 

trunk/WebKit2/UIProcess/WebProcessProxy.h

@@ -55 +55 @@
     void terminate();
 
-    CoreIPC::Connection* connection() const { return m_connection.get(); }
+    template<typename E, typename T> bool send(E messageID, uint64_t destinationID, const T& arguments);
+    
+    CoreIPC::Connection* connection() const
+    { 
+        ASSERT(m_connection);
+        
+        return m_connection.get(); 
+    }
 
     WebPageProxy* webPage(uint64_t pageID) const;
@@ -76 +83 @@
 
     void connect();
+    bool sendMessage(CoreIPC::MessageID, std::auto_ptr<CoreIPC::ArgumentEncoder>);
 
     void forwardMessageToWebContext(const WebCore::String&);
@@ -99 +107 @@
 };
 
+template<typename E, typename T>
+bool WebProcessProxy::send(E messageID, uint64_t destinationID, const T& arguments)
+{
+    std::auto_ptr<CoreIPC::ArgumentEncoder> argumentEncoder(new CoreIPC::ArgumentEncoder(destinationID));
+    argumentEncoder->encode(arguments);
+
+    return sendMessage(CoreIPC::MessageID(messageID), argumentEncoder);
+}
+
 } // namespace WebKit