[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 17:49:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 905bc7f42a6f05d6bc72a4d44459256b4c2f441b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 20:53:08 2010 +0000
Add plug-in process shim
https://bugs.webkit.org/show_bug.cgi?id=50261
Reviewed by Sam Weinig.
* Configurations/PluginProcessShim.xcconfig: Added.
* PluginProcess/mac/PluginProcessShim.cpp: Added.
(PluginProcessShimInitialize):
* PluginProcess/mac/PluginProcessShim.h: Added.
* WebKit2.xcodeproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72955 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8720724..698ac6e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-30 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Add plug-in process shim
+ https://bugs.webkit.org/show_bug.cgi?id=50261
+
+ * Configurations/PluginProcessShim.xcconfig: Added.
+ * PluginProcess/mac/PluginProcessShim.cpp: Added.
+ (PluginProcessShimInitialize):
+ * PluginProcess/mac/PluginProcessShim.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2010-11-30 Brian Weinstein <bweinstein at apple.com>
Fix the Windows build by copying WKFindOptions.h into WebKitOutputDir with the other headers.
diff --git a/WebKit2/Configurations/PluginProcessShim.xcconfig b/WebKit2/Configurations/PluginProcessShim.xcconfig
new file mode 100644
index 0000000..a607b72
--- /dev/null
+++ b/WebKit2/Configurations/PluginProcessShim.xcconfig
@@ -0,0 +1,28 @@
+// Copyright (C) 2010 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. ``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
+// 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.
+
+#include "Version.xcconfig"
+
+GCC_DYNAMIC_NO_PIC = NO;
+PRODUCT_NAME = PluginProcessShim;
+SKIP_INSTALL = YES;
diff --git a/WebKit2/PluginProcess/mac/PluginProcessShim.cpp b/WebKit2/PluginProcess/mac/PluginProcessShim.cpp
new file mode 100644
index 0000000..34b5b5f
--- /dev/null
+++ b/WebKit2/PluginProcess/mac/PluginProcessShim.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#include "PluginProcessShim.h"
+
+extern "C"
+void PluginProcessShimInitialize();
+
+__attribute__((visibility("default")))
+void PluginProcessShimInitialize()
+{
+}
+
diff --git a/WebKit2/PluginProcess/mac/PluginProcessShim.h b/WebKit2/PluginProcess/mac/PluginProcessShim.h
new file mode 100644
index 0000000..b06c787
--- /dev/null
+++ b/WebKit2/PluginProcess/mac/PluginProcessShim.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef PluginProcessShim_h
+#define PluginProcessShim_h
+
+
+
+#endif // PluginProcessShim_h
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index e9ea83d..b087c82 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -165,6 +165,9 @@
1AB7D72D1288CAAD00CFD08C /* WebDownloadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D72B1288CAAD00CFD08C /* WebDownloadClient.cpp */; };
1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D78B1288CD9A00CFD08C /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
1AB7D78E1288CD9A00CFD08C /* WKDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D78C1288CD9A00CFD08C /* WKDownload.cpp */; };
+ 1AC25FBC12A48EDA00BD2671 /* PluginProcessShim.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */; };
+ 1AC25FC212A48F6000BD2671 /* PluginProcessShim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.cpp */; };
+ 1AC25FDC12A4902700BD2671 /* PluginProcessShim.dylib in Copy Plug-in Process Shim */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
1AC41AC71263C88300054E94 /* BinarySemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC41AC51263C88300054E94 /* BinarySemaphore.h */; };
1AC41AC81263C88300054E94 /* BinarySemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC41AC61263C88300054E94 /* BinarySemaphore.cpp */; };
1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
@@ -559,6 +562,13 @@
remoteGlobalIDString = 1A50DB1D110A3BDC000D3FE5;
remoteInfo = WebProcess;
};
+ 1AC25FD712A48FD500BD2671 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
+ remoteInfo = PluginProcessShim;
+ };
37F7407812721F740093869B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -579,6 +589,17 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 1AC25FDD12A4904500BD2671 /* Copy Plug-in Process Shim */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = WebProcess.app/Contents/MacOS;
+ dstSubfolderSpec = 16;
+ files = (
+ 1AC25FDC12A4902700BD2671 /* PluginProcessShim.dylib in Copy Plug-in Process Shim */,
+ );
+ name = "Copy Plug-in Process Shim";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -729,6 +750,10 @@
1AB7D72B1288CAAD00CFD08C /* WebDownloadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDownloadClient.cpp; sourceTree = "<group>"; };
1AB7D78B1288CD9A00CFD08C /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = "<group>"; };
1AB7D78C1288CD9A00CFD08C /* WKDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDownload.cpp; sourceTree = "<group>"; };
+ 1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessShim.h; sourceTree = "<group>"; };
+ 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessShim.cpp; sourceTree = "<group>"; };
+ 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = PluginProcessShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = PluginProcessShim.xcconfig; sourceTree = "<group>"; };
1AC41AC51263C88300054E94 /* BinarySemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinarySemaphore.h; sourceTree = "<group>"; };
1AC41AC61263C88300054E94 /* BinarySemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinarySemaphore.cpp; sourceTree = "<group>"; };
1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = "<group>"; };
@@ -1130,6 +1155,13 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 1AC25FAE12A48EA700BD2671 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF560486A6940098B216 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -1154,6 +1186,7 @@
children = (
8DC2EF5B0486A6940098B216 /* WebKit2.framework */,
1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */,
+ 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
);
name = Products;
sourceTree = "<group>";
@@ -1253,6 +1286,8 @@
children = (
1A2D91A51281D739001EB962 /* PluginControllerProxyMac.mm */,
1A0EC802124BD41E007EF4A5 /* PluginProcessMainMac.mm */,
+ 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.cpp */,
+ 1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */,
);
path = mac;
sourceTree = "<group>";
@@ -1264,6 +1299,7 @@
5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
+ 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */,
@@ -2170,6 +2206,13 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
+ 1AC25FAC12A48EA700BD2671 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF500486A6940098B216 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -2443,10 +2486,12 @@
buildPhases = (
1A50DB1A110A3BDC000D3FE5 /* Resources */,
1A50DB1B110A3BDC000D3FE5 /* Sources */,
+ 1AC25FDD12A4904500BD2671 /* Copy Plug-in Process Shim */,
);
buildRules = (
);
dependencies = (
+ 1AC25FD812A48FD500BD2671 /* PBXTargetDependency */,
1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */,
);
name = WebProcess;
@@ -2454,6 +2499,23 @@
productReference = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */;
productType = "com.apple.product-type.application";
};
+ 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */;
+ buildPhases = (
+ 1AC25FAC12A48EA700BD2671 /* Headers */,
+ 1AC25FAD12A48EA700BD2671 /* Sources */,
+ 1AC25FAE12A48EA700BD2671 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = PluginProcessShim;
+ productName = PluginProcessShim;
+ productReference = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */;
+ productType = "com.apple.product-type.library.dynamic";
+ };
8DC2EF4F0486A6940098B216 /* WebKit2 */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */;
@@ -2498,6 +2560,7 @@
8DC2EF4F0486A6940098B216 /* WebKit2 */,
1A50DB1D110A3BDC000D3FE5 /* WebProcess */,
C0CE72851247E66800BC0EC4 /* Derived Sources */,
+ 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */,
);
};
/* End PBXProject section */
@@ -2516,6 +2579,7 @@
buildActionMask = 2147483647;
files = (
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+ 1AC25FBC12A48EDA00BD2671 /* PluginProcessShim.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2549,6 +2613,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 1AC25FAD12A48EA700BD2671 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1AC25FC212A48F6000BD2671 /* PluginProcessShim.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
8DC2EF540486A6940098B216 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2806,6 +2878,11 @@
target = 1A50DB1D110A3BDC000D3FE5 /* WebProcess */;
targetProxy = 1A50DB3B110A3C19000D3FE5 /* PBXContainerItemProxy */;
};
+ 1AC25FD812A48FD500BD2671 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
+ targetProxy = 1AC25FD712A48FD500BD2671 /* PBXContainerItemProxy */;
+ };
37F7407912721F740093869B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
@@ -2853,6 +2930,27 @@
};
name = Release;
};
+ 1AC25FB112A48EA700BD2671 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ 1AC25FB212A48EA700BD2671 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ 1AC25FB312A48EA700BD2671 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
@@ -2976,6 +3074,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 1AC25FB112A48EA700BD2671 /* Debug */,
+ 1AC25FB212A48EA700BD2671 /* Release */,
+ 1AC25FB312A48EA700BD2671 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
isa = XCConfigurationList;
buildConfigurations = (
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list