[meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for...
authorcfleizach@apple.com <cfleizach@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2018 19:15:58 +0000 (19:15 +0000)
committercfleizach@apple.com <cfleizach@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2018 19:15:58 +0000 (19:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=192449
<rdar://problem/46595508>

Reviewed by Darin Adler.

Part 1: Files in Shared folder.

* Shared/API/c/WKRenderLayer.cpp:
(WKRenderLayerGetFrameContentsLayer):
* Shared/API/c/cf/WKErrorCF.cpp:
(WKErrorCreateWithCFError):
(WKErrorCopyCFError):
* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateCGImage):
(WKImageCreateFromCGImage):
* Shared/API/c/mac/WKWebArchive.cpp:
(WKWebArchiveGetTypeID):
(WKWebArchiveCreate):
(WKWebArchiveCreateWithData):
(WKWebArchiveCreateFromRange):
(WKWebArchiveCopyMainResource):
(WKWebArchiveCopySubresources):
(WKWebArchiveCopySubframeArchives):
(WKWebArchiveCopyData):
* Shared/API/c/mac/WKWebArchiveResource.cpp:
(WKWebArchiveResourceGetTypeID):
(WKWebArchiveResourceCreate):
(WKWebArchiveResourceCopyData):
(WKWebArchiveResourceCopyURL):
(WKWebArchiveResourceCopyMIMEType):
(WKWebArchiveResourceCopyTextEncoding):
* Shared/ChildProcess.cpp:
* Shared/ContextMenuContextData.cpp:
* Shared/EditorState.cpp:
* Shared/Plugins/NPIdentifierData.cpp:
* Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
* Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
* Shared/SessionState.cpp:
* Shared/SessionTracker.cpp:
* Shared/ShareableBitmap.cpp:
* Shared/ShareableResource.cpp:
* Shared/VisibleContentRectUpdateInfo.cpp:
* Shared/WebBackForwardListItem.cpp:
* Shared/WebContextMenuItemData.cpp:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebHitTestResultData.cpp:
* Shared/WebImage.cpp:
* Shared/WebMediaSessionMetadata.cpp:
* Shared/WebMemorySampler.cpp:
* Shared/WebMouseEvent.cpp:
* Shared/WebRenderObject.cpp:
* Shared/WebSQLiteDatabaseTracker.cpp:
* Shared/WebWheelEvent.cpp:
* Shared/cf/ArgumentCodersCF.cpp:
* Shared/ios/WebPlatformTouchPointIOS.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

30 files changed:
Source/WebKit/ChangeLog
Source/WebKit/Shared/API/c/WKRenderLayer.cpp
Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp
Source/WebKit/Shared/API/c/cg/WKImageCG.cpp
Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp
Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp
Source/WebKit/Shared/ChildProcess.cpp
Source/WebKit/Shared/ContextMenuContextData.cpp
Source/WebKit/Shared/EditorState.cpp
Source/WebKit/Shared/Plugins/NPIdentifierData.cpp
Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
Source/WebKit/Shared/SessionState.cpp
Source/WebKit/Shared/SessionTracker.cpp
Source/WebKit/Shared/ShareableBitmap.cpp
Source/WebKit/Shared/ShareableResource.cpp
Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp
Source/WebKit/Shared/WebBackForwardListItem.cpp
Source/WebKit/Shared/WebContextMenuItemData.cpp
Source/WebKit/Shared/WebCoreArgumentCoders.cpp
Source/WebKit/Shared/WebHitTestResultData.cpp
Source/WebKit/Shared/WebImage.cpp
Source/WebKit/Shared/WebMediaSessionMetadata.cpp
Source/WebKit/Shared/WebMemorySampler.cpp
Source/WebKit/Shared/WebMouseEvent.cpp
Source/WebKit/Shared/WebRenderObject.cpp
Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp
Source/WebKit/Shared/WebWheelEvent.cpp
Source/WebKit/Shared/cf/ArgumentCodersCF.cpp
Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp

index df7fab4..896920c 100644 (file)
@@ -1,3 +1,80 @@
+2018-12-12  Chris Fleizach  <cfleizach@apple.com>
+
+        [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
+        https://bugs.webkit.org/show_bug.cgi?id=192449
+        <rdar://problem/46595508>
+
+        Reviewed by Darin Adler.
+
+        Part 1: Files in Shared folder.
+
+        * Shared/API/c/WKRenderLayer.cpp:
+        (WKRenderLayerGetFrameContentsLayer):
+        * Shared/API/c/cf/WKErrorCF.cpp:
+        (WKErrorCreateWithCFError):
+        (WKErrorCopyCFError):
+        * Shared/API/c/cg/WKImageCG.cpp:
+        (WKImageCreateCGImage):
+        (WKImageCreateFromCGImage):
+        * Shared/API/c/mac/WKWebArchive.cpp:
+        (WKWebArchiveGetTypeID):
+        (WKWebArchiveCreate):
+        (WKWebArchiveCreateWithData):
+        (WKWebArchiveCreateFromRange):
+        (WKWebArchiveCopyMainResource):
+        (WKWebArchiveCopySubresources):
+        (WKWebArchiveCopySubframeArchives):
+        (WKWebArchiveCopyData):
+        * Shared/API/c/mac/WKWebArchiveResource.cpp:
+        (WKWebArchiveResourceGetTypeID):
+        (WKWebArchiveResourceCreate):
+        (WKWebArchiveResourceCopyData):
+        (WKWebArchiveResourceCopyURL):
+        (WKWebArchiveResourceCopyMIMEType):
+        (WKWebArchiveResourceCopyTextEncoding):
+        * Shared/ChildProcess.cpp:
+        * Shared/ContextMenuContextData.cpp:
+        * Shared/EditorState.cpp:
+        * Shared/Plugins/NPIdentifierData.cpp:
+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
+        * Shared/SessionState.cpp:
+        * Shared/SessionTracker.cpp:
+        * Shared/ShareableBitmap.cpp:
+        * Shared/ShareableResource.cpp:
+        * Shared/VisibleContentRectUpdateInfo.cpp:
+        * Shared/WebBackForwardListItem.cpp:
+        * Shared/WebContextMenuItemData.cpp:
+        * Shared/WebCoreArgumentCoders.cpp:
+        * Shared/WebHitTestResultData.cpp:
+        * Shared/WebImage.cpp:
+        * Shared/WebMediaSessionMetadata.cpp:
+        * Shared/WebMemorySampler.cpp:
+        * Shared/WebMouseEvent.cpp:
+        * Shared/WebRenderObject.cpp:
+        * Shared/WebSQLiteDatabaseTracker.cpp:
+        * Shared/WebWheelEvent.cpp:
+        * Shared/cf/ArgumentCodersCF.cpp:
+        * Shared/ios/WebPlatformTouchPointIOS.cpp:
+
+2018-12-12  Chris Fleizach  <cfleizach@apple.com>
+
+        [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
+        https://bugs.webkit.org/show_bug.cgi?id=192449
+        <rdar://problem/46595508>
+
+        Reviewed by Darin Adler.
+
+        Part 1: Files in NetworkProcess.
+
+        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
+        * NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+        * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+        * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
+        * NetworkProcess/ios/NetworkProcessIOS.mm:
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        * NetworkProcess/mac/RemoteNetworkingContext.mm:
+
 2018-12-12  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed build with with recent macOS SDKs.
index 94c85e9..1aa1502 100644 (file)
@@ -130,5 +130,5 @@ WKArrayRef WKRenderLayerGetPositiveZOrderList(WKRenderLayerRef renderLayerRef)
 
 WKRenderLayerRef WKRenderLayerGetFrameContentsLayer(WKRenderLayerRef renderLayerRef)
 {
-    return toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
+    return WebKit::toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
 }
index 39ad959..f5335fa 100644 (file)
 #include "APIError.h"
 #include "WKAPICast.h"
 
-using namespace WebCore;
-using namespace WebKit;
-
 WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError)
 {
-    return toAPI(&API::Error::create(ResourceError(cfError)).leakRef());
+    return WebKit::toAPI(&API::Error::create(WebCore::ResourceError(cfError)).leakRef());
 }
 
 CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error)
 {
-    RetainPtr<CFErrorRef> cfError = toImpl(error)->platformError().cfError();
+    WTF::RetainPtr<CFErrorRef> cfError = WebKit::toImpl(error)->platformError().cfError();
     return cfError.leakRef();
 }
+
index 1547e22..466fffd 100644 (file)
 #include <WebCore/ColorSpace.h>
 #include <WebCore/GraphicsContext.h>
 
-using namespace WebKit;
-using namespace WebCore;
-
 CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
 {
-    WebImage* webImage = toImpl(imageRef);
+    WebKit::WebImage* webImage = WebKit::toImpl(imageRef);
     if (!webImage)
         return nullptr;
 
@@ -49,12 +46,13 @@ WKImageRef WKImageCreateFromCGImage(CGImageRef imageRef, WKImageOptions options)
     if (!imageRef)
         return nullptr;
     
-    IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
-    auto webImage = WebImage::create(imageSize, toImageOptions(options));
+    WebCore::IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
+    auto webImage = WebKit::WebImage::create(imageSize, WebKit::toImageOptions(options));
 
     auto graphicsContext = webImage->bitmap().createGraphicsContext();
-    FloatRect rect(FloatPoint(0, 0), imageSize);
+    WebCore::FloatRect rect(WebCore::FloatPoint(0, 0), imageSize);
     graphicsContext->clearRect(rect);
     graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
     return toAPI(webImage.leakRef());
 }
+
index e6aa24e..c4f0fc0 100644 (file)
 #include "WKBundleAPICast.h"
 #include "WKSharedAPICast.h"
 
-using namespace WebKit;
-
 WKTypeID WKWebArchiveGetTypeID()
 {
-    return toAPI(API::WebArchive::APIType);
+    return WebKit::toAPI(API::WebArchive::APIType);
 }
 
 WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResourceRef, WKArrayRef subresourcesRef, WKArrayRef subframeArchivesRef)
 {
-    auto webArchive = API::WebArchive::create(toImpl(mainResourceRef), toImpl(subresourcesRef), toImpl(subframeArchivesRef));
-    return toAPI(&webArchive.leakRef());
+    auto webArchive = API::WebArchive::create(WebKit::toImpl(mainResourceRef), WebKit::toImpl(subresourcesRef), WebKit::toImpl(subframeArchivesRef));
+    return WebKit::toAPI(&webArchive.leakRef());
 }
 
 WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef dataRef)
 {
-    auto webArchive = API::WebArchive::create(toImpl(dataRef));
-    return toAPI(&webArchive.leakRef());
+    auto webArchive = API::WebArchive::create(WebKit::toImpl(dataRef));
+    return WebKit::toAPI(&webArchive.leakRef());
 }
 
 WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef rangeHandleRef)
 {
-    auto webArchive = API::WebArchive::create(toImpl(rangeHandleRef)->coreRange());
-    return toAPI(&webArchive.leakRef());
+    auto webArchive = API::WebArchive::create(WebKit::toImpl(rangeHandleRef)->coreRange());
+    return WebKit::toAPI(&webArchive.leakRef());
 }
 
 WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchiveRef)
 {
-    RefPtr<API::WebArchiveResource> mainResource = toImpl(webArchiveRef)->mainResource();
-    return toAPI(mainResource.leakRef());
+    RefPtr<API::WebArchiveResource> mainResource = WebKit::toImpl(webArchiveRef)->mainResource();
+    return WebKit::toAPI(mainResource.leakRef());
 }
 
 WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchiveRef)
 {
-    RefPtr<API::Array> subresources = toImpl(webArchiveRef)->subresources();
-    return toAPI(subresources.leakRef());
+    RefPtr<API::Array> subresources = WebKit::toImpl(webArchiveRef)->subresources();
+    return WebKit::toAPI(subresources.leakRef());
 }
 
 WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchiveRef)
 {
-    RefPtr<API::Array> subframeArchives = toImpl(webArchiveRef)->subframeArchives();
-    return toAPI(subframeArchives.leakRef());
+    RefPtr<API::Array> subframeArchives = WebKit::toImpl(webArchiveRef)->subframeArchives();
+    return WebKit::toAPI(subframeArchives.leakRef());
 }
 
 WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef)
 {
-    return toAPI(&toImpl(webArchiveRef)->data().leakRef());
+    return WebKit::toAPI(&WebKit::toImpl(webArchiveRef)->data().leakRef());
 }
