Title: [250556] trunk/Source/WebKitLegacy/mac
Revision
250556
Author
achristen...@apple.com
Date
2019-10-01 08:59:36 -0700 (Tue, 01 Oct 2019)

Log Message

Fix internal build after r250549
https://bugs.webkit.org/show_bug.cgi?id=202390

Remove some more "using namespace WebCore"

* History/WebBackForwardList.mm:
(-[WebBackForwardList dictionaryRepresentation]):
(vectorToNSArray):
(-[WebBackForwardList backListWithLimit:]):
(-[WebBackForwardList forwardListWithLimit:]):
(-[WebBackForwardList description]):
(-[WebBackForwardList pageCacheSize]):
* Misc/WebSharingServicePickerController.mm:
(WebSharingServicePickerClient::pageForSharingServicePicker):
(WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem):
(-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):
(-[WebSharingServicePickerController sharingService:didShareItems:]):
* Plugins/WebBasePluginPackage.mm:
(-[WebBasePluginPackage getPluginInfoFromPLists]):
(-[WebBasePluginPackage pluginInfo]):
* Plugins/WebPluginContainerCheck.mm:
(-[WebPluginContainerCheck _continueWithPolicy:]):
(-[WebPluginContainerCheck _isForbiddenFileLoad]):
* Plugins/WebPluginController.mm:
(initializeAudioSession):
(-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
(-[WebPluginController superlayerForPluginView:]):
(-[WebPluginController stopOnePlugin:]):
(-[WebPluginController stopOnePluginForPageCache:]):
(-[WebPluginController destroyOnePlugin:]):
(-[WebPluginController startAllPlugins]):
(-[WebPluginController addPlugin:]):
(-[WebPluginController destroyPlugin:]):
(-[WebPluginController destroyAllPlugins]):
(-[WebPluginController processingUserGesture]):
(-[WebPluginController webPlugInContainerLoadRequest:inFrame:]):
(-[WebPluginController webPlugInContainerSelectionColor]):
* Plugins/WebPluginDatabase.mm:
(-[WebPluginDatabase refresh]):
(-[WebPluginDatabase _removePlugin:]):
* WebCoreSupport/WebApplicationCache.mm:
(+[WebApplicationCache initializeWithBundleIdentifier:]):
(webApplicationCacheStorage):
* WebCoreSupport/WebApplicationCacheQuotaManager.mm:

Modified Paths

Diff

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2019-10-01 15:59:36 UTC (rev 250556)
@@ -1,3 +1,50 @@
+2019-10-01  Alex Christensen  <achristen...@webkit.org>
+
+        Fix internal build after r250549
+        https://bugs.webkit.org/show_bug.cgi?id=202390
+
+        Remove some more "using namespace WebCore"
+
+        * History/WebBackForwardList.mm:
+        (-[WebBackForwardList dictionaryRepresentation]):
+        (vectorToNSArray):
+        (-[WebBackForwardList backListWithLimit:]):
+        (-[WebBackForwardList forwardListWithLimit:]):
+        (-[WebBackForwardList description]):
+        (-[WebBackForwardList pageCacheSize]):
+        * Misc/WebSharingServicePickerController.mm:
+        (WebSharingServicePickerClient::pageForSharingServicePicker):
+        (WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem):
+        (-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):
+        (-[WebSharingServicePickerController sharingService:didShareItems:]):
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage getPluginInfoFromPLists]):
+        (-[WebBasePluginPackage pluginInfo]):
+        * Plugins/WebPluginContainerCheck.mm:
+        (-[WebPluginContainerCheck _continueWithPolicy:]):
+        (-[WebPluginContainerCheck _isForbiddenFileLoad]):
+        * Plugins/WebPluginController.mm:
+        (initializeAudioSession):
+        (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
+        (-[WebPluginController superlayerForPluginView:]):
+        (-[WebPluginController stopOnePlugin:]):
+        (-[WebPluginController stopOnePluginForPageCache:]):
+        (-[WebPluginController destroyOnePlugin:]):
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController addPlugin:]):
+        (-[WebPluginController destroyPlugin:]):
+        (-[WebPluginController destroyAllPlugins]):
+        (-[WebPluginController processingUserGesture]):
+        (-[WebPluginController webPlugInContainerLoadRequest:inFrame:]):
+        (-[WebPluginController webPlugInContainerSelectionColor]):
+        * Plugins/WebPluginDatabase.mm:
+        (-[WebPluginDatabase refresh]):
+        (-[WebPluginDatabase _removePlugin:]):
+        * WebCoreSupport/WebApplicationCache.mm:
+        (+[WebApplicationCache initializeWithBundleIdentifier:]):
+        (webApplicationCacheStorage):
+        * WebCoreSupport/WebApplicationCacheQuotaManager.mm:
+
 2019-09-30  Alex Christensen  <achristen...@webkit.org>
 
         Resurrect Mac CMake build

