Title: [210906] branches/safari-603-branch/Source/WebKit2
- Revision
- 210906
- Author
- matthew_han...@apple.com
- Date
- 2017-01-18 19:07:04 -0800 (Wed, 18 Jan 2017)
Log Message
Merge r210861. rdar://problem/30015304
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210905 => 210906)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-19 03:07:01 UTC (rev 210905)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-19 03:07:04 UTC (rev 210906)
@@ -1,5 +1,27 @@
2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210861. rdar://problem/30015304
+
+ 2017-01-18 Megan Gardner <megan_gard...@apple.com>
+
+ Ignore Connection Assertion if we are not using connection to send messages
+ https://bugs.webkit.org/show_bug.cgi?id=167022
+
+ Reviewed by Darin Adler.
+
+ Ask the process about a particular connection rather that getting it and making the
+ comparison ourselves.
+
+ * UIProcess/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::hasConnection):
+ Check to see the the ProcessProxy has this particular connection. This get around the assert
+ that we would run into when just requesting the connection directly.
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::setPasteboardPathnamesForType):
+ Use the new check instead of getting the raw connection.
+
+2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210753. rdar://problem/29883469
2017-01-13 Chris Dumez <cdu...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h (210905 => 210906)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-01-19 03:07:01 UTC (rev 210905)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-01-19 03:07:04 UTC (rev 210906)
@@ -51,6 +51,11 @@
ASSERT(m_connection);
return m_connection.get();
}
+
+ bool hasConnection(const IPC::Connection& connection) const
+ {
+ return m_connection == &connection;
+ }
void addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver&);
void addMessageReceiver(IPC::StringReference messageReceiverName, uint64_t destinationID, IPC::MessageReceiver&);
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (210905 => 210906)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-19 03:07:01 UTC (rev 210905)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-19 03:07:04 UTC (rev 210906)
@@ -102,7 +102,7 @@
void WebPasteboardProxy::setPasteboardPathnamesForType(IPC::Connection& connection, const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount)
{
for (auto* webProcessProxy : m_webProcessProxyList) {
- if (webProcessProxy->connection() != &connection)
+ if (!webProcessProxy->hasConnection(connection))
continue;
for (const auto& pathname : pathnames) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
