Diff
Modified: trunk/Source/WebKit2/ChangeLog (213382 => 213383)
--- 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)
@@ -1,3 +1,15 @@
+2017-03-03 Aakash Jain <[email protected]>
+
+ 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.
+
2017-03-03 Carlos Garcia Campos <[email protected]>
[GTK] Ensure WebKitWebView always have a user content manager
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (213382 => 213383)
--- 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)
@@ -24,6 +24,7 @@
*/
#import "config.h"
+#import "WebProcessCocoa.h"
#import <CoreFoundation/CoreFoundation.h>
#import <wtf/OSObjectPtr.h>
@@ -30,9 +31,6 @@
#import <wtf/RetainPtr.h>
#import <wtf/spi/darwin/XPCSPI.h>
-extern "C"
-void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString);
-
namespace WebKit {
static void XPCServiceEventHandler(xpc_connection_t peer)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (213382 => 213383)
--- 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)
@@ -1958,6 +1958,7 @@
E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */; };
E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */; };
E4E864931B16750700C82F40 /* VersionChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E8648E1B1673FB00C82F40 /* VersionChecks.h */; };
+ ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = ECA680D71E690DF800731D20 /* WebProcessCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A22F1001289FCD90085E74F /* WKBundlePageOverlay.cpp */; };
F036978815F4BF0500C3A80E /* WebColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F036978715F4BF0500C3A80E /* WebColorPicker.cpp */; };
@@ -4229,6 +4230,7 @@
E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheBlobStorage.cpp; sourceTree = "<group>"; };
E4E8648E1B1673FB00C82F40 /* VersionChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionChecks.h; sourceTree = "<group>"; };
E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VersionChecks.mm; sourceTree = "<group>"; };
+ ECA680D71E690DF800731D20 /* WebProcessCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebProcessCocoa.h; sourceTree = "<group>"; };
F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
F43370961E4D6A4400052B0E /* _WKTestingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKTestingDelegate.h; sourceTree = "<group>"; };
F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
@@ -6205,6 +6207,7 @@
52D5A1B21C5749F200DE34A3 /* WebVideoFullscreenManager.h */,
52D5A1B31C5749F200DE34A3 /* WebVideoFullscreenManager.messages.in */,
52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */,
+ ECA680D71E690DF800731D20 /* WebProcessCocoa.h */,
);
path = cocoa;
sourceTree = "<group>";
@@ -8591,6 +8594,7 @@
51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */,
BC4BEFE1120A1A4C00FBA0C7 /* WKBundleNodeHandle.h in Headers */,
BC57450C1263B155006F0F12 /* WKBundleNodeHandlePrivate.h in Headers */,
+ ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */,
BC20528111C94284008F3375 /* WKBundlePage.h in Headers */,
7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */,
7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */,
Added: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.h (0 => 213383)
--- 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)
@@ -0,0 +1,32 @@
+/*
+ * 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);
+}
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (213382 => 213383)
--- 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)
@@ -25,6 +25,7 @@
#import "config.h"
#import "WebProcess.h"
+#import "WebProcessCocoa.h"
#import "CustomProtocolManager.h"
#import "Logging.h"
@@ -448,8 +449,6 @@
}
// FIXME: This should live somewhere else, and it should have the implementation in line instead of calling out to WKSI.
-WK_EXTERN void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString);
-
void _WKSetCrashReportApplicationSpecificInformation(NSString *infoString)
{
return WKSetCrashReportApplicationSpecificInformation((__bridge CFStringRef)infoString);
