Title: [136190] trunk/Source/WebKit2
Revision
136190
Author
[email protected]
Date
2012-11-29 17:25:07 -0800 (Thu, 29 Nov 2012)

Log Message

Initialize m_xpcConnection to null if the identifier doesn't have an XPC connection
https://bugs.webkit.org/show_bug.cgi?id=103689

Reviewed by Darin Adler.

* Platform/CoreIPC/mac/ConnectionMac.cpp:
(CoreIPC::Connection::platformInitialize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (136189 => 136190)


--- trunk/Source/WebKit2/ChangeLog	2012-11-30 01:15:15 UTC (rev 136189)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-30 01:25:07 UTC (rev 136190)
@@ -1,3 +1,13 @@
+2012-11-29  Anders Carlsson  <[email protected]>
+
+        Initialize m_xpcConnection to null if the identifier doesn't have an XPC connection
+        https://bugs.webkit.org/show_bug.cgi?id=103689
+
+        Reviewed by Darin Adler.
+
+        * Platform/CoreIPC/mac/ConnectionMac.cpp:
+        (CoreIPC::Connection::platformInitialize):
+
 2012-11-29  Christophe Dumez  <[email protected]>
 
         [CoordinatedGraphics] Use OwnPtr for LayerMap's layers in LayerTreeRenderer

Modified: trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp (136189 => 136190)


--- trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp	2012-11-30 01:15:15 UTC (rev 136189)
+++ trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp	2012-11-30 01:25:07 UTC (rev 136190)
@@ -92,10 +92,11 @@
     }
 
 #if HAVE(XPC)
+    m_xpcConnection = identifier.xpcConnection;
     // FIXME: Instead of explicitly retaining the connection here, Identifier::xpcConnection
     // should just be a smart pointer.
-    if (identifier.xpcConnection)
-        m_xpcConnection = static_cast<xpc_connection_t>(xpc_retain(identifier.xpcConnection));
+    if (m_xpcConnection)
+        xpc_retain(m_xpcConnection);
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to