Title: [130984] trunk/Source/WebKit2
- Revision
- 130984
- Author
- ander...@apple.com
- Date
- 2012-10-10 17:30:20 -0700 (Wed, 10 Oct 2012)
Log Message
Stop crashing left and right.
* UIProcess/WebConnectionToWebProcess.h:
(WebKit::WebConnectionToWebProcess::webProcessProxy):
Add a getter.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::fromConnection):
The WebProcessProxy is not the Connection::Client, the WebConnectionToWebProcess is.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (130983 => 130984)
--- trunk/Source/WebKit2/ChangeLog 2012-10-11 00:26:39 UTC (rev 130983)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-11 00:30:20 UTC (rev 130984)
@@ -1,3 +1,15 @@
+2012-10-10 Anders Carlsson <ander...@apple.com>
+
+ Stop crashing left and right.
+
+ * UIProcess/WebConnectionToWebProcess.h:
+ (WebKit::WebConnectionToWebProcess::webProcessProxy):
+ Add a getter.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::fromConnection):
+ The WebProcessProxy is not the Connection::Client, the WebConnectionToWebProcess is.
+
2012-10-10 Sam Weinig <s...@webkit.org>
Fix the GCC Mac build. Why are we still building with GCC again?
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h (130983 => 130984)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-11 00:26:39 UTC (rev 130983)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-11 00:30:20 UTC (rev 130984)
@@ -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; }
CoreIPC::Connection* connection() { return m_connection.get(); }
void invalidate();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (130983 => 130984)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-11 00:26:39 UTC (rev 130983)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-11 00:30:20 UTC (rev 130984)
@@ -105,8 +105,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
