Modified: trunk/Source/WebKit2/ChangeLog (142643 => 142644)
--- trunk/Source/WebKit2/ChangeLog 2013-02-12 18:50:43 UTC (rev 142643)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-12 19:04:23 UTC (rev 142644)
@@ -1,3 +1,12 @@
+2013-02-12 Anders Carlsson <[email protected]>
+
+ Build fix.
+
+ Add back the files to the Xcode project that were removed in r142580.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+
2013-02-12 Jessie Berlin <[email protected]>
Build fix after r142540 and r142518
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (142643 => 142644)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-02-12 18:50:43 UTC (rev 142643)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-02-12 19:04:23 UTC (rev 142644)
@@ -169,6 +169,8 @@
1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */; };
1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */; };
1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */; };
+ 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */; };
+ 1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */; };
1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */; };
1A7C6CDB1378950800B9C04D /* EnvironmentVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */; };
1A8EF4CB1252403700F7067F /* PluginControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8EF4C91252403700F7067F /* PluginControllerProxy.h */; };
@@ -1450,6 +1452,9 @@
1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapeBrowserFuncs.cpp; sourceTree = "<group>"; };
1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapePlugin.h; sourceTree = "<group>"; };
1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePlugin.cpp; sourceTree = "<group>"; };
+ 1A7865B616CAC6FD00ACE83A /* PluginProcessConnectionManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = PluginProcessConnectionManager.messages.in; sourceTree = "<group>"; };
+ 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginProcessConnectionManagerMessageReceiver.cpp; path = PluginProcessConnectionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
+ 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginProcessConnectionManagerMessages.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
1A8EF4C91252403700F7067F /* PluginControllerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginControllerProxy.h; sourceTree = "<group>"; };
@@ -2833,6 +2838,7 @@
1A2BB6CC14117A5F000F35D4 /* PluginProcessConnection.messages.in */,
1A0EC90E124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp */,
1A0EC90D124C0AF5007EF4A5 /* PluginProcessConnectionManager.h */,
+ 1A7865B616CAC6FD00ACE83A /* PluginProcessConnectionManager.messages.in */,
1A043DC0124FF87500FFBFB5 /* PluginProxy.cpp */,
1A043DBF124FF87500FFBFB5 /* PluginProxy.h */,
1A8EFA5B1252B7CE00F7067F /* PluginProxy.messages.in */,
@@ -4628,6 +4634,8 @@
1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */,
1A8EF96C1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp */,
1A8EF96D1252AF6B00F7067F /* PluginControllerProxyMessages.h */,
+ 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */,
+ 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */,
1A2BB6CE14117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp */,
1A2BB6CF14117B4D000F35D4 /* PluginProcessConnectionMessages.h */,
1A0EC6BD124BBD9B007EF4A5 /* PluginProcessMessageReceiver.cpp */,
@@ -5242,6 +5250,7 @@
BCBAAD0B14560A430053F82F /* WKBrowsingContextLoadDelegate.h in Headers */,
BC204EEF11C83EC8008F3375 /* WKBundle.h in Headers */,
BC204EF011C83EC8008F3375 /* WKBundleAPICast.h in Headers */,
+ 1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */,
935EEB9F127761AC003322B8 /* WKBundleBackForwardList.h in Headers */,
935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */,
51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */,
@@ -6447,6 +6456,7 @@
1C8E293A12761E5B00BC7BD0 /* WKInspector.cpp in Sources */,
51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
33D3A3B51339600B00709BE4 /* WKMediaCacheManager.cpp in Sources */,
+ 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */,
BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
BC4075FF124FF0270068F20A /* WKMutableDictionary.cpp in Sources */,
BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (142643 => 142644)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2013-02-12 18:50:43 UTC (rev 142643)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2013-02-12 19:04:23 UTC (rev 142644)
@@ -114,10 +114,6 @@
{
}
-void PluginProcessConnectionManager::didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&)
-{
-}
-
void PluginProcessConnectionManager::pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath, uint32_t opaquePluginType)
{
MutexLocker locker(m_pathsAndConnectionsMutex);