index c819c02..8b211b0 100644 (file)
 #include "APIWebArchiveResource.h"
 #include "WKSharedAPICast.h"
 
-using namespace WebKit;
-
 WKTypeID WKWebArchiveResourceGetTypeID()
 {
-    return toAPI(API::WebArchiveResource::APIType);
+    return WebKit::toAPI(API::WebArchiveResource::APIType);
 }
 
 WKWebArchiveResourceRef WKWebArchiveResourceCreate(WKDataRef dataRef, WKURLRef URLRef, WKStringRef MIMETypeRef, WKStringRef textEncodingRef)
 {
-    auto webArchiveResource = API::WebArchiveResource::create(toImpl(dataRef), toWTFString(URLRef), toWTFString(MIMETypeRef), toWTFString(textEncodingRef));
-    return toAPI(&webArchiveResource.leakRef());
+    auto webArchiveResource = API::WebArchiveResource::create(WebKit::toImpl(dataRef), WebKit::toWTFString(URLRef), WebKit::toWTFString(MIMETypeRef), WebKit::toWTFString(textEncodingRef));
+    return WebKit::toAPI(&webArchiveResource.leakRef());
 }
 
 WKDataRef WKWebArchiveResourceCopyData(WKWebArchiveResourceRef webArchiveResourceRef)
 {
-    return toAPI(&toImpl(webArchiveResourceRef)->data().leakRef());
+    return WebKit::toAPI(&WebKit::toImpl(webArchiveResourceRef)->data().leakRef());
 }
 
 WKURLRef WKWebArchiveResourceCopyURL(WKWebArchiveResourceRef webArchiveResourceRef)
 {
-    return toCopiedURLAPI(toImpl(webArchiveResourceRef)->URL());
+    return WebKit::toCopiedURLAPI(WebKit::toImpl(webArchiveResourceRef)->URL());
 }
 
 WKStringRef WKWebArchiveResourceCopyMIMEType(WKWebArchiveResourceRef webArchiveResourceRef)
 {
-    return toCopiedAPI(toImpl(webArchiveResourceRef)->MIMEType());
+    return WebKit::toCopiedAPI(WebKit::toImpl(webArchiveResourceRef)->MIMEType());
 }
 
 WKStringRef WKWebArchiveResourceCopyTextEncoding(WKWebArchiveResourceRef webArchiveResourceRef)
 {
-    return toCopiedAPI(toImpl(webArchiveResourceRef)->textEncoding());
+    return WebKit::toCopiedAPI(WebKit::toImpl(webArchiveResourceRef)->textEncoding());
 }
