Changeset 156277 in webkit
- Timestamp:
- Sep 23, 2013 10:39:52 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 11 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r156265 r156277 1 2013-09-23 Sam Weinig <sam@webkit.org> 2 3 SharedWorkerProcess code is dead 4 https://bugs.webkit.org/show_bug.cgi?id=121563 5 6 Reviewed by Alexey Proskuryakov. 7 8 Remove SharedWorkerProcess code. 9 1 10 2013-09-23 Patrick Gansterer <paroga@webkit.org> 2 11 -
trunk/Source/WebKit2/DerivedSources.make
r154251 r156277 32 32 $(WebKit2)/Shared/Authentication \ 33 33 $(WebKit2)/Shared/Network/CustomProtocols \ 34 $(WebKit2)/SharedWorkerProcess \35 34 $(WebKit2)/WebProcess/ApplicationCache \ 36 35 $(WebKit2)/WebProcess/Cookies \ … … 53 52 $(WebKit2)/UIProcess/Notifications \ 54 53 $(WebKit2)/UIProcess/Plugins \ 55 $(WebKit2)/UIProcess/SharedWorkers \56 54 $(WebKit2)/UIProcess/Storage \ 57 55 $(WebKit2)/UIProcess/mac \ … … 77 75 PluginProcessProxy \ 78 76 PluginProxy \ 79 SharedWorkerProcess \80 SharedWorkerProcessProxy \81 77 StorageManager \ 82 78 WebApplicationCacheManager \ -
trunk/Source/WebKit2/Scripts/webkit2/messages.py
r155888 r156277 194 194 'WebKit::PrintInfo', 195 195 'WebKit::SecurityOriginData', 196 'WebKit::SharedWorkerProcessCreationParameters',197 196 'WebKit::StatisticsData', 198 197 'WebKit::TextCheckerState', -
trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
r156069 r156277 91 91 return "networkprocess"; 92 92 #endif 93 #if ENABLE(SHARED_WORKER_PROCESS)94 case SharedWorkerProcess:95 return "sharedworkerprocess";96 #endif97 93 } 98 94 … … 122 118 #endif 123 119 124 #if ENABLE(SHARED_WORKER_PROCESS)125 if (!strcmp(string, "sharedworkerprocess")) {126 processType = SharedWorkerProcess;127 return true;128 }129 #endif130 131 120 return false; 132 121 } -
trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
r156069 r156277 54 54 NetworkProcess, 55 55 #endif 56 #if ENABLE(SHARED_WORKER_PROCESS)57 SharedWorkerProcess58 #endif59 56 }; 60 57 -
trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
r156069 r156277 171 171 return 0; 172 172 #endif 173 #if ENABLE(SHARED_WORKER_PROCESS)174 case ProcessLauncher::SharedWorkerProcess:175 ASSERT_NOT_REACHED();176 return 0;177 #endif178 173 } 179 174 } … … 399 394 case ProcessLauncher::NetworkProcess: 400 395 processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"]; 401 break;402 #endif403 #if ENABLE(SHARED_WORKER_PROCESS)404 case ProcessLauncher::SharedWorkerProcess:405 processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"SharedWorkerProcess.app"];406 396 break; 407 397 #endif -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
r156069 r156277 330 330 #endif 331 331 332 #if ENABLE(SHARED_WORKER_PROCESS)333 void WebProcessProxy::getSharedWorkerProcessConnection(const String& /* url */, const String& /* name */, PassRefPtr<Messages::WebProcessProxy::GetSharedWorkerProcessConnection::DelayedReply>)334 {335 // FIXME: Implement336 }337 #endif // ENABLE(SHARED_WORKER_PROCESS)338 339 332 #if ENABLE(NETWORK_PROCESS) 340 333 void WebProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply) -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
r156069 r156277 153 153 void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>); 154 154 #endif 155 #if ENABLE(SHARED_WORKER_PROCESS)156 void getSharedWorkerProcessConnection(const String& url, const String& name, PassRefPtr<Messages::WebProcessProxy::GetSharedWorkerProcessConnection::DelayedReply>);157 #endif158 155 159 156 // CoreIPC::Connection::Client -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in
r156069 r156277 45 45 GetNetworkProcessConnection() -> (CoreIPC::Attachment connectionHandle) Delayed 46 46 #endif 47 #if ENABLE(SHARED_WORKER_PROCESS)48 GetSharedWorkerProcessConnection(WTF::String url, WTF::String name) -> (CoreIPC::Attachment connectionHandle) Delayed49 #endif50 51 47 } -
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
r156069 r156277 28 28 29 29 #import "PluginProcessManager.h" 30 #import "SharedWorkerProcessManager.h"31 30 #import "TextChecker.h" 32 31 #import "WKBrowsingContextControllerInternal.h" … … 110 109 PluginProcessManager::shared().setProcessSuppressionEnabled(canEnable); 111 110 #endif 112 #if ENABLE(SHARED_WORKER_PROCESS)113 SharedWorkerProcessManager::shared().setProcessSuppressionEnabled(canEnable);114 #endif115 111 } 116 112 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r155787 r156277 19 19 1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */, 20 20 BCDE0AC113272712001259FB /* PBXTargetDependency */, 21 E13A8A4D16287A5B00392929 /* PBXTargetDependency */,22 21 510CC8481613C85300D03ED3 /* PBXTargetDependency */, 23 22 BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */, … … 622 621 93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */; }; 623 622 93FC67C012D3CCF200A60610 /* EncoderAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FC67A012D3CC7400A60610 /* EncoderAdapter.h */; }; 624 9F4F59421648B40700493B7E /* SharedWorkerProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F4F59411648B40700493B7E /* SharedWorkerProcessManagerMac.mm */; };625 9F4F59441648B67F00493B7E /* SharedWorkerProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F4F59431648B67F00493B7E /* SharedWorkerProcessProxyMac.mm */; };626 623 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */; }; 627 624 9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */; }; … … 824 821 BC5D24A216CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; }; 825 822 BC5D24A316CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; }; 826 BC5D24A416CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };827 823 BC5D24A716CC3D5D007D5461 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; }; 828 824 BC5D24A816CC3D5E007D5461 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; }; … … 835 831 BC5D24B316CC3F3F007D5461 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 836 832 BC5D24B516CC3F46007D5461 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 837 BC5D24B616CC3F4D007D5461 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };838 833 BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C116CD706D007D5461 /* WKDOMNodePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 839 834 BC5D24C516CD7088007D5461 /* WKDOMRangePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C416CD7088007D5461 /* WKDOMRangePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 873 868 BC82838416B45DA500A278FE /* NetworkProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82838116B45DA500A278FE /* NetworkProcessMain.mm */; }; 874 869 BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82838A16B45EF200A278FE /* PluginProcessMain.mm */; }; 875 BC82839516B4608300A278FE /* SharedWorkerProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839316B4607B00A278FE /* SharedWorkerProcessMain.mm */; };876 870 BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; }; 877 871 BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; }; … … 940 934 BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 941 935 BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 942 BCAF362616CA2A4E00D4E9FC /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };943 936 BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8049D122F0D6B00103529 /* MutableArray.cpp */; }; 944 937 BCB0AD34122F285800B1341E /* MutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8049E122F0D6B00103529 /* MutableArray.h */; }; … … 1115 1108 D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; }; 1116 1109 DF58C6361371ACA000F9A37C /* NativeWebWheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */; }; 1117 E11D35AD16B63D14006D23D7 /* com.apple.WebKit.SharedWorkerProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1EDFDA4162884640039ECDA /* com.apple.WebKit.SharedWorkerProcess.sb */; };1118 1110 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; }; 1119 1111 E133FD8A1423DD7F00FC7BFB /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; }; … … 1161 1153 E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */; }; 1162 1154 E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */; }; 1163 E1EDFDA8162886990039ECDA /* SharedWorkerProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFDA21628838C0039ECDA /* SharedWorkerProcessMac.mm */; };1164 E1EDFDA9162886AC0039ECDA /* SharedWorkerProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFD9E162882100039ECDA /* SharedWorkerProcess.cpp */; };1165 E1EDFDAE1628893B0039ECDA /* SharedWorkerProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EDFDAD1628893B0039ECDA /* SharedWorkerProcessCreationParameters.h */; };1166 E1EDFDB0162889820039ECDA /* SharedWorkerProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFDAF162889810039ECDA /* SharedWorkerProcessCreationParameters.cpp */; };1167 E1EDFDB51628AD730039ECDA /* SharedWorkerProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFDB11628AD730039ECDA /* SharedWorkerProcessMessageReceiver.cpp */; };1168 E1EDFDB61628AD730039ECDA /* SharedWorkerProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EDFDB21628AD730039ECDA /* SharedWorkerProcessMessages.h */; };1169 E1EDFDB71628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */; };1170 E1EDFDB81628AD730039ECDA /* SharedWorkerProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */; };1171 E1EDFDBA1628B0450039ECDA /* SharedWorkerProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EDFDB91628B0450039ECDA /* SharedWorkerProcessProxy.h */; };1172 E1EDFE121628CFB20039ECDA /* SharedWorkerProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFE111628CFB20039ECDA /* SharedWorkerProcessManager.cpp */; };1173 E1EDFE131628CFBD0039ECDA /* SharedWorkerProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EDFE0F1628CF4E0039ECDA /* SharedWorkerProcessManager.h */; };1174 E1EDFE151628DD7A0039ECDA /* SharedWorkerProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EDFE141628DD7A0039ECDA /* SharedWorkerProcessProxy.cpp */; };1175 1155 E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; }; 1176 1156 E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; }; … … 1321 1301 remoteGlobalIDString = 510031EA1379CACB00C8DFE4; 1322 1302 remoteInfo = SecItemShim; 1323 };1324 E13A8A4C16287A5B00392929 /* PBXContainerItemProxy */ = {1325 isa = PBXContainerItemProxy;1326 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;1327 proxyType = 1;1328 remoteGlobalIDString = E13A8A2B162879AC00392929;1329 remoteInfo = SharedWorkerProcess;1330 };1331 E13A8A4E16287A6600392929 /* PBXContainerItemProxy */ = {1332 isa = PBXContainerItemProxy;1333 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;1334 proxyType = 1;1335 remoteGlobalIDString = 8DC2EF4F0486A6940098B216;1336 remoteInfo = WebKit2;1337 1303 }; 1338 1304 /* End PBXContainerItemProxy section */ … … 2065 2031 93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderAdapter.cpp; sourceTree = "<group>"; }; 2066 2032 93FC67A012D3CC7400A60610 /* EncoderAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderAdapter.h; sourceTree = "<group>"; }; 2067 9F4F59411648B40700493B7E /* SharedWorkerProcessManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedWorkerProcessManagerMac.mm; sourceTree = "<group>"; };2068 9F4F59431648B67F00493B7E /* SharedWorkerProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedWorkerProcessProxyMac.mm; sourceTree = "<group>"; };2069 2033 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMac.mm; sourceTree = "<group>"; }; 2070 2034 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessManagerMac.mm; sourceTree = "<group>"; }; … … 2324 2288 BC82838A16B45EF200A278FE /* PluginProcessMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessMain.mm; sourceTree = "<group>"; }; 2325 2289 BC82838D16B45FA600A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2326 BC82839116B4600D00A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };2327 BC82839316B4607B00A278FE /* SharedWorkerProcessMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedWorkerProcessMain.mm; sourceTree = "<group>"; };2328 2290 BC82839616B47EC400A278FE /* XPCServiceMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.mm; sourceTree = "<group>"; }; 2329 2291 BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.Development.mm; sourceTree = "<group>"; }; … … 2598 2560 E134F01512EA5D11004EC58D /* WKPrintingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPrintingView.h; sourceTree = "<group>"; }; 2599 2561 E134F01912EA5D99004EC58D /* WKPrintingView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPrintingView.mm; sourceTree = "<group>"; }; 2600 E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWorkerProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };2601 E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SharedWorkerProcess.xcconfig; sourceTree = "<group>"; };2602 2562 E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; }; 2603 2563 E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessPlatformStrategies.h; path = NetworkProcess/NetworkProcessPlatformStrategies.h; sourceTree = "<group>"; }; … … 2642 2602 E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxInitialiationParametersMac.mm; sourceTree = "<group>"; }; 2643 2603 E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxInitializationParameters.h; sourceTree = "<group>"; }; 2644 E1EDFD9D16287F190039ECDA /* SharedWorkerProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcess.h; sourceTree = "<group>"; };2645 E1EDFD9E162882100039ECDA /* SharedWorkerProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcess.cpp; sourceTree = "<group>"; };2646 E1EDFDA0162883030039ECDA /* SharedWorkerProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SharedWorkerProcess.messages.in; sourceTree = "<group>"; };2647 E1EDFDA21628838C0039ECDA /* SharedWorkerProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedWorkerProcessMac.mm; sourceTree = "<group>"; };2648 E1EDFDA4162884640039ECDA /* com.apple.WebKit.SharedWorkerProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.SharedWorkerProcess.sb; sourceTree = "<group>"; };2649 E1EDFDAB162887B00039ECDA /* SharedWorkerProcessProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SharedWorkerProcessProxy.messages.in; sourceTree = "<group>"; };2650 E1EDFDAD1628893B0039ECDA /* SharedWorkerProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcessCreationParameters.h; sourceTree = "<group>"; };2651 E1EDFDAF162889810039ECDA /* SharedWorkerProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcessCreationParameters.cpp; sourceTree = "<group>"; };2652 E1EDFDB11628AD730039ECDA /* SharedWorkerProcessMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcessMessageReceiver.cpp; sourceTree = "<group>"; };2653 E1EDFDB21628AD730039ECDA /* SharedWorkerProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcessMessages.h; sourceTree = "<group>"; };2654 E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };2655 E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcessProxyMessages.h; sourceTree = "<group>"; };2656 E1EDFDB91628B0450039ECDA /* SharedWorkerProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcessProxy.h; sourceTree = "<group>"; };2657 E1EDFE0F1628CF4E0039ECDA /* SharedWorkerProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerProcessManager.h; sourceTree = "<group>"; };2658 E1EDFE111628CFB20039ECDA /* SharedWorkerProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcessManager.cpp; sourceTree = "<group>"; };2659 E1EDFE141628DD7A0039ECDA /* SharedWorkerProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerProcessProxy.cpp; sourceTree = "<group>"; };2660 2604 E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; }; 2661 2605 E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; }; … … 2806 2750 runOnlyForDeploymentPostprocessing = 0; 2807 2751 }; 2808 E13A8A29162879AC00392929 /* Frameworks */ = {2809 isa = PBXFrameworksBuildPhase;2810 buildActionMask = 2147483647;2811 files = (2812 BC5D24B616CC3F4D007D5461 /* Foundation.framework in Frameworks */,2813 );2814 runOnlyForDeploymentPostprocessing = 0;2815 };2816 2752 /* End PBXFrameworksBuildPhase section */ 2817 2753 … … 2831 2767 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */, 2832 2768 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */, 2833 E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */,2834 2769 8DC2EF5B0486A6940098B216 /* WebKit2.framework */, 2835 2770 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */, … … 2854 2789 510CC7DA16138E0100D03ED3 /* NetworkProcess */, 2855 2790 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */, 2856 E13A8A35162879AC00392929 /* SharedWorkerProcess */,2857 2791 C0CE729D1247E71D00BC0EC4 /* Derived Sources */, 2858 2792 089C1665FE841158C02AAC07 /* Resources */, … … 3006 2940 BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */, 3007 2941 5D442A5516D5856700AC3331 /* PluginService.entitlements */, 3008 E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */,3009 2942 5183B3931379F85C00E8754E /* Shim.xcconfig */, 3010 2943 1A4F976E100E7B6600637A18 /* Version.xcconfig */, … … 3212 3145 5121745E164C20E30037A5C1 /* ShareableResource.cpp */, 3213 3146 5121745F164C20E30037A5C1 /* ShareableResource.h */, 3214 E1EDFDAF162889810039ECDA /* SharedWorkerProcessCreationParameters.cpp */,3215 E1EDFDAD1628893B0039ECDA /* SharedWorkerProcessCreationParameters.h */,3216 3147 5272B2881406985D0096A5D0 /* StatisticsData.cpp */, 3217 3148 5272B2891406985D0096A5D0 /* StatisticsData.h */, … … 3756 3687 sourceTree = "<group>"; 3757 3688 }; 3758 9F4F59401648B40700493B7E /* mac */ = {3759 isa = PBXGroup;3760 children = (3761 9F4F59411648B40700493B7E /* SharedWorkerProcessManagerMac.mm */,3762 9F4F59431648B67F00493B7E /* SharedWorkerProcessProxyMac.mm */,3763 );3764 path = mac;3765 sourceTree = "<group>";3766 };3767 3689 BC017D1016260FFD007054F5 /* DOM */ = { 3768 3690 isa = PBXGroup; … … 3920 3842 31A2EC401489973700810D71 /* Notifications */, 3921 3843 1AEFCC0511D01F34008219D3 /* Plugins */, 3922 E1EDFDAA1628878E0039ECDA /* SharedWorkers */,3923 3844 1A44B95816B73F8C00B7BBD8 /* Storage */, 3924 3845 1A64256712DE42EC00CAAE2C /* BackingStore.cpp */, … … 4533 4454 sourceTree = "<group>"; 4534 4455 }; 4535 BC82838E16B4600D00A278FE /* EntryPoint */ = {4536 isa = PBXGroup;4537 children = (4538 BC82839016B4600D00A278FE /* LegacyProcess */,4539 );4540 path = EntryPoint;4541 sourceTree = "<group>";4542 };4543 BC82839016B4600D00A278FE /* LegacyProcess */ = {4544 isa = PBXGroup;4545 children = (4546 BC82839116B4600D00A278FE /* Info.plist */,4547 BC82839316B4607B00A278FE /* SharedWorkerProcessMain.mm */,4548 );4549 name = LegacyProcess;4550 path = mac/LegacyProcess;4551 sourceTree = "<group>";4552 };4553 4456 BC8283A116B4BD9100A278FE /* XPCService */ = { 4554 4457 isa = PBXGroup; … … 4908 4811 E18E6913169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp */, 4909 4812 E18E6914169B667B009B6670 /* SecItemShimProxyMessages.h */, 4910 E1EDFDB11628AD730039ECDA /* SharedWorkerProcessMessageReceiver.cpp */,4911 E1EDFDB21628AD730039ECDA /* SharedWorkerProcessMessages.h */,4912 E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */,4913 E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */,4914 4813 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */, 4915 4814 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */, … … 5010 4909 sourceTree = "<group>"; 5011 4910 }; 5012 E13A8A35162879AC00392929 /* SharedWorkerProcess */ = {5013 isa = PBXGroup;5014 children = (5015 BC82838E16B4600D00A278FE /* EntryPoint */,5016 E1EDFD9A16287CF50039ECDA /* mac */,5017 E1EDFD9E162882100039ECDA /* SharedWorkerProcess.cpp */,5018 E1EDFD9D16287F190039ECDA /* SharedWorkerProcess.h */,5019 E1EDFDA0162883030039ECDA /* SharedWorkerProcess.messages.in */,5020 );5021 path = SharedWorkerProcess;5022 sourceTree = "<group>";5023 };5024 4911 E170876D16D6CA7200F99226 /* FileAPI */ = { 5025 4912 isa = PBXGroup; … … 5067 4954 ); 5068 4955 name = PDF; 5069 sourceTree = "<group>";5070 };5071 E1EDFD9A16287CF50039ECDA /* mac */ = {5072 isa = PBXGroup;5073 children = (5074 E1EDFDA4162884640039ECDA /* com.apple.WebKit.SharedWorkerProcess.sb */,5075 E1EDFDA21628838C0039ECDA /* SharedWorkerProcessMac.mm */,5076 );5077 path = mac;5078 sourceTree = "<group>";5079 };5080 E1EDFDAA1628878E0039ECDA /* SharedWorkers */ = {5081 isa = PBXGroup;5082 children = (5083 9F4F59401648B40700493B7E /* mac */,5084 E1EDFE111628CFB20039ECDA /* SharedWorkerProcessManager.cpp */,5085 E1EDFE0F1628CF4E0039ECDA /* SharedWorkerProcessManager.h */,5086 E1EDFE141628DD7A0039ECDA /* SharedWorkerProcessProxy.cpp */,5087 E1EDFDB91628B0450039ECDA /* SharedWorkerProcessProxy.h */,5088 E1EDFDAB162887B00039ECDA /* SharedWorkerProcessProxy.messages.in */,5089 );5090 path = SharedWorkers;5091 4956 sourceTree = "<group>"; 5092 4957 }; … … 5335 5200 51217461164C20E30037A5C1 /* ShareableResource.h in Headers */, 5336 5201 1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */, 5337 E1EDFDAE1628893B0039ECDA /* SharedWorkerProcessCreationParameters.h in Headers */,5338 E1EDFE131628CFBD0039ECDA /* SharedWorkerProcessManager.h in Headers */,5339 E1EDFDB61628AD730039ECDA /* SharedWorkerProcessMessages.h in Headers */,5340 E1EDFDBA1628B0450039ECDA /* SharedWorkerProcessProxy.h in Headers */,5341 E1EDFDB81628AD730039ECDA /* SharedWorkerProcessProxyMessages.h in Headers */,5342 5202 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */, 5343 5203 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */, … … 5942 5802 productType = "com.apple.product-type.library.dynamic"; 5943 5803 }; 5944 E13A8A2B162879AC00392929 /* SharedWorkerProcess */ = {5945 isa = PBXNativeTarget;5946 buildConfigurationList = E13A8A4A162879AC00392929 /* Build configuration list for PBXNativeTarget "SharedWorkerProcess" */;5947 buildPhases = (5948 E13A8A28162879AC00392929 /* Sources */,5949 E13A8A29162879AC00392929 /* Frameworks */,5950 E13A8A2A162879AC00392929 /* Resources */,5951 );5952 buildRules = (5953 );5954 dependencies = (5955 E13A8A4F16287A6600392929 /* PBXTargetDependency */,5956 );5957 name = SharedWorkerProcess;5958 productName = SharedWorkerProcess;5959 productReference = E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */;5960 productType = "com.apple.product-type.application";5961 };5962 5804 /* End PBXNativeTarget section */ 5963 5805 … … 5989 5831 BCDE093313272496001259FB /* PluginProcess */, 5990 5832 510CC80D1613C79900D03ED3 /* NetworkProcess */, 5991 E13A8A2B162879AC00392929 /* SharedWorkerProcess */,5992 5833 C0CE72851247E66800BC0EC4 /* Derived Sources */, 5993 5834 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */, … … 6028 5869 files = ( 6029 5870 E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */, 6030 E11D35AD16B63D14006D23D7 /* com.apple.WebKit.SharedWorkerProcess.sb in Resources */,6031 5871 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */, 6032 5872 1CBC945E16515ED200D68AAE /* DockBottom.pdf in Resources */, … … 6091 5931 buildActionMask = 2147483647; 6092 5932 files = ( 6093 );6094 runOnlyForDeploymentPostprocessing = 0;6095 };6096 E13A8A2A162879AC00392929 /* Resources */ = {6097 isa = PBXResourcesBuildPhase;6098 buildActionMask = 2147483647;6099 files = (6100 BCAF362616CA2A4E00D4E9FC /* WebKit.icns in Resources */,6101 5933 ); 6102 5934 runOnlyForDeploymentPostprocessing = 0; … … 6536 6368 51217460164C20E30037A5C1 /* ShareableResource.cpp in Sources */, 6537 6369 1A24BF3A120896A600FBB059 /* SharedMemoryMac.cpp in Sources */, 6538 E1EDFDA9162886AC0039ECDA /* SharedWorkerProcess.cpp in Sources */,6539 E1EDFDB0162889820039ECDA /* SharedWorkerProcessCreationParameters.cpp in Sources */,6540 E1EDFDA8162886990039ECDA /* SharedWorkerProcessMac.mm in Sources */,6541 BC82839516B4608300A278FE /* SharedWorkerProcessMain.mm in Sources */,6542 E1EDFE121628CFB20039ECDA /* SharedWorkerProcessManager.cpp in Sources */,6543 9F4F59421648B40700493B7E /* SharedWorkerProcessManagerMac.mm in Sources */,6544 E1EDFDB51628AD730039ECDA /* SharedWorkerProcessMessageReceiver.cpp in Sources */,6545 E1EDFE151628DD7A0039ECDA /* SharedWorkerProcessProxy.cpp in Sources */,6546 9F4F59441648B67F00493B7E /* SharedWorkerProcessProxyMac.mm in Sources */,6547 E1EDFDB71628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp in Sources */,6548 6370 5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */, 6549 6371 51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */, … … 6932 6754 runOnlyForDeploymentPostprocessing = 0; 6933 6755 }; 6934 E13A8A28162879AC00392929 /* Sources */ = {6935 isa = PBXSourcesBuildPhase;6936 buildActionMask = 2147483647;6937 files = (6938 BC5D24A416CC3B9E007D5461 /* ChildProcessMain.mm in Sources */,6939 );6940 runOnlyForDeploymentPostprocessing = 0;6941 };6942 6756 /* End PBXSourcesBuildPhase section */ 6943 6757 … … 7027 6841 target = 510031EA1379CACB00C8DFE4 /* SecItemShim */; 7028 6842 targetProxy = CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */; 7029 };7030 E13A8A4D16287A5B00392929 /* PBXTargetDependency */ = {7031 isa = PBXTargetDependency;7032 target = E13A8A2B162879AC00392929 /* SharedWorkerProcess */;7033 targetProxy = E13A8A4C16287A5B00392929 /* PBXContainerItemProxy */;7034 };7035 E13A8A4F16287A6600392929 /* PBXTargetDependency */ = {7036 isa = PBXTargetDependency;7037 target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;7038 targetProxy = E13A8A4E16287A6600392929 /* PBXContainerItemProxy */;7039 6843 }; 7040 6844 /* End PBXTargetDependency section */ … … 7454 7258 name = Production; 7455 7259 }; 7456 E13A8A47162879AC00392929 /* Debug */ = {7457 isa = XCBuildConfiguration;7458 baseConfigurationReference = E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */;7459 buildSettings = {7460 };7461 name = Debug;7462 };7463 E13A8A48162879AC00392929 /* Release */ = {7464 isa = XCBuildConfiguration;7465 baseConfigurationReference = E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */;7466 buildSettings = {7467 };7468 name = Release;7469 };7470 E13A8A49162879AC00392929 /* Production */ = {7471 isa = XCBuildConfiguration;7472 baseConfigurationReference = E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */;7473 buildSettings = {7474 };7475 name = Production;7476 };7477 7260 /* End XCBuildConfiguration section */ 7478 7261 … … 7648 7431 defaultConfigurationName = Production; 7649 7432 }; 7650 E13A8A4A162879AC00392929 /* Build configuration list for PBXNativeTarget "SharedWorkerProcess" */ = {7651 isa = XCConfigurationList;7652 buildConfigurations = (7653 E13A8A47162879AC00392929 /* Debug */,7654 E13A8A48162879AC00392929 /* Release */,7655 E13A8A49162879AC00392929 /* Production */,7656 );7657 defaultConfigurationIsVisible = 0;7658 defaultConfigurationName = Production;7659 };7660 7433 /* End XCConfigurationList section */ 7661 7434 }; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
r155194 r156277 112 112 SharedWorkerStrategy* WebPlatformStrategies::createSharedWorkerStrategy() 113 113 { 114 return this;114 return 0; 115 115 } 116 116 … … 327 327 #endif // ENABLE(NETSCAPE_PLUGIN_API) 328 328 329 // SharedWorkerStrategy.330 331 bool WebPlatformStrategies::isAvailable() const332 {333 // Shared workers do not work across multiple processes, and using network process is tied to multiple secondary process model.334 #if ENABLE(NETWORK_PROCESS)335 return !WebProcess::shared().usesNetworkProcess();336 #else337 return true;338 #endif339 }340 341 329 // StorageStrategy 342 330 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
r156069 r156277 33 33 #include <WebCore/PlatformStrategies.h> 34 34 #include <WebCore/PluginStrategy.h> 35 #include <WebCore/SharedWorkerStrategy.h>36 35 #include <WebCore/StorageStrategy.h> 37 36 #include <WebCore/VisitedLinkStrategy.h> … … 39 38 namespace WebKit { 40 39 41 class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::S haredWorkerStrategy, private WebCore::StorageStrategy, private WebCore::VisitedLinkStrategy {40 class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::StorageStrategy, private WebCore::VisitedLinkStrategy { 42 41 public: 43 42 static void initialize(); … … 81 80 virtual void refreshPlugins() OVERRIDE; 82 81 virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) OVERRIDE; 83 84 // WebCore::SharedWorkerStrategy.85 virtual bool isAvailable() const OVERRIDE;86 82 87 83 // WebCore::StorageStrategy. -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r156069 r156277 4158 4158 void WebPage::reportUsedFeatures() 4159 4159 { 4160 // FIXME: Feature names should not be hardcoded.4161 const BitVector* features = m_page->featureObserver()->accumulatedFeatureBits();4162 4160 Vector<String> namedFeatures; 4163 if (features && features->quickGet(FeatureObserver::SharedWorkerStart))4164 namedFeatures.append("SharedWorker");4165 4166 4161 m_loaderClient.featuresUsedInPage(this, namedFeatures); 4167 4162 } -
trunk/Source/WebKit2/mac/WebKit2.order
r155409 r156277 4101 4101 __ZN6WebKitL51updateProcessSuppressionStateOfGlobalChildProcessesEv 4102 4102 __ZN6WebKit20PluginProcessManager28setProcessSuppressionEnabledEb 4103 __ZN6WebKit26SharedWorkerProcessManager6sharedEv4104 __ZN6WebKit26SharedWorkerProcessManager28setProcessSuppressionEnabledEb4105 4103 __ZN7CoreIPC10Connection4sendIN8Messages14NetworkProcess28SetProcessSuppressionEnabledEEEbRKT_yj 4106 4104 __ZN7CoreIPC10Connection4sendIN8Messages15WebProcessProxy24DidPerformServerRedirectEEEbRKT_yj
Note: See TracChangeset
for help on using the changeset viewer.