Title: [131285] trunk/Source/WebKit2
- Revision
- 131285
- Author
- [email protected]
- Date
- 2012-10-14 18:52:10 -0700 (Sun, 14 Oct 2012)
Log Message
Stop all the crashing!
The WebProcessProxy is not the Connection::Client, the WebConnectionToWebProcess is.
* UIProcess/WebConnectionToWebProcess.h:
(WebKit::WebConnectionToWebProcess::webProcessProxy):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::fromConnection):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (131284 => 131285)
--- trunk/Source/WebKit2/ChangeLog 2012-10-15 01:21:54 UTC (rev 131284)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-15 01:52:10 UTC (rev 131285)
@@ -1,3 +1,14 @@
+2012-10-14 Sam Weinig <[email protected]>
+
+ Stop all the crashing!
+
+ The WebProcessProxy is not the Connection::Client, the WebConnectionToWebProcess is.
+
+ * UIProcess/WebConnectionToWebProcess.h:
+ (WebKit::WebConnectionToWebProcess::webProcessProxy):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::fromConnection):
+
2012-10-14 Anders Carlsson <[email protected]>
Re-land of "WebContext should be a MessageReceiver"
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h (131284 => 131285)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-15 01:21:54 UTC (rev 131284)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-15 01:52:10 UTC (rev 131285)
@@ -33,10 +33,11 @@
class WebProcessProxy;
-class WebConnectionToWebProcess : public WebConnection, CoreIPC::Connection::Client {
+class WebConnectionToWebProcess : public WebConnection, public CoreIPC::Connection::Client {
public:
static PassRefPtr<WebConnectionToWebProcess> create(WebProcessProxy*, CoreIPC::Connection::Identifier, WebCore::RunLoop*);
+ WebProcessProxy* webProcessProxy() const { return m_process; }
private:
WebConnectionToWebProcess(WebProcessProxy*, CoreIPC::Connection::Identifier, WebCore::RunLoop*);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (131284 => 131285)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-15 01:21:54 UTC (rev 131284)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-15 01:52:10 UTC (rev 131285)
@@ -108,8 +108,9 @@
WebProcessProxy* WebProcessProxy::fromConnection(CoreIPC::Connection* connection)
{
ASSERT(connection);
- WebProcessProxy* webProcessProxy = static_cast<WebProcessProxy*>(connection->client());
+ WebConnectionToWebProcess* webConnection = static_cast<WebConnectionToWebProcess*>(connection->client());
+ WebProcessProxy* webProcessProxy = webConnection->webProcessProxy();
ASSERT(webProcessProxy->connection() == connection);
return webProcessProxy;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