index f168e2e..7184e58 100644 (file)
@@ -39,9 +39,8 @@
 #include <wtf/MemoryPressureHandler.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 ChildProcess::ChildProcess()
     : m_terminationCounter(0)
index 7922088..dffb7a8 100644 (file)
@@ -33,9 +33,8 @@
 #include <WebCore/ContextMenuContext.h>
 #include <WebCore/GraphicsContext.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 ContextMenuContextData::ContextMenuContextData()
     : m_type(Type::ContextMenu)
index 0a2ba7f..c8c8f89 100644 (file)
@@ -29,9 +29,8 @@
 #include "WebCoreArgumentCoders.h"
 #include <wtf/text/TextStream.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void EditorState::encode(IPC::Encoder& encoder) const
 {
index 75d6093..925171e 100644 (file)
@@ -33,9 +33,8 @@
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/IdentifierRep.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 NPIdentifierData::NPIdentifierData()
     : m_isString(false)
index 6da1dd2..8217371 100644 (file)
@@ -77,9 +77,8 @@
 @end
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static CGColorRef cgColorFromColor(const Color& color)
 {
index 9af089d..cad76bb 100644 (file)
 #include <wtf/text/CString.h>
 #include <wtf/text/TextStream.h>
 
-using namespace WebCore;
-
 #if ENABLE(ASYNC_SCROLLING)
 
 namespace IPC {
+using namespace WebCore;
 
 template<> struct ArgumentCoder<ScrollingStateNode> {
     static void encode(Encoder&, const ScrollingStateNode&);
index ee21d65..c2c2a3a 100644 (file)
@@ -29,9 +29,8 @@
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/BackForwardItemIdentifier.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy policy)
 {
index 8813b70..b2abd4d 100644 (file)
@@ -31,9 +31,8 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RunLoop.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static String& identifierBase()
 {
index 4fcf4d3..8fc5ad6 100644 (file)
 #include "WebCoreArgumentCoders.h"
 #include <WebCore/GraphicsContext.h>
 
-using namespace WebCore;
-
 namespace WebKit {
-
+using namespace WebCore;
+    
 ShareableBitmap::Handle::Handle()
 {
 }
index d147d80..232f649 100644 (file)
@@ -31,9 +31,8 @@
 #include "ArgumentCoders.h"
 #include <WebCore/SharedBuffer.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 ShareableResource::Handle::Handle()
 {
index 04150c1..2ee8d96 100644 (file)
@@ -30,9 +30,8 @@
 #include <WebCore/LengthBox.h>
 #include <wtf/text/TextStream.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const
 {
index e18125f..644fffc 100644 (file)
@@ -32,9 +32,8 @@
 #include <wtf/DebugUtilities.h>
 #include <wtf/URL.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)
 {
index 2a65ac4..fdb4499 100644 (file)
@@ -34,9 +34,8 @@
 #include <wtf/text/CString.h>
 #include <WebCore/ContextMenu.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebContextMenuItemData::WebContextMenuItemData()
     : m_type(WebCore::ActionType)
index 2c63c6f..ad227c2 100644 (file)
 #include <WebCore/MediaConstraints.h>
 #endif
 
+namespace IPC {
 using namespace WebCore;
 using namespace WebKit;
 
-namespace IPC {
-
 static void encodeSharedBuffer(Encoder& encoder, const SharedBuffer* buffer)
 {
     SharedMemory::Handle handle;
index c1cfccf..ada3f51 100644 (file)
@@ -31,9 +31,8 @@
 #include <wtf/URL.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebHitTestResultData::WebHitTestResultData()
 {
index d943dbf..99c953c 100644 (file)
@@ -26,9 +26,8 @@
 #include "config.h"
 #include "WebImage.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
 {
index c03d173..8fc1fde 100644 (file)
@@ -28,9 +28,8 @@
 
 #if ENABLE(MEDIA_SESSION)
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata)
 {
index f6c792c..2b85200 100644 (file)
@@ -33,9 +33,8 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const char separator = '\t';
 
index 17ba5c4..62ae732 100644 (file)
@@ -28,9 +28,8 @@
 
 #include "WebCoreArgumentCoders.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebMouseEvent::WebMouseEvent()
     : WebEvent()
index 1e2aab2..1da4c69 100644 (file)
@@ -37,9 +37,8 @@
 #include <WebCore/RenderView.h>
 #include <WebCore/RenderWidget.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 RefPtr<WebRenderObject> WebRenderObject::create(WebPage* page)
 {
index fb691b1..72387a2 100644 (file)
@@ -33,9 +33,8 @@
 #include <WebCore/SQLiteDatabaseTracker.h>
 #include <wtf/MainThread.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)
     : m_process(process)
index 4e13e89..ba10e90 100644 (file)
@@ -28,9 +28,8 @@
 
 #include "WebCoreArgumentCoders.h"
 
-using namespace WebCore;
-
 namespace WebKit {    
+using namespace WebCore;
 
 WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Modifiers modifiers, WallTime timestamp)
     : WebEvent(type, modifiers, timestamp)
index f8f7296..00be161 100644 (file)
@@ -63,9 +63,8 @@ extern "C" SecAccessControlRef SecAccessControlCreateFromData(CFAllocatorRef all
 extern "C" CFDataRef SecAccessControlCopyData(SecAccessControlRef access_control);
 #endif
 
-using namespace WebCore;
-
 namespace IPC {
+using namespace WebCore;
 
 CFTypeRef tokenNullTypeRef()
 {
index 8b0b3fb..47dd9a0 100644 (file)
@@ -30,9 +30,8 @@
 
 #include "WebCoreArgumentCoders.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const
 {