<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212058] branches/safari-603-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212058">212058</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 22:36:40 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211747">r211747</a>. rdar://problem/30183825</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2DatabaseProcessDatabaseProcesscpp">branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2DatabaseProcessDatabaseProcessh">branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcessNetworkProcesscpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcessNetworkProcessh">branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2PluginProcessPluginProcesscpp">branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2PluginProcessPluginProcessh">branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedChildProcesscpp">branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedChildProcessh">branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-603-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebProcessh">branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2SharedCocoaChildProcessCocoamm">branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/ChildProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211747. rdar://problem/30183825
+
+ 2017-02-06 Anders Carlsson <andersca@apple.com>
+
+ Crash child processes if they receive an invalid message
+ https://bugs.webkit.org/show_bug.cgi?id=167900
+
+ Reviewed by Dan Bernstein.
+
+ Previously, some processes would try to gracefully exit, others would just drop messages leading to weird bugs.
+ Instead, set app-specific crash information to the message that failed to be decoded, and then crash.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::didReceiveInvalidMessage): Deleted.
+ * DatabaseProcess/DatabaseProcess.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::didReceiveInvalidMessage): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::didReceiveInvalidMessage): Deleted.
+ * PluginProcess/PluginProcess.h:
+ * Shared/ChildProcess.h:
+ * Shared/Cocoa/ChildProcessCocoa.mm: Added.
+ (WebKit::ChildProcess::didReceiveInvalidMessage):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didReceiveInvalidMessage): Deleted.
+ * WebProcess/WebProcess.h:
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211736. rdar://problem/30229358
</span><span class="cx">
</span><span class="cx"> 2017-02-06 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -90,11 +90,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
-{
- stopRunLoop();
-}
-
</del><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> IDBServer::IDBServer& DatabaseProcess::idbServer()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didClose(IPC::Connection&) override;
</span><del>- void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</del><span class="cx"> void didReceiveDatabaseProcessMessage(IPC::Connection&, IPC::Decoder&);
</span><span class="cx">
</span><span class="cx"> // Message Handlers
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -170,11 +170,6 @@
</span><span class="cx"> stopRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
-{
- stopRunLoop();
-}
-
</del><span class="cx"> void NetworkProcess::didCreateDownload()
</span><span class="cx"> {
</span><span class="cx"> disableTermination();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.h (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
</span><span class="cx"> void didClose(IPC::Connection&) override;
</span><del>- void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</del><span class="cx">
</span><span class="cx"> // DownloadManager::Client
</span><span class="cx"> void didCreateDownload() override;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -121,10 +121,6 @@
</span><span class="cx"> stopRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
-{
-}
-
</del><span class="cx"> void PluginProcess::initializePluginProcess(PluginProcessCreationParameters&& parameters)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_pluginModule);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.h (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.h 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/PluginProcess.h 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didClose(IPC::Connection&) override;
</span><del>- void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</del><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceivePluginProcessMessage(IPC::Connection&, IPC::Decoder&);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.cpp (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.cpp 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.cpp 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -196,6 +196,11 @@
</span><span class="cx"> void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+void ChildProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
+{
+ CRASH();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedChildProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.h (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.h 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/Shared/ChildProcess.h 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -108,6 +108,9 @@
</span><span class="cx"> IPC::Connection* messageSenderConnection() override;
</span><span class="cx"> uint64_t messageSenderDestinationID() override;
</span><span class="cx">
</span><ins>+ // IPC::Connection::Client.
+ void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) final;
+
</ins><span class="cx"> void shutDown();
</span><span class="cx">
</span><span class="cx"> void terminationTimerFired();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedCocoaChildProcessCocoamm"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/ChildProcessCocoa.mm (0 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/ChildProcessCocoa.mm (rev 0)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/ChildProcessCocoa.mm 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ChildProcess.h"
+
+#import <WebKitSystemInterface.h>
+
+namespace WebKit {
+
+void ChildProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageName, IPC::StringReference messageReceiverName)
+{
+ WKSetCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Received invalid message: '%s::%s'", messageReceiverName.toString().data(), messageName.toString().data()]);
+ CRASH();
+}
+
+}
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx"> 1A6563E51B7A8C50009CF787 /* APIWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6563E31B7A8C50009CF787 /* APIWindowFeatures.h */; };
</span><span class="cx"> 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
</span><span class="cx"> 1A67CD2E1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */; };
</span><ins>+ 1A698F191E4910220064E881 /* ChildProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A698F171E4910220064E881 /* ChildProcessCocoa.mm */; };
</ins><span class="cx"> 1A6D86C11DF75265007745E8 /* MachMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6D86BF1DF75265007745E8 /* MachMessage.cpp */; };
</span><span class="cx"> 1A6D86C21DF75265007745E8 /* MachMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6D86C01DF75265007745E8 /* MachMessage.h */; };
</span><span class="cx"> 1A6FA21E1BD0435B00AAA650 /* WKFrameInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2344,6 +2345,7 @@
</span><span class="cx"> 1A6563E31B7A8C50009CF787 /* APIWindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWindowFeatures.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A67CD2D1CBC513F00BFE3EA /* WKOpenPanelParametersInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParametersInternal.h; sourceTree = "<group>"; };
</span><ins>+ 1A698F171E4910220064E881 /* ChildProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
</span><span class="cx"> 1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "PluginService.32-64-10.9-10.10.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist"; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> 1A6D86BF1DF75265007745E8 /* MachMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MachMessage.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5444,6 +5446,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1A1EF1971A1D5B420023200A /* APIDataCocoa.mm */,
</span><span class="cx"> 378E1A3B181ED6FF0031007A /* APIObject.mm */,
</span><ins>+ 1A698F171E4910220064E881 /* ChildProcessCocoa.mm */,
</ins><span class="cx"> 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */,
</span><span class="cx"> 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */,
</span><span class="cx"> C55F916C1C595E440029E92D /* DataDetectionResult.h */,
</span><span class="lines">@@ -9701,6 +9704,7 @@
</span><span class="cx"> BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
</span><span class="cx"> BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
</span><ins>+ 1A698F191E4910220064E881 /* ChildProcessCocoa.mm in Sources */,
</ins><span class="cx"> 2D5036751BCED19F00E20BB3 /* WebGestureEvent.cpp in Sources */,
</span><span class="cx"> 93A88B361BC6EAD500ABA5C2 /* WebHitTestResultData.cpp in Sources */,
</span><span class="cx"> 93A88B301BC6E99700ABA5C2 /* WebHitTestResultData.mm in Sources */,
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -687,12 +687,6 @@
</span><span class="cx"> stopRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
-{
- // We received an invalid message, but since this is from the UI process (which we trust),
- // we'll let it slide.
-}
-
</del><span class="cx"> WebFrame* WebProcess::webFrame(uint64_t frameID) const
</span><span class="cx"> {
</span><span class="cx"> return m_frameMap.get(frameID);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.h (212057 => 212058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.h 2017-02-10 06:36:35 UTC (rev 212057)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.h 2017-02-10 06:36:40 UTC (rev 212058)
</span><span class="lines">@@ -329,7 +329,6 @@
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
</span><span class="cx"> void didClose(IPC::Connection&) override;
</span><del>- void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</del><span class="cx">
</span><span class="cx"> // Implemented in generated WebProcessMessageReceiver.cpp
</span><span class="cx"> void didReceiveWebProcessMessage(IPC::Connection&, IPC::Decoder&);
</span></span></pre>
</div>
</div>
</body>
</html>