Changeset 250556 in webkit
- Timestamp:
- Oct 1, 2019, 8:59:36 AM (6 years ago)
- Location:
- trunk/Source/WebKitLegacy/mac
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKitLegacy/mac/ChangeLog
r250550 r250556 1 2019-10-01 Alex Christensen <achristensen@webkit.org> 2 3 Fix internal build after r250549 4 https://bugs.webkit.org/show_bug.cgi?id=202390 5 6 Remove some more "using namespace WebCore" 7 8 * History/WebBackForwardList.mm: 9 (-[WebBackForwardList dictionaryRepresentation]): 10 (vectorToNSArray): 11 (-[WebBackForwardList backListWithLimit:]): 12 (-[WebBackForwardList forwardListWithLimit:]): 13 (-[WebBackForwardList description]): 14 (-[WebBackForwardList pageCacheSize]): 15 * Misc/WebSharingServicePickerController.mm: 16 (WebSharingServicePickerClient::pageForSharingServicePicker): 17 (WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem): 18 (-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]): 19 (-[WebSharingServicePickerController sharingService:didShareItems:]): 20 * Plugins/WebBasePluginPackage.mm: 21 (-[WebBasePluginPackage getPluginInfoFromPLists]): 22 (-[WebBasePluginPackage pluginInfo]): 23 * Plugins/WebPluginContainerCheck.mm: 24 (-[WebPluginContainerCheck _continueWithPolicy:]): 25 (-[WebPluginContainerCheck _isForbiddenFileLoad]): 26 * Plugins/WebPluginController.mm: 27 (initializeAudioSession): 28 (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]): 29 (-[WebPluginController superlayerForPluginView:]): 30 (-[WebPluginController stopOnePlugin:]): 31 (-[WebPluginController stopOnePluginForPageCache:]): 32 (-[WebPluginController destroyOnePlugin:]): 33 (-[WebPluginController startAllPlugins]): 34 (-[WebPluginController addPlugin:]): 35 (-[WebPluginController destroyPlugin:]): 36 (-[WebPluginController destroyAllPlugins]): 37 (-[WebPluginController processingUserGesture]): 38 (-[WebPluginController webPlugInContainerLoadRequest:inFrame:]): 39 (-[WebPluginController webPlugInContainerSelectionColor]): 40 * Plugins/WebPluginDatabase.mm: 41 (-[WebPluginDatabase refresh]): 42 (-[WebPluginDatabase _removePlugin:]): 43 * WebCoreSupport/WebApplicationCache.mm: 44 (+[WebApplicationCache initializeWithBundleIdentifier:]): 45 (webApplicationCacheStorage): 46 * WebCoreSupport/WebApplicationCacheQuotaManager.mm: 47 1 48 2019-09-30 Alex Christensen <achristensen@webkit.org> 2 49 -
trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm
r237266 r250556 52 52 #import <wtf/StdLibExtras.h> 53 53 54 using namespace WebCore;55 56 54 typedef HashMap<BackForwardList*, WebBackForwardList*> BackForwardListMap; 57 55 … … 167 165 NSMutableArray *entriesArray = [[NSMutableArray alloc] initWithCapacity:size]; 168 166 for (unsigned i = 0; i < size; ++i) 169 [entriesArray addObject:[kit(const_cast< HistoryItem*>(historyItems[i].ptr())) dictionaryRepresentationIncludingChildren:NO]];167 [entriesArray addObject:[kit(const_cast<WebCore::HistoryItem*>(historyItems[i].ptr())) dictionaryRepresentationIncludingChildren:NO]]; 170 168 171 169 NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys: … … 239 237 } 240 238 241 static NSArray* vectorToNSArray(Vector<Ref< HistoryItem>>& list)239 static NSArray* vectorToNSArray(Vector<Ref<WebCore::HistoryItem>>& list) 242 240 { 243 241 unsigned size = list.size(); … … 263 261 - (NSArray *)backListWithLimit:(int)limit 264 262 { 265 Vector<Ref< HistoryItem>> list;263 Vector<Ref<WebCore::HistoryItem>> list; 266 264 core(self)->backListWithLimit(limit, list); 267 265 NSArray *result = vectorToNSArray(list); … … 278 276 - (NSArray *)forwardListWithLimit:(int)limit 279 277 { 280 Vector<Ref< HistoryItem>> list;278 Vector<Ref<WebCore::HistoryItem>> list; 281 279 core(self)->forwardListWithLimit(limit, list); 282 280 NSArray *result = vectorToNSArray(list); … … 322 320 [result appendFormat:@"%2d) ", i]; 323 321 int currPos = [result length]; 324 [result appendString:[kit(const_cast< HistoryItem*>(entries[i].ptr())) description]];322 [result appendString:[kit(const_cast<WebCore::HistoryItem*>(entries[i].ptr())) description]]; 325 323 326 324 // shift all the contents over. a bit slow, but this is for debugging … … 343 341 - (NSUInteger)pageCacheSize 344 342 { 345 return [core(self)->webView() usesPageCache] ? PageCache::singleton().maxSize() : 0;343 return [core(self)->webView() usesPageCache] ? WebCore::PageCache::singleton().maxSize() : 0; 346 344 } 347 345 -
trunk/Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm
r248498 r250556 41 41 static NSString *serviceControlsPasteboardName = @"WebKitServiceControlsPasteboard"; 42 42 43 using namespace WebCore;44 45 43 WebSharingServicePickerClient::WebSharingServicePickerClient(WebView *webView) 46 44 : m_webView(webView) … … 52 50 } 53 51 54 Page* WebSharingServicePickerClient::pageForSharingServicePicker(WebSharingServicePickerController &)52 WebCore::Page* WebSharingServicePickerClient::pageForSharingServicePicker(WebSharingServicePickerController &) 55 53 { 56 54 return [m_webView page]; … … 62 60 } 63 61 64 FloatRect WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)65 { 66 return FloatRect();62 WebCore::FloatRect WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &) 63 { 64 return WebCore::FloatRect(); 67 65 } 68 66 … … 126 124 - (void)didShareImageData:(NSData *)data confirmDataIsValidTIFFData:(BOOL)confirmData 127 125 { 128 Page* page = _pickerClient->pageForSharingServicePicker(*self);126 auto* page = _pickerClient->pageForSharingServicePicker(*self); 129 127 if (!page) 130 128 return; … … 144 142 [pasteboard setData:data forType:NSPasteboardTypeTIFF]; 145 143 146 if ( Node* node = page->contextMenuController().context().hitTestResult().innerNode()) {147 if ( Frame* frame = node->document().frame())144 if (auto* node = page->contextMenuController().context().hitTestResult().innerNode()) { 145 if (auto* frame = node->document().frame()) 148 146 frame->editor().replaceNodeFromPasteboard(node, serviceControlsPasteboardName); 149 147 } … … 217 215 } 218 216 else if ([item isKindOfClass:[NSAttributedString class]]) { 219 Frame& frame = _pickerClient->pageForSharingServicePicker(*self)->focusController().focusedOrMainFrame();217 auto& frame = _pickerClient->pageForSharingServicePicker(*self)->focusController().focusedOrMainFrame(); 220 218 frame.editor().replaceSelectionWithAttributedString(item); 221 219 } else -
trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm
r238074 r250556 56 56 @end; 57 57 58 using namespace WebCore;59 60 58 @implementation WebBasePluginPackage 61 59 … … 156 154 continue; 157 155 158 MimeClassInfo mimeClassInfo;156 WebCore::MimeClassInfo mimeClassInfo; 159 157 160 158 NSArray *extensions = [[MIMEDictionary objectForKey:WebPluginExtensionsKey] _web_lowercaseStrings]; … … 187 185 188 186 pluginInfo.isApplicationPlugin = false; 189 pluginInfo.clientLoadPolicy = PluginLoadClientPolicyUndefined;187 pluginInfo.clientLoadPolicy = WebCore::PluginLoadClientPolicyUndefined; 190 188 #if PLATFORM(MAC) 191 189 pluginInfo.bundleIdentifier = self.bundleIdentifier; … … 217 215 } 218 216 219 - (const PluginInfo&)pluginInfo217 - (const WebCore::PluginInfo&)pluginInfo 220 218 { 221 219 return pluginInfo; -
trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm
r238074 r250556 46 46 #import <wtf/ObjCRuntimeExtras.h> 47 47 48 using namespace WebCore;49 50 48 #if PLATFORM(IOS_FAMILY) 51 49 @interface WebPluginController (SecretsIKnow) … … 85 83 } 86 84 87 - (void)_continueWithPolicy:( PolicyAction)policy85 - (void)_continueWithPolicy:(WebCore::PolicyAction)policy 88 86 { 89 87 if (_contextInfo) 90 wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);88 wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == WebCore::PolicyAction::Use), _contextInfo); 91 89 else 92 wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));90 wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == WebCore::PolicyAction::Use)); 93 91 94 92 // this will call indirectly call cancel … … 98 96 - (BOOL)_isForbiddenFileLoad 99 97 { 100 Frame* coreFrame = core([_controller webFrame]);98 auto* coreFrame = core([_controller webFrame]); 101 99 ASSERT(coreFrame); 102 100 if (!coreFrame->document()->securityOrigin().canDisplay([_request URL])) { 103 [self _continueWithPolicy: PolicyAction::Ignore];101 [self _continueWithPolicy:WebCore::PolicyAction::Ignore]; 104 102 return YES; 105 103 } -
trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm
r244223 r250556 75 75 #endif 76 76 77 using namespace WebCore;78 using namespace HTMLNames;79 80 77 @interface NSView (PluginSecrets) 81 78 - (void)setContainingWindow:(NSWindow *)w; … … 115 112 return; 116 113 117 AudioSession::sharedSession().setCategory(AudioSession::MediaPlayback,RouteSharingPolicy::Default);114 WebCore::AudioSession::sharedSession().setCategory(WebCore::AudioSession::MediaPlayback, WebCore::RouteSharingPolicy::Default); 118 115 } 119 116 #endif … … 134 131 { 135 132 WebView *webView = [_documentView _webView]; 136 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());133 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 137 134 view = [[webView _UIKitDelegateForwarder] webView:webView plugInViewWithArguments:arguments fromPlugInPackage:pluginPackage]; 138 135 } … … 140 137 Class viewFactory = [pluginPackage viewFactory]; 141 138 if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) { 142 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());139 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 143 140 view = [viewFactory plugInViewWithArguments:arguments]; 144 141 } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) { 145 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());142 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 146 143 view = [viewFactory pluginViewWithArguments:arguments]; 147 144 } … … 209 206 - (CALayer *)superlayerForPluginView:(NSView *)view 210 207 { 211 Frame* coreFrame = core([self webFrame]);212 FrameView* coreView = coreFrame ? coreFrame->view() : nullptr;208 auto* coreFrame = core([self webFrame]); 209 auto* coreView = coreFrame ? coreFrame->view() : nullptr; 213 210 if (!coreView) 214 211 return nil; 215 212 216 213 // Get a GraphicsLayer; 217 GraphicsLayer* layerForWidget = coreView->graphicsLayerForPlatformWidget(view);214 WebCore::GraphicsLayer* layerForWidget = coreView->graphicsLayerForPlatformWidget(view); 218 215 if (!layerForWidget) 219 216 return nil; … … 226 223 { 227 224 if ([view respondsToSelector:@selector(webPlugInStop)]) { 228 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());225 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 229 226 [view webPlugInStop]; 230 227 } else if ([view respondsToSelector:@selector(pluginStop)]) { 231 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());228 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 232 229 [view pluginStop]; 233 230 } … … 238 235 { 239 236 if ([view respondsToSelector:@selector(webPlugInStopForPageCache)]) { 240 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());237 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 241 238 [view webPlugInStopForPageCache]; 242 239 } else … … 248 245 { 249 246 if ([view respondsToSelector:@selector(webPlugInDestroy)]) { 250 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());247 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 251 248 [view webPlugInDestroy]; 252 249 } else if ([view respondsToSelector:@selector(pluginDestroy)]) { 253 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());250 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 254 251 [view pluginDestroy]; 255 252 } … … 268 265 id aView = [_views objectAtIndex:i]; 269 266 if ([aView respondsToSelector:@selector(webPlugInStart)]) { 270 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());267 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 271 268 [aView webPlugInStart]; 272 269 } else if ([aView respondsToSelector:@selector(pluginStart)]) { 273 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());270 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 274 271 [aView pluginStart]; 275 272 } … … 347 344 LOG(Plugins, "initializing plug-in %@", view); 348 345 if ([view respondsToSelector:@selector(webPlugInInitialize)]) { 349 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());346 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 350 347 [view webPlugInInitialize]; 351 348 } else if ([view respondsToSelector:@selector(pluginInitialize)]) { 352 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());349 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 353 350 [view pluginInitialize]; 354 351 } … … 362 359 LOG(Plugins, "starting plug-in %@", view); 363 360 if ([view respondsToSelector:@selector(webPlugInStart)]) { 364 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());361 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 365 362 [view webPlugInStart]; 366 363 } else if ([view respondsToSelector:@selector(pluginStart)]) { 367 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());364 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 368 365 [view pluginStart]; 369 366 } 370 367 371 368 if ([view respondsToSelector:@selector(setContainingWindow:)]) { 372 JSC::JSLock::DropAllLocks dropAllLocks( commonVM());369 JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM()); 373 370 [view setContainingWindow:[_documentView window]]; 374 371 } … … 385 382 386 383 #if ENABLE(NETSCAPE_PLUGIN_API) 387 if ( Frame* frame = core([self webFrame]))384 if (auto* frame = core([self webFrame])) 388 385 frame->script().cleanupScriptObjectsForPlugin(self); 389 386 #endif … … 433 430 434 431 #if ENABLE(NETSCAPE_PLUGIN_API) 435 if ( Frame* frame = core([self webFrame]))432 if (auto* frame = core([self webFrame])) 436 433 frame->script().cleanupScriptObjectsForPlugin(self); 437 434 #endif … … 457 454 - (BOOL)processingUserGesture 458 455 { 459 return UserGestureIndicator::processingUserGesture();456 return WebCore::UserGestureIndicator::processingUserGesture(); 460 457 } 461 458 #endif … … 500 497 return; 501 498 } 502 FrameLoadRequest frameLoadRequest { *core(frame), request,ShouldOpenExternalURLsPolicy::ShouldNotAllow };499 WebCore::FrameLoadRequest frameLoadRequest { *core(frame), request, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow }; 503 500 frameLoadRequest.setFrameName(target); 504 501 frameLoadRequest.setShouldCheckNewWindowPolicy(true); … … 540 537 { 541 538 bool primary = true; 542 if ( Frame* frame = core([self webFrame]))539 if (auto* frame = core([self webFrame])) 543 540 primary = frame->selection().isFocusedAndActive(); 544 541 return primary ? [NSColor selectedTextBackgroundColor] : [NSColor secondarySelectedControlColor]; -
trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm
r237266 r250556 50 50 #endif 51 51 52 using namespace WebCore;53 54 52 static void checkCandidate(WebBasePluginPackage **currentPlugin, WebBasePluginPackage **candidatePlugin); 55 53 … … 293 291 pluginEnumerator = [plugins objectEnumerator]; 294 292 while ((plugin = [pluginEnumerator nextObject])) { 295 const PluginInfo& pluginInfo = [plugin pluginInfo];293 const auto& pluginInfo = [plugin pluginInfo]; 296 294 for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) 297 295 [MIMETypes addObject:pluginInfo.mimes[i].type]; … … 441 439 442 440 // Unregister plug-in's MIME type registrations 443 const PluginInfo& pluginInfo = [plugin pluginInfo];441 const auto& pluginInfo = [plugin pluginInfo]; 444 442 for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) { 445 443 NSString *MIMEType = pluginInfo.mimes[i].type; -
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCache.mm
r237266 r250556 39 39 #endif 40 40 41 using namespace WebCore;42 43 41 @implementation WebApplicationCache 44 42 … … 55 53 return; 56 54 57 SQLiteDatabaseTracker::setClient(&WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());55 WebCore::SQLiteDatabaseTracker::setClient(&WebCore::WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient()); 58 56 59 57 ASSERT(!overrideBundleIdentifier); … … 140 138 WebCore::ApplicationCacheStorage& webApplicationCacheStorage() 141 139 { 142 static ApplicationCacheStorage& storage =ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef();140 static WebCore::ApplicationCacheStorage& storage = WebCore::ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef(); 143 141 144 142 return storage; -
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm
r211033 r250556 29 29 #import "WebSecurityOriginInternal.h" 30 30 #import <WebCore/ApplicationCacheStorage.h> 31 32 using namespace WebCore;33 31 34 32 @implementation WebApplicationCacheQuotaManager
Note:
See TracChangeset
for help on using the changeset viewer.