Modified: trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -51,8 +51,6 @@
 #import <wtf/RunLoop.h>
 #import <wtf/StdLibExtras.h>
 
-using namespace WebCore;
-
 typedef HashMap<BackForwardList*, WebBackForwardList*> BackForwardListMap;
 
 // FIXME: Instead of this we could just create a class derived from BackForwardList
@@ -166,7 +164,7 @@
     unsigned size = historyItems.size();
     NSMutableArray *entriesArray = [[NSMutableArray alloc] initWithCapacity:size];
     for (unsigned i = 0; i < size; ++i)
-        [entriesArray addObject:[kit(const_cast<HistoryItem*>(historyItems[i].ptr())) dictionaryRepresentationIncludingChildren:NO]];
+        [entriesArray addObject:[kit(const_cast<WebCore::HistoryItem*>(historyItems[i].ptr())) dictionaryRepresentationIncludingChildren:NO]];
     
     NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:
         entriesArray, WebBackForwardListDictionaryEntriesKey,
@@ -238,7 +236,7 @@
     return [[kit(core(self)->forwardItem().get()) retain] autorelease];
 }
 
-static NSArray* vectorToNSArray(Vector<Ref<HistoryItem>>& list)
+static NSArray* vectorToNSArray(Vector<Ref<WebCore::HistoryItem>>& list)
 {
     unsigned size = list.size();
     NSMutableArray *result = [[[NSMutableArray alloc] initWithCapacity:size] autorelease];
@@ -262,7 +260,7 @@
 
 - (NSArray *)backListWithLimit:(int)limit
 {
-    Vector<Ref<HistoryItem>> list;
+    Vector<Ref<WebCore::HistoryItem>> list;
     core(self)->backListWithLimit(limit, list);
     NSArray *result = vectorToNSArray(list);
     
@@ -277,7 +275,7 @@
 
 - (NSArray *)forwardListWithLimit:(int)limit
 {
-    Vector<Ref<HistoryItem>> list;
+    Vector<Ref<WebCore::HistoryItem>> list;
     core(self)->forwardListWithLimit(limit, list);
     NSArray *result = vectorToNSArray(list);
     
@@ -321,7 +319,7 @@
         }   
         [result appendFormat:@"%2d) ", i];
         int currPos = [result length];
-        [result appendString:[kit(const_cast<HistoryItem*>(entries[i].ptr())) description]];
+        [result appendString:[kit(const_cast<WebCore::HistoryItem*>(entries[i].ptr())) description]];
 
         // shift all the contents over.  a bit slow, but this is for debugging
         NSRange replRange = { static_cast<NSUInteger>(currPos), [result length] - currPos };
@@ -342,7 +340,7 @@
 
 - (NSUInteger)pageCacheSize
 {
-    return [core(self)->webView() usesPageCache] ? PageCache::singleton().maxSize() : 0;
+    return [core(self)->webView() usesPageCache] ? WebCore::PageCache::singleton().maxSize() : 0;
 }
 
 - (int)backListCount

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebSharingServicePickerController.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -40,8 +40,6 @@
 
 static NSString *serviceControlsPasteboardName = @"WebKitServiceControlsPasteboard";
 
-using namespace WebCore;
-
 WebSharingServicePickerClient::WebSharingServicePickerClient(WebView *webView)
     : m_webView(webView)
 {
@@ -51,7 +49,7 @@
 {
 }
 
-Page* WebSharingServicePickerClient::pageForSharingServicePicker(WebSharingServicePickerController &)
+WebCore::Page* WebSharingServicePickerClient::pageForSharingServicePicker(WebSharingServicePickerController &)
 {
     return [m_webView page];
 }
@@ -61,9 +59,9 @@
     return [m_webView window];
 }
 
-FloatRect WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
+WebCore::FloatRect WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
 {
-    return FloatRect();
+    return WebCore::FloatRect();
 }
 
 RetainPtr<NSImage> WebSharingServicePickerClient::imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
@@ -125,7 +123,7 @@
 
 - (void)didShareImageData:(NSData *)data confirmDataIsValidTIFFData:(BOOL)confirmData
 {
-    Page* page = _pickerClient->pageForSharingServicePicker(*self);
+    auto* page = _pickerClient->pageForSharingServicePicker(*self);
     if (!page)
         return;
 
@@ -143,8 +141,8 @@
     [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
     [pasteboard setData:data forType:NSPasteboardTypeTIFF];
 
-    if (Node* node = page->contextMenuController().context().hitTestResult().innerNode()) {
-        if (Frame* frame = node->document().frame())
+    if (auto* node = page->contextMenuController().context().hitTestResult().innerNode()) {
+        if (auto* frame = node->document().frame())
             frame->editor().replaceNodeFromPasteboard(node, serviceControlsPasteboardName);
     }
 
@@ -216,7 +214,7 @@
         }];
     }
     else if ([item isKindOfClass:[NSAttributedString class]]) {
-        Frame& frame = _pickerClient->pageForSharingServicePicker(*self)->focusController().focusedOrMainFrame();
+        auto& frame = _pickerClient->pageForSharingServicePicker(*self)->focusController().focusedOrMainFrame();
         frame.editor().replaceSelectionWithAttributedString(item);
     } else
         LOG_ERROR("sharingService:didShareItems: - Unknown item type returned\n");

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -55,8 +55,6 @@
 - (NSArray *)_web_lowercaseStrings;
 @end;
 
-using namespace WebCore;
-
 @implementation WebBasePluginPackage
 
 + (void)initialize
@@ -155,7 +153,7 @@
         if (isEnabled && [isEnabled boolValue] == NO)
             continue;
 
-        MimeClassInfo mimeClassInfo;
+        WebCore::MimeClassInfo mimeClassInfo;
         
         NSArray *extensions = [[MIMEDictionary objectForKey:WebPluginExtensionsKey] _web_lowercaseStrings];
         for (NSString *extension in extensions) {
@@ -186,7 +184,7 @@
     pluginInfo.desc = description;
 
     pluginInfo.isApplicationPlugin = false;
-    pluginInfo.clientLoadPolicy = PluginLoadClientPolicyUndefined;
+    pluginInfo.clientLoadPolicy = WebCore::PluginLoadClientPolicyUndefined;
 #if PLATFORM(MAC)
     pluginInfo.bundleIdentifier = self.bundleIdentifier;
     pluginInfo.versionString = self.bundleVersion;
@@ -216,7 +214,7 @@
     return path;
 }
 
-- (const PluginInfo&)pluginInfo
+- (const WebCore::PluginInfo&)pluginInfo
 {
     return pluginInfo;
 }

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -45,8 +45,6 @@
 #import <wtf/Assertions.h>
 #import <wtf/ObjCRuntimeExtras.h>
 
-using namespace WebCore;
-
 #if PLATFORM(IOS_FAMILY)
 @interface WebPluginController (SecretsIKnow)
 - (WebFrame *)webFrame; // FIXME: This file calls -[WebPluginController webFrame], which is not declared in WebPluginController.h.  Merge issue?  Are the plug-in files out of date?
@@ -84,12 +82,12 @@
     [super dealloc];
 }
 
-- (void)_continueWithPolicy:(PolicyAction)policy
+- (void)_continueWithPolicy:(WebCore::PolicyAction)policy
 {
     if (_contextInfo)
-        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
+        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == WebCore::PolicyAction::Use), _contextInfo);
     else     
