<!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>[213383] trunk/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/213383">213383</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 13:38:39 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move declaration of _WKSetCrashReportApplicationSpecificInformation to header file
https://bugs.webkit.org/show_bug.cgi?id=169043
Reviewed by Alex Christensen.
* WebKit2.xcodeproj/project.pbxproj: Added WebProcessCocoa.h
* WebProcess/cocoa/WebProcessCocoa.h: Added.
* WebProcess/cocoa/WebProcessCocoa.mm: Imported WebProcessCocoa.h
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoah">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213382 => 213383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-03 21:37:51 UTC (rev 213382)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-03 21:38:39 UTC (rev 213383)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-03 Aakash Jain <aakash_jain@apple.com>
+
+ Move declaration of _WKSetCrashReportApplicationSpecificInformation to header file
+ https://bugs.webkit.org/show_bug.cgi?id=169043
+
+ Reviewed by Alex Christensen.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added WebProcessCocoa.h
+ * WebProcess/cocoa/WebProcessCocoa.h: Added.
+ * WebProcess/cocoa/WebProcessCocoa.mm: Imported WebProcessCocoa.h
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm: Ditto.
+
</ins><span class="cx"> 2017-03-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Ensure WebKitWebView always have a user content manager
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (213382 => 213383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2017-03-03 21:37:51 UTC (rev 213382)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2017-03-03 21:38:39 UTC (rev 213383)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><ins>+#import "WebProcessCocoa.h"
</ins><span class="cx">
</span><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><span class="lines">@@ -30,9 +31,6 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx">
</span><del>-extern "C"
-void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString);
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static void XPCServiceEventHandler(xpc_connection_t peer)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (213382 => 213383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-03 21:37:51 UTC (rev 213382)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-03 21:38:39 UTC (rev 213383)
</span><span class="lines">@@ -1958,6 +1958,7 @@
</span><span class="cx"> E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */; };
</span><span class="cx"> E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */; };
</span><span class="cx"> E4E864931B16750700C82F40 /* VersionChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E8648E1B1673FB00C82F40 /* VersionChecks.h */; };
</span><ins>+ ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = ECA680D71E690DF800731D20 /* WebProcessCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A22F1001289FCD90085E74F /* WKBundlePageOverlay.cpp */; };
</span><span class="cx"> F036978815F4BF0500C3A80E /* WebColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F036978715F4BF0500C3A80E /* WebColorPicker.cpp */; };
</span><span class="lines">@@ -4229,6 +4230,7 @@
</span><span class="cx"> E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheBlobStorage.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E4E8648E1B1673FB00C82F40 /* VersionChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionChecks.h; sourceTree = "<group>"; };
</span><span class="cx"> E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VersionChecks.mm; sourceTree = "<group>"; };
</span><ins>+ ECA680D71E690DF800731D20 /* WebProcessCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebProcessCocoa.h; sourceTree = "<group>"; };
</ins><span class="cx"> F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F43370961E4D6A4400052B0E /* _WKTestingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKTestingDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6205,6 +6207,7 @@
</span><span class="cx"> 52D5A1B21C5749F200DE34A3 /* WebVideoFullscreenManager.h */,
</span><span class="cx"> 52D5A1B31C5749F200DE34A3 /* WebVideoFullscreenManager.messages.in */,
</span><span class="cx"> 52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */,
</span><ins>+ ECA680D71E690DF800731D20 /* WebProcessCocoa.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -8591,6 +8594,7 @@
</span><span class="cx"> 51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */,
</span><span class="cx"> BC4BEFE1120A1A4C00FBA0C7 /* WKBundleNodeHandle.h in Headers */,
</span><span class="cx"> BC57450C1263B155006F0F12 /* WKBundleNodeHandlePrivate.h in Headers */,
</span><ins>+ ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */,
</ins><span class="cx"> BC20528111C94284008F3375 /* WKBundlePage.h in Headers */,
</span><span class="cx"> 7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */,
</span><span class="cx"> 7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoah"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.h (0 => 213383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.h 2017-03-03 21:38:39 UTC (rev 213383)
</span><span class="lines">@@ -0,0 +1,32 @@
</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.
+ */
+
+#pragma once
+
+#include <WebKit/WKFoundation.h>
+
+namespace WebKit {
+WK_EXTERN void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (213382 => 213383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-03-03 21:37:51 UTC (rev 213382)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-03-03 21:38:39 UTC (rev 213383)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebProcess.h"
</span><ins>+#import "WebProcessCocoa.h"
</ins><span class="cx">
</span><span class="cx"> #import "CustomProtocolManager.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -448,8 +449,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This should live somewhere else, and it should have the implementation in line instead of calling out to WKSI.
</span><del>-WK_EXTERN void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString);
-
</del><span class="cx"> void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString)
</span><span class="cx"> {
</span><span class="cx"> return WKSetCrashReportApplicationSpecificInformation((__bridge CFStringRef)infoString);
</span></span></pre>
</div>
</div>
</body>
</html>