Changeset 69029 in webkit
- Timestamp:
- Oct 4, 2010 1:06:49 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 1 added
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r69021 r69029 1 2010-10-04 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 Generate messages sent to the WebProcess class. 6 https://bugs.webkit.org/show_bug.cgi?id=47097 7 8 * DerivedSources.make: 9 Add new file to generate and new directory to search. 10 11 * Scripts/webkit2/messages.py: 12 (forward_declarations_and_headers): Special case class templates. 13 (headers_for_type): Special case Vector. 14 * Scripts/webkit2/messages_unittest.py: 15 Make this script work for passing a templated type. 16 17 * Shared/CoreIPCSupport/WebProcessMessageKinds.h: Removed. 18 19 * UIProcess/VisitedLinkProvider.cpp: 20 (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired): 21 * UIProcess/WebContext.cpp: 22 (WebKit::WebContext::initializeHistoryClient): 23 (WebKit::WebContext::ensureWebProcess): 24 (WebKit::WebContext::registerURLSchemeAsEmptyDocument): 25 (WebKit::WebContext::setCacheModel): 26 * UIProcess/WebPageProxy.cpp: 27 (WebKit::WebPageProxy::initializeWebPage): 28 (WebKit::WebPageProxy::reinitializeWebPage): 29 * UIProcess/WebProcessProxy.cpp: 30 (WebKit::WebProcessProxy::WebProcessProxy): Always pass both 31 the bundle path and a key, even if the key is null, which it will be for 32 all non-mac builds for now. 33 * UIProcess/mac/WebProcessProxyMac.mm: 34 (WebKit::WebProcessProxy::setUpAcceleratedCompositing): 35 * UIProcess/win/WebContextWin.cpp: 36 (WebKit::WebContext::setShouldPaintNativeControls): 37 (WebKit::WebContext::platformSetUpWebProcess): 38 Use the new syntax for sending the messages. 39 40 * WebProcess/WebProcess.cpp: 41 (WebKit::WebProcess::setShouldTrackVisitedLinks): 42 (WebKit::WebProcess::setCacheModel): 43 (WebKit::WebProcess::setupAcceleratedCompositingPort): 44 (WebKit::WebProcess::setShouldPaintNativeControls): 45 (WebKit::WebProcess::didReceiveMessage): 46 * WebProcess/WebProcess.h: 47 Convert to using generated didReceiveWebProcessMessage. 48 49 * WebProcess/WebProcess.messages.in: Added. 50 51 * WebKit2.pro: 52 * WebKit2.xcodeproj/project.pbxproj: 53 * win/WebKit2.vcproj: 54 Update projects. 55 1 56 2010-10-04 Sam Weinig <sam@webkit.org> 2 57 -
trunk/WebKit2/DerivedSources.make
r68612 r69029 3 3 $(WebKit2)/WebProcess/Plugins \ 4 4 $(WebKit2)/WebProcess/WebPage \ 5 $(WebKit2)/WebProcess \ 5 6 $(WebKit2)/UIProcess/Plugins \ 6 7 # … … 12 13 PluginProxy \ 13 14 WebPage \ 15 WebProcess \ 14 16 WebProcessConnection \ 15 17 # -
trunk/WebKit2/Scripts/webkit2/messages.py
r68811 r69029 228 228 for parameter in receiver.iterparameters(): 229 229 type = parameter.type 230 231 if type.find('<') != -1: 232 # Don't forward declare class templates. 233 headers.update(headers_for_type(type)) 234 continue 235 230 236 split = type.split('::') 231 237 … … 332 338 333 339 def headers_for_type(type): 340 # Check for Vector. 341 match = re.search(r'Vector<(.+)>', type) 342 if match: 343 element_type = match.groups()[0].strip() 344 return ['<wtf/Vector.h>'] + headers_for_type(element_type) 345 334 346 special_cases = { 335 347 'WTF::String': '<wtf/text/WTFString.h>', -
trunk/WebKit2/Scripts/webkit2/messages_unittest.py
r68811 r69029 239 239 #include "MessageID.h" 240 240 #include "Plugin.h" 241 #include <wtf/Vector.h> 241 242 242 243 namespace CoreIPC { -
trunk/WebKit2/UIProcess/VisitedLinkProvider.cpp
r64775 r69029 29 29 #include "VisitedLinkTable.h" 30 30 #include "WebContext.h" 31 #include "WebProcessMessage Kinds.h"31 #include "WebProcessMessages.h" 32 32 33 33 using namespace WebCore; … … 152 152 return; 153 153 154 m_context->process()->send( WebProcessMessage::SetVisitedLinkTable, 0, CoreIPC::In(handle));154 m_context->process()->send(Messages::WebProcess::SetVisitedLinkTable(handle), 0); 155 155 } 156 156 157 157 // We now need to let the web process know that we've added links. 158 158 if (addedVisitedLinks.size() <= 20) { 159 m_context->process()->send( WebProcessMessage::VisitedLinkStateChanged, 0, CoreIPC::In(addedVisitedLinks));159 m_context->process()->send(Messages::WebProcess::VisitedLinkStateChanged(addedVisitedLinks), 0); 160 160 return; 161 161 } 162 162 163 163 // Just recalculate all the visited links. 164 m_context->process()->send(WebProcessMessage::AllVisitedLinkStateChanged, 0, CoreIPC::In()); 165 return; 164 m_context->process()->send(Messages::WebProcess::AllVisitedLinkStateChanged(), 0); 166 165 } 167 166 -
trunk/WebKit2/UIProcess/WebContext.cpp
r69020 r69029 29 29 #include "InjectedBundleMessageKinds.h" 30 30 #include "RunLoop.h" 31 #include "WKContextPrivate.h" 31 32 #include "WebContextMessageKinds.h" 32 33 #include "WebContextUserMessageCoders.h" … … 35 36 #include "WebPreferences.h" 36 37 #include "WebProcessManager.h" 37 #include "WebProcessMessage Kinds.h"38 #include "WebProcessMessages.h" 38 39 #include "WebProcessProxy.h" 40 #include <WebCore/LinkHash.h> 39 41 #include <wtf/OwnArrayPtr.h> 40 42 #include <wtf/PassOwnArrayPtr.h> 41 42 #include "WKContextPrivate.h"43 44 #include <WebCore/LinkHash.h>45 43 46 44 #ifndef NDEBUG … … 117 115 return; 118 116 119 m_process->send( WebProcessMessage::SetShouldTrackVisitedLinks, 0, CoreIPC::In(m_historyClient.shouldTrackVisitedLinks()));117 m_process->send(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient.shouldTrackVisitedLinks()), 0); 120 118 } 121 119 … … 127 125 m_process = WebProcessManager::shared().getWebProcess(this); 128 126 129 m_process->send( WebProcessMessage::SetShouldTrackVisitedLinks, 0, CoreIPC::In(m_historyClient.shouldTrackVisitedLinks()));130 m_process->send( WebProcessMessage::SetCacheModel, 0, CoreIPC::In(static_cast<uint32_t>(m_cacheModel)));127 m_process->send(Messages::WebProcess::SetShouldTrackVisitedLinks(m_historyClient.shouldTrackVisitedLinks()), 0); 128 m_process->send(Messages::WebProcess::SetCacheModel(static_cast<uint32_t>(m_cacheModel)), 0); 131 129 132 130 for (HashSet<String>::iterator it = m_schemesToRegisterAsEmptyDocument.begin(), end = m_schemesToRegisterAsEmptyDocument.end(); it != end; ++it) 133 m_process->send( WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(*it));131 m_process->send(Messages::WebProcess::RegisterURLSchemeAsEmptyDocument(*it), 0); 134 132 135 133 for (size_t i = 0; i != m_pendingMessagesToPostToInjectedBundle.size(); ++i) { … … 284 282 return; 285 283 286 m_process->send( WebProcessMessage::RegisterURLSchemeAsEmptyDocument, 0, CoreIPC::In(urlScheme));284 m_process->send(Messages::WebProcess::RegisterURLSchemeAsEmptyDocument(urlScheme), 0); 287 285 } 288 286 … … 307 305 if (!hasValidProcess()) 308 306 return; 309 m_process->send( WebProcessMessage::SetCacheModel, 0, CoreIPC::In(static_cast<uint32_t>(m_cacheModel)));307 m_process->send(Messages::WebProcess::SetCacheModel(static_cast<uint32_t>(m_cacheModel)), 0); 310 308 } 311 309 -
trunk/WebKit2/UIProcess/WebPageProxy.cpp
r68557 r69029 47 47 #include "WebPreferences.h" 48 48 #include "WebProcessManager.h" 49 #include "WebProcessMessage Kinds.h"49 #include "WebProcessMessages.h" 50 50 #include "WebProcessProxy.h" 51 51 #include "WebURLRequest.h" … … 156 156 157 157 ASSERT(m_drawingArea); 158 159 process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(creationParameters(size))); 158 process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters(size)), 0); 160 159 } 161 160 … … 166 165 167 166 ASSERT(m_drawingArea); 168 169 process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(creationParameters(size))); 167 process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters(size)), 0); 170 168 } 171 169 -
trunk/WebKit2/UIProcess/WebProcessProxy.cpp
r68205 r69029 34 34 #include "WebPageProxy.h" 35 35 #include "WebProcessManager.h" 36 #include "WebProcessMessage Kinds.h"36 #include "WebProcessMessages.h" 37 37 #include "WebProcessProxyMessageKinds.h" 38 38 #include <WebCore/KURL.h> … … 69 69 String applicationCacheDirectory = m_context->applicationCacheDirectory(); 70 70 if (!applicationCacheDirectory.isEmpty()) 71 send( WebProcessMessage::SetApplicationCacheDirectory, 0, CoreIPC::In(applicationCacheDirectory));71 send(Messages::WebProcess::SetApplicationCacheDirectory(applicationCacheDirectory), 0); 72 72 73 73 // FIXME: We could instead send the bundle path as part of the arguments to process creation? … … 78 78 CString injectedBundlePath = context->injectedBundlePath().utf8(); 79 79 sandbox_issue_extension(injectedBundlePath.data(), &sandboxBundleToken); 80 send( WebProcessMessage::LoadInjectedBundle, 0, CoreIPC::In(context->injectedBundlePath(), String::fromUTF8(sandboxBundleToken)));80 send(Messages::WebProcess::LoadInjectedBundle(context->injectedBundlePath(), String::fromUTF8(sandboxBundleToken)), 0); 81 81 if (sandboxBundleToken) 82 82 free(sandboxBundleToken); 83 83 #else 84 send( WebProcessMessage::LoadInjectedBundle, 0, CoreIPC::In(context->injectedBundlePath()));84 send(Messages::WebProcess::LoadInjectedBundle(context->injectedBundlePath(), String()), 0); 85 85 #endif 86 86 } -
trunk/WebKit2/UIProcess/mac/WebProcessProxyMac.mm
r62392 r69029 28 28 #include "MachPort.h" 29 29 #include "WebKitSystemInterface.h" 30 #include "WebProcessMessage Kinds.h"30 #include "WebProcessMessages.h" 31 31 32 32 using namespace WebCore; … … 40 40 mach_port_t renderServerPort = WKInitializeRenderServer(); 41 41 if (renderServerPort != MACH_PORT_NULL) 42 send( WebProcessMessage::SetupAcceleratedCompositingPort, 0, CoreIPC::In(CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND)));42 send(Messages::WebProcess::SetUpAcceleratedCompositingPort(CoreIPC::MachPort(renderServerPort, MACH_MSG_TYPE_COPY_SEND)), 0); 43 43 #endif 44 44 } -
trunk/WebKit2/UIProcess/win/WebContextWin.cpp
r65270 r69029 26 26 #include "WebContext.h" 27 27 28 #include "WebProcessMessage Kinds.h"28 #include "WebProcessMessages.h" 29 29 #include <WebCore/FileSystem.h> 30 30 … … 44 44 if (!hasValidProcess()) 45 45 return; 46 47 m_process->send(WebProcessMessage::SetShouldPaintNativeControls, 0, CoreIPC::In(m_shouldPaintNativeControls)); 46 m_process->send(Messages::WebProcess::SetShouldPaintNativeControls(m_shouldPaintNativeControls), 0); 48 47 } 49 48 50 49 void WebContext::platformSetUpWebProcess() 51 50 { 52 m_process->send( WebProcessMessage::SetShouldPaintNativeControls, 0, CoreIPC::In(m_shouldPaintNativeControls));51 m_process->send(Messages::WebProcess::SetShouldPaintNativeControls(m_shouldPaintNativeControls), 0); 53 52 } 54 53 -
trunk/WebKit2/WebKit2.pro
r69020 r69029 141 141 142 142 WEBKIT2_GENERATED_HEADERS = \ 143 $$OUTPUT_DIR/WebKit2/generated/WebPageMessages.h 143 $$OUTPUT_DIR/WebKit2/generated/WebPageMessages.h \ 144 $$OUTPUT_DIR/WebKit2/generated/WebProcessMessages.h 144 145 145 146 WEBKIT2_GENERATED_SOURCES = \ 146 $$OUTPUT_DIR/WebKit2/generated/WebPageMessageReceiver.cpp 147 $$OUTPUT_DIR/WebKit2/generated/WebPageMessageReceiver.cpp \ 148 $$OUTPUT_DIR/WebKit2/generated/WebProcessMessageReceiver.cpp 147 149 148 150 HEADERS += \ … … 176 178 Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \ 177 179 Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \ 178 Shared/CoreIPCSupport/WebProcessMessageKinds.h \179 180 Shared/CacheModel.h \ 180 181 Shared/DrawingAreaBase.h \ -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r69020 r69029 226 226 BC3065C412592F8900E71278 /* WebProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC3065C312592F8900E71278 /* WebProcessMac.mm */; }; 227 227 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3065F91259344E00E71278 /* CacheModel.h */; }; 228 BC3066BE125A442100E71278 /* WebProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3066BC125A442100E71278 /* WebProcessMessageReceiver.cpp */; }; 229 BC3066BF125A442100E71278 /* WebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3066BD125A442100E71278 /* WebProcessMessages.h */; }; 228 230 BC33DD681238464600360F3F /* WebNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33DD671238464600360F3F /* WebNumber.h */; }; 229 231 BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = BC33E0CF12408E8600360F3F /* InjectedBundleRangeHandle.h */; }; … … 675 677 BC3065C312592F8900E71278 /* WebProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessMac.mm; sourceTree = "<group>"; }; 676 678 BC3065F91259344E00E71278 /* CacheModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheModel.h; sourceTree = "<group>"; }; 679 BC3066B9125A436300E71278 /* WebProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebProcess.messages.in; sourceTree = "<group>"; }; 680 BC3066BC125A442100E71278 /* WebProcessMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessMessageReceiver.cpp; sourceTree = "<group>"; }; 681 BC3066BD125A442100E71278 /* WebProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessMessages.h; sourceTree = "<group>"; }; 677 682 BC33DD671238464600360F3F /* WebNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNumber.h; sourceTree = "<group>"; }; 678 683 BC33E0CF12408E8600360F3F /* InjectedBundleRangeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleRangeHandle.h; sourceTree = "<group>"; }; … … 1214 1219 BC032D9110F437AF0058C15A /* WebProcess.h */, 1215 1220 1A6FA01F11E1528700DB1371 /* WebProcessMain.h */, 1221 BC3066B9125A436300E71278 /* WebProcess.messages.in */, 1216 1222 ); 1217 1223 path = WebProcess; … … 1696 1702 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */, 1697 1703 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */, 1704 BC3066BC125A442100E71278 /* WebProcessMessageReceiver.cpp */, 1705 BC3066BD125A442100E71278 /* WebProcessMessages.h */, 1698 1706 ); 1699 1707 name = "Derived Sources"; … … 1926 1934 BC9099801256A98200083756 /* WKStringPrivate.h in Headers */, 1927 1935 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 1936 BC3066BF125A442100E71278 /* WebProcessMessages.h in Headers */, 1928 1937 ); 1929 1938 runOnlyForDeploymentPostprocessing = 0; … … 2221 2230 1A8EFDFE1253CB6E00F7067F /* DataReference.cpp in Sources */, 2222 2231 BC3065C412592F8900E71278 /* WebProcessMac.mm in Sources */, 2232 BC3066BE125A442100E71278 /* WebProcessMessageReceiver.cpp in Sources */, 2223 2233 ); 2224 2234 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r68397 r69029 122 122 return 0; 123 123 124 WebP age* newWebPage = WebProcess::shared().createWebPage(newPageID, parameters);125 return newWebPage->corePage();124 WebProcess::shared().createWebPage(newPageID, parameters); 125 return WebProcess::shared().webPage(newPageID)->corePage(); 126 126 } 127 127 -
trunk/WebKit2/WebProcess/WebProcess.cpp
r69020 r69029 35 35 #include "WebPlatformStrategies.h" 36 36 #include "WebPreferencesStore.h" 37 #include "WebProcessMessages.h" 37 38 #include "WebProcessProxyMessageKinds.h" 38 #include "WebProcessMessageKinds.h"39 39 #include <WebCore/ApplicationCacheStorage.h> 40 40 #include <WebCore/Page.h> … … 45 45 #include <wtf/RandomNumber.h> 46 46 47 #if PLATFORM(MAC)48 #include "MachPort.h"49 #endif50 51 47 #ifndef NDEBUG 52 48 #include <WebCore/Cache.h> … … 141 137 } 142 138 139 void WebProcess::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks) 140 { 141 PageGroup::setShouldTrackVisitedLinks(shouldTrackVisitedLinks); 142 } 143 143 144 void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme) 144 145 { … … 184 185 } 185 186 186 void WebProcess::setCacheModel(CacheModel cacheModel) 187 { 187 void WebProcess::setCacheModel(uint32_t cm) 188 { 189 CacheModel cacheModel = static_cast<CacheModel>(cm); 190 188 191 if (!m_hasSetCacheModel || cacheModel != m_cacheModel) { 189 192 m_hasSetCacheModel = true; … … 193 196 } 194 197 198 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC) 199 void WebProcess::setUpAcceleratedCompositingPort(CoreIPC::MachPort port) 200 { 201 m_compositingRenderServerPort = port.port(); 202 } 203 #endif 204 205 #if PLATFORM(WIN) 206 void WebProcess::setShouldPaintNativeControls(bool shouldPaintNativeControls) 207 { 208 #if USE(SAFARI_THEME) 209 Settings::setShouldPaintNativeControls(shouldPaintNativeControls); 210 #endif 211 } 212 #endif 213 195 214 WebPage* WebProcess::webPage(uint64_t pageID) const 196 215 { … … 198 217 } 199 218 200 WebPage*WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters& parameters)219 void WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters& parameters) 201 220 { 202 221 // It is necessary to check for page existence here since during a window.open() (or targeted … … 209 228 210 229 ASSERT(result.first->second); 211 return result.first->second.get();212 230 } 213 231 … … 248 266 { 249 267 if (messageID.is<CoreIPC::MessageClassWebProcess>()) { 250 switch (messageID.get<WebProcessMessage::Kind>()) { 251 case WebProcessMessage::SetVisitedLinkTable: { 252 SharedMemory::Handle handle; 253 if (!arguments->decode(CoreIPC::Out(handle))) 254 return; 255 256 setVisitedLinkTable(handle); 257 return; 258 } 259 case WebProcessMessage::VisitedLinkStateChanged: { 260 Vector<LinkHash> linkHashes; 261 if (!arguments->decode(CoreIPC::Out(linkHashes))) 262 return; 263 visitedLinkStateChanged(linkHashes); 264 return; 265 } 266 case WebProcessMessage::AllVisitedLinkStateChanged: 267 allVisitedLinkStateChanged(); 268 return; 269 270 case WebProcessMessage::LoadInjectedBundle: { 271 String path; 272 273 #if ENABLE(WEB_PROCESS_SANDBOX) 274 String token; 275 if (!arguments->decode(CoreIPC::Out(path, token))) 276 return; 277 278 loadInjectedBundle(path, token); 279 return; 280 #else 281 if (!arguments->decode(CoreIPC::Out(path))) 282 return; 283 284 loadInjectedBundle(path); 285 return; 286 #endif 287 } 288 case WebProcessMessage::SetApplicationCacheDirectory: { 289 String directory; 290 if (!arguments->decode(CoreIPC::Out(directory))) 291 return; 292 293 setApplicationCacheDirectory(directory); 294 return; 295 } 296 case WebProcessMessage::SetShouldTrackVisitedLinks: { 297 bool shouldTrackVisitedLinks; 298 if (!arguments->decode(CoreIPC::Out(shouldTrackVisitedLinks))) 299 return; 300 301 PageGroup::setShouldTrackVisitedLinks(shouldTrackVisitedLinks); 302 return; 303 } 304 case WebProcessMessage::SetCacheModel: { 305 uint32_t cacheModel; 306 if (!arguments->decode(CoreIPC::Out(cacheModel))) 307 return; 308 309 setCacheModel(static_cast<CacheModel>(cacheModel)); 310 return; 311 } 312 case WebProcessMessage::Create: { 313 uint64_t pageID = arguments->destinationID(); 314 WebPageCreationParameters parameters; 315 if (!arguments->decode(CoreIPC::Out(parameters))) 316 return; 317 318 createWebPage(pageID, parameters); 319 return; 320 } 321 case WebProcessMessage::RegisterURLSchemeAsEmptyDocument: { 322 String message; 323 if (!arguments->decode(CoreIPC::Out(message))) 324 return; 325 326 registerURLSchemeAsEmptyDocument(message); 327 return; 328 } 329 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC) 330 case WebProcessMessage::SetupAcceleratedCompositingPort: { 331 CoreIPC::MachPort port; 332 if (!arguments->decode(port)) 333 return; 334 335 m_compositingRenderServerPort = port.port(); 336 return; 337 } 338 #endif 339 #if PLATFORM(WIN) 340 case WebProcessMessage::SetShouldPaintNativeControls: { 341 bool b; 342 if (!arguments->decode(b)) 343 return; 344 #if USE(SAFARI_THEME) 345 Settings::setShouldPaintNativeControls(b); 346 #endif 347 return; 348 } 349 #endif 350 } 268 didReceiveWebProcessMessage(connection, messageID, arguments); 269 return; 351 270 } 352 271 -
trunk/WebKit2/WebProcess/WebProcess.h
r69020 r69029 36 36 #include <wtf/HashMap.h> 37 37 38 #if PLATFORM(MAC) 39 #include "MachPort.h" 40 #endif 41 38 42 namespace WebCore { 39 43 class IntSize; … … 59 63 60 64 WebPage* webPage(uint64_t pageID) const; 61 WebPage*createWebPage(uint64_t pageID, const WebPageCreationParameters&);65 void createWebPage(uint64_t pageID, const WebPageCreationParameters&); 62 66 void removeWebPage(uint64_t pageID); 63 67 … … 89 93 #endif 90 94 void setApplicationCacheDirectory(const String&); 95 void setShouldTrackVisitedLinks(bool); 91 96 void registerURLSchemeAsEmptyDocument(const String&); 97 98 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC) 99 void setUpAcceleratedCompositingPort(CoreIPC::MachPort); 100 #endif 101 #if PLATFORM(WIN) 102 void setShouldPaintNativeControls(bool); 103 #endif 104 92 105 93 106 void setVisitedLinkTable(const SharedMemory::Handle&); … … 95 108 void allVisitedLinkStateChanged(); 96 109 97 void setCacheModel( CacheModel cacheModel);110 void setCacheModel(uint32_t); 98 111 void platformSetCacheModel(CacheModel); 99 112 … … 103 116 void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID); 104 117 118 // Implemented in generated WebProcessMessageReceiver.cpp 119 void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); 120 105 121 RefPtr<CoreIPC::Connection> m_connection; 106 122 HashMap<uint64_t, RefPtr<WebPage> > m_pageMap; -
trunk/WebKit2/win/WebKit2.vcproj
r69020 r69029 761 761 </File> 762 762 <File 763 RelativePath="..\Shared\CoreIPCSupport\WebProcessMessageKinds.h"764 >765 </File>766 <File767 763 RelativePath="..\Shared\CoreIPCSupport\WebProcessProxyMessageKinds.h" 768 764 > … … 2023 2019 <File 2024 2020 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\WebPageMessages.h" 2021 > 2022 </File> 2023 <File 2024 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\WebProcessMessageReceiver.cpp" 2025 > 2026 </File> 2027 <File 2028 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\WebProcessMessages.h" 2025 2029 > 2026 2030 </File>
Note: See TracChangeset
for help on using the changeset viewer.