-        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
+        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == WebCore::PolicyAction::Use));
 
     // this will call indirectly call cancel
     [_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];
@@ -97,10 +95,10 @@
 
 - (BOOL)_isForbiddenFileLoad
 {
-    Frame* coreFrame = core([_controller webFrame]);
+    auto* coreFrame = core([_controller webFrame]);
     ASSERT(coreFrame);
     if (!coreFrame->document()->securityOrigin().canDisplay([_request URL])) {
-        [self _continueWithPolicy:PolicyAction::Ignore];
+        [self _continueWithPolicy:WebCore::PolicyAction::Ignore];
         return YES;
     }
 

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -74,9 +74,6 @@
 #import <wtf/SoftLinking.h>
 #endif
 
-using namespace WebCore;
-using namespace HTMLNames;
-
 @interface NSView (PluginSecrets)
 - (void)setContainingWindow:(NSWindow *)w;
 @end
@@ -114,7 +111,7 @@
     if (!WebCore::IOSApplication::isMobileSafari())
         return;
 
-    AudioSession::sharedSession().setCategory(AudioSession::MediaPlayback, RouteSharingPolicy::Default);
+    WebCore::AudioSession::sharedSession().setCategory(WebCore::AudioSession::MediaPlayback, WebCore::RouteSharingPolicy::Default);
 }
 #endif
 
