Changeset 128087 in webkit
- Timestamp:
- Sep 10, 2012 12:07:48 PM (12 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r128085 r128087 1 2012-09-10 Mark Pilgrim <pilgrim@chromium.org> 2 3 [Chromium] Define new setSharedWorkerRepository function in preparation for removing WebKitPlatformSupport::sharedWorkerRepository() 4 https://bugs.webkit.org/show_bug.cgi?id=95861 5 6 Reviewed by Adam Barth. 7 8 Followup patch to Chromium will call this new function, then we can remove all references to the legacy function on WebKitPlatformSupport. 9 10 * public/WebSharedWorkerRepository.h: 11 (WebKit): 12 * src/SharedWorkerRepository.cpp: 13 (WebKit): 14 (WebKit::setSharedWorkerRepository): 15 (WebKit::sharedWorkerRepository): 16 (WebCore::SharedWorkerRepository::isAvailable): 17 (WebCore::SharedWorkerRepository::connect): 18 (WebCore::SharedWorkerRepository::documentDetached): 19 (WebCore::SharedWorkerRepository::hasSharedWorkers): 20 1 21 2012-09-10 Catalin Badea <badea@adobe.com> 2 22 -
trunk/Source/WebKit/chromium/public/WebSharedWorkerRepository.h
r101122 r128087 55 55 }; 56 56 57 // Initializes shared worker support. 58 WEBKIT_EXPORT void setSharedWorkerRepository(WebSharedWorkerRepository*); 59 57 60 } // namespace WebKit 58 61 -
trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
r119666 r128087 59 59 #include <public/WebURL.h> 60 60 61 namespace WebKit { 62 63 WebSharedWorkerRepository* s_sharedWorkerRepository = 0; 64 65 void setSharedWorkerRepository(WebSharedWorkerRepository* repository) 66 { 67 s_sharedWorkerRepository = repository; 68 } 69 70 static WebSharedWorkerRepository* sharedWorkerRepository() 71 { 72 WebSharedWorkerRepository* repository; 73 74 repository = s_sharedWorkerRepository; 75 if (!repository) { 76 repository = webKitPlatformSupport()->sharedWorkerRepository(); 77 setSharedWorkerRepository(repository); 78 } 79 80 return repository; 81 } 82 83 } 84 61 85 namespace WebCore { 62 86 … … 195 219 bool SharedWorkerRepository::isAvailable() 196 220 { 197 // Allow the WebKitPlatformSupport to determine if SharedWorkers are available. 198 return WebKit::webKitPlatformSupport()->sharedWorkerRepository(); 221 // Allow the WebKitPlatformSupport to determine if SharedWorkers 222 // are available. 223 return WebKit::sharedWorkerRepository(); 199 224 } 200 225 … … 207 232 void SharedWorkerRepository::connect(PassRefPtr<SharedWorker> worker, PassOwnPtr<MessagePortChannel> port, const KURL& url, const String& name, ExceptionCode& ec) 208 233 { 234 WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository(); 235 209 236 // This should not be callable unless there's a SharedWorkerRepository for 210 237 // this context (since isAvailable() should have returned null). 211 ASSERT( WebKit::webKitPlatformSupport()->sharedWorkerRepository());238 ASSERT(repository); 212 239 213 240 // No nested workers (for now) - connect() should only be called from document context. … … 224 251 } 225 252 226 WebKit::webKitPlatformSupport()->sharedWorkerRepository()->addSharedWorker( 227 webWorker.get(), getId(document)); 253 repository->addSharedWorker(webWorker.get(), getId(document)); 228 254 229 255 // The loader object manages its own lifecycle (and the lifecycles of the two worker objects). … … 235 261 void SharedWorkerRepository::documentDetached(Document* document) 236 262 { 237 WebSharedWorkerRepository* repo = WebKit::webKitPlatformSupport()->sharedWorkerRepository(); 238 if (repo) 239 repo->documentDetached(getId(document)); 263 WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository(); 264 265 if (repository) 266 repository->documentDetached(getId(document)); 240 267 241 268 // Stop the creation of any pending SharedWorkers for this context. … … 246 273 bool SharedWorkerRepository::hasSharedWorkers(Document* document) 247 274 { 248 WebSharedWorkerRepository* repo = WebKit::webKitPlatformSupport()->sharedWorkerRepository(); 249 return repo && repo->hasSharedWorkers(getId(document)); 250 } 251 252 275 WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository(); 276 277 return repository && repository->hasSharedWorkers(getId(document)); 278 } 253 279 254 280 } // namespace WebCore
Note: See TracChangeset
for help on using the changeset viewer.