@@ -133,16 +130,16 @@
 #if PLATFORM(IOS_FAMILY)
     {
         WebView *webView = [_documentView _webView];
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         view = [[webView _UIKitDelegateForwarder] webView:webView plugInViewWithArguments:arguments fromPlugInPackage:pluginPackage];
     }
 #else
     Class viewFactory = [pluginPackage viewFactory];
     if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         view = [viewFactory plugInViewWithArguments:arguments];
     } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         view = [viewFactory pluginViewWithArguments:arguments];
     }
 #endif
@@ -208,13 +205,13 @@
 
 - (CALayer *)superlayerForPluginView:(NSView *)view
 {
-    Frame* coreFrame = core([self webFrame]);
-    FrameView* coreView = coreFrame ? coreFrame->view() : nullptr;
+    auto* coreFrame = core([self webFrame]);
+    auto* coreView = coreFrame ? coreFrame->view() : nullptr;
     if (!coreView)
         return nil;
 
     // Get a GraphicsLayer;
-    GraphicsLayer* layerForWidget = coreView->graphicsLayerForPlatformWidget(view);
+    WebCore::GraphicsLayer* layerForWidget = coreView->graphicsLayerForPlatformWidget(view);
     if (!layerForWidget)
         return nil;
     
@@ -225,10 +222,10 @@
 - (void)stopOnePlugin:(NSView *)view
 {
     if ([view respondsToSelector:@selector(webPlugInStop)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         [view webPlugInStop];
     } else if ([view respondsToSelector:@selector(pluginStop)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         [view pluginStop];
     }
 }
@@ -237,7 +234,7 @@
 - (void)stopOnePluginForPageCache:(NSView *)view
 {
     if ([view respondsToSelector:@selector(webPlugInStopForPageCache)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         [view webPlugInStopForPageCache];
     } else
         [self stopOnePlugin:view];
@@ -247,10 +244,10 @@
 - (void)destroyOnePlugin:(NSView *)view
 {
     if ([view respondsToSelector:@selector(webPlugInDestroy)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         [view webPlugInDestroy];
     } else if ([view respondsToSelector:@selector(pluginDestroy)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+        JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
         [view pluginDestroy];
     }
 }
@@ -267,10 +264,10 @@
     for (int i = 0; i < count; i++) {
         id aView = [_views objectAtIndex:i];
         if ([aView respondsToSelector:@selector(webPlugInStart)]) {
-            JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+            JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
             [aView webPlugInStart];
         } else if ([aView respondsToSelector:@selector(pluginStart)]) {
-            JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+            JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
             [aView pluginStart];
         }
     }
@@ -346,10 +343,10 @@
 
         LOG(Plugins, "initializing plug-in %@", view);
         if ([view respondsToSelector:@selector(webPlugInInitialize)]) {
-            JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+            JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
             [view webPlugInInitialize];
         } else if ([view respondsToSelector:@selector(pluginInitialize)]) {
-            JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+            JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
             [view pluginInitialize];
         }
 
@@ -361,15 +358,15 @@
         if (_started) {
             LOG(Plugins, "starting plug-in %@", view);
             if ([view respondsToSelector:@selector(webPlugInStart)]) {
-                JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+                JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
                 [view webPlugInStart];
             } else if ([view respondsToSelector:@selector(pluginStart)]) {
-                JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+                JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
                 [view pluginStart];
             }
             
             if ([view respondsToSelector:@selector(setContainingWindow:)]) {
-                JSC::JSLock::DropAllLocks dropAllLocks(commonVM());
+                JSC::JSLock::DropAllLocks dropAllLocks(WebCore::commonVM());
                 [view setContainingWindow:[_documentView window]];
             }
         }
@@ -384,7 +381,7 @@
         [self destroyOnePlugin:view];
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-        if (Frame* frame = core([self webFrame]))
+        if (auto* frame = core([self webFrame]))
             frame->script().cleanupScriptObjectsForPlugin(self);
 #endif
         
@@ -432,7 +429,7 @@
         [self destroyOnePlugin:aView];
         
 #if ENABLE(NETSCAPE_PLUGIN_API)
-        if (Frame* frame = core([self webFrame]))
+        if (auto* frame = core([self webFrame]))
             frame->script().cleanupScriptObjectsForPlugin(self);
 #endif
         
@@ -456,7 +453,7 @@
 #if PLATFORM(IOS_FAMILY)
 - (BOOL)processingUserGesture
 {
-    return UserGestureIndicator::processingUserGesture();
+    return WebCore::UserGestureIndicator::processingUserGesture();
 }
 #endif
 
@@ -499,7 +496,7 @@
             LOG_ERROR("could not load URL %@", [request URL]);
             return;
         }
-        FrameLoadRequest frameLoadRequest { *core(frame), request, ShouldOpenExternalURLsPolicy::ShouldNotAllow };
+        WebCore::FrameLoadRequest frameLoadRequest { *core(frame), request, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow };
         frameLoadRequest.setFrameName(target);
         frameLoadRequest.setShouldCheckNewWindowPolicy(true);
         core(frame)->loader().load(WTFMove(frameLoadRequest));
@@ -539,7 +536,7 @@
 - (NSColor *)webPlugInContainerSelectionColor
 {
     bool primary = true;
-    if (Frame* frame = core([self webFrame]))
+    if (auto* frame = core([self webFrame]))
         primary = frame->selection().isFocusedAndActive();
     return primary ? [NSColor selectedTextBackgroundColor] : [NSColor secondarySelectedControlColor];
 }

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -49,8 +49,6 @@
 #import "WebUIKitSupport.h"
 #endif
 
-using namespace WebCore;
-
 static void checkCandidate(WebBasePluginPackage **currentPlugin, WebBasePluginPackage **candidatePlugin);
 
 @interface WebPluginDatabase (Internal)
@@ -292,7 +290,7 @@
         NSMutableSet *MIMETypes = [[NSMutableSet alloc] init];
         pluginEnumerator = [plugins objectEnumerator];
         while ((plugin = [pluginEnumerator nextObject])) {
-            const PluginInfo& pluginInfo = [plugin pluginInfo];
+            const auto& pluginInfo = [plugin pluginInfo];
             for (size_t i = 0; i < pluginInfo.mimes.size(); ++i)
                 [MIMETypes addObject:pluginInfo.mimes[i].type];
         }
@@ -440,7 +438,7 @@
     ASSERT(plugin);
 
     // Unregister plug-in's MIME type registrations
-    const PluginInfo& pluginInfo = [plugin pluginInfo];
+    const auto& pluginInfo = [plugin pluginInfo];
     for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
         NSString *MIMEType = pluginInfo.mimes[i].type;
 

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCache.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCache.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCache.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -38,8 +38,6 @@
 #import <WebCore/WebSQLiteDatabaseTrackerClient.h>
 #endif
 
-using namespace WebCore;
-
 @implementation WebApplicationCache
 
 #if PLATFORM(IOS_FAMILY)
@@ -54,7 +52,7 @@
     if (initialized)
         return;
 
-    SQLiteDatabaseTracker::setClient(&WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
+    WebCore::SQLiteDatabaseTracker::setClient(&WebCore::WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
 
     ASSERT(!overrideBundleIdentifier);
     overrideBundleIdentifier = [bundleIdentifier copy];
@@ -139,7 +137,7 @@
 
 WebCore::ApplicationCacheStorage& webApplicationCacheStorage()
 {
-    static ApplicationCacheStorage& storage = ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef();
+    static WebCore::ApplicationCacheStorage& storage = WebCore::ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef();
 
     return storage;
 }

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm (250555 => 250556)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm	2019-10-01 15:24:59 UTC (rev 250555)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm	2019-10-01 15:59:36 UTC (rev 250556)
@@ -29,8 +29,6 @@
 #import "WebSecurityOriginInternal.h"
 #import <WebCore/ApplicationCacheStorage.h>
 
-using namespace WebCore;
-
 @implementation WebApplicationCacheQuotaManager
 
 - (id)initWithOrigin:(WebSecurityOrigin *)origin
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to