Attachment 357145 Details for Bug 192449 – patch, part 1

[patch] patch, part 1

patch (text/plain), 23.46 KB, created by chris fleizach on 2018-12-12 09:45:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-12-12 09:45:54 PST

Size: 23.46 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239108)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -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-09  Darin Adler  <darin@apple.com>
> 
>         [iOS] Zero memory containing the password for PDF documents when a WKPDFView is deallocated
>Index: Source/WebKit/Shared/API/c/WKRenderLayer.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/WKRenderLayer.cpp	(revision 239075)
>+++ Source/WebKit/Shared/API/c/WKRenderLayer.cpp	(working copy)
>@@ -130,5 +130,5 @@
> 
> WKRenderLayerRef WKRenderLayerGetFrameContentsLayer(WKRenderLayerRef renderLayerRef)
> {
>-    return toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
>+    return WebKit::toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
> }
>Index: Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp	(revision 239075)
>+++ Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp	(working copy)
>@@ -29,16 +29,14 @@
> #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: Source/WebKit/Shared/API/c/cg/WKImageCG.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(revision 239075)
>+++ Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(working copy)
>@@ -32,12 +32,9 @@
> #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 @@
>     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: Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp	(revision 239075)
>+++ Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp	(working copy)
>@@ -34,50 +34,48 @@
> #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: Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp	(revision 239075)
>+++ Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp	(working copy)
>@@ -30,35 +30,33 @@
> #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: Source/WebKit/Shared/ChildProcess.cpp
>===================================================================
>--- Source/WebKit/Shared/ChildProcess.cpp	(revision 239075)
>+++ Source/WebKit/Shared/ChildProcess.cpp	(working copy)
>@@ -39,10 +39,9 @@
> #include <wtf/MemoryPressureHandler.h>
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ChildProcess::ChildProcess()
>     : m_terminationCounter(0)
>     , m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired)
>Index: Source/WebKit/Shared/ContextMenuContextData.cpp
>===================================================================
>--- Source/WebKit/Shared/ContextMenuContextData.cpp	(revision 239075)
>+++ Source/WebKit/Shared/ContextMenuContextData.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <WebCore/ContextMenuContext.h>
> #include <WebCore/GraphicsContext.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ContextMenuContextData::ContextMenuContextData()
>     : m_type(Type::ContextMenu)
> #if ENABLE(SERVICE_CONTROLS)
>Index: Source/WebKit/Shared/EditorState.cpp
>===================================================================
>--- Source/WebKit/Shared/EditorState.cpp	(revision 239075)
>+++ Source/WebKit/Shared/EditorState.cpp	(working copy)
>@@ -29,10 +29,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <wtf/text/TextStream.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void EditorState::encode(IPC::Encoder& encoder) const
> {
>     encoder << shouldIgnoreSelectionChanges;
>Index: Source/WebKit/Shared/Plugins/NPIdentifierData.cpp
>===================================================================
>--- Source/WebKit/Shared/Plugins/NPIdentifierData.cpp	(revision 239075)
>+++ Source/WebKit/Shared/Plugins/NPIdentifierData.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/IdentifierRep.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> NPIdentifierData::NPIdentifierData()
>     : m_isString(false)
>     , m_number(0)
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm	(revision 239075)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm	(working copy)
>@@ -77,10 +77,9 @@
> @end
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static CGColorRef cgColorFromColor(const Color& color)
> {
>     if (!color.isValid())
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(revision 239075)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(working copy)
>@@ -38,11 +38,10 @@
> #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: Source/WebKit/Shared/SessionState.cpp
>===================================================================
>--- Source/WebKit/Shared/SessionState.cpp	(revision 239075)
>+++ Source/WebKit/Shared/SessionState.cpp	(working copy)
>@@ -29,10 +29,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/BackForwardItemIdentifier.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy policy)
> {
>     switch (policy) {
>Index: Source/WebKit/Shared/SessionTracker.cpp
>===================================================================
>--- Source/WebKit/Shared/SessionTracker.cpp	(revision 239075)
>+++ Source/WebKit/Shared/SessionTracker.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RunLoop.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static String& identifierBase()
> {
>     ASSERT(RunLoop::isMain());
>Index: Source/WebKit/Shared/ShareableBitmap.cpp
>===================================================================
>--- Source/WebKit/Shared/ShareableBitmap.cpp	(revision 239075)
>+++ Source/WebKit/Shared/ShareableBitmap.cpp	(working copy)
>@@ -30,10 +30,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/GraphicsContext.h>
> 
>+namespace WebKit {
> using namespace WebCore;
>-
>-namespace WebKit {
>-
>+    
> ShareableBitmap::Handle::Handle()
> {
> }
>Index: Source/WebKit/Shared/ShareableResource.cpp
>===================================================================
>--- Source/WebKit/Shared/ShareableResource.cpp	(revision 239075)
>+++ Source/WebKit/Shared/ShareableResource.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include "ArgumentCoders.h"
> #include <WebCore/SharedBuffer.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ShareableResource::Handle::Handle()
> {
> }
>Index: Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp
>===================================================================
>--- Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp	(revision 239075)
>+++ Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp	(working copy)
>@@ -30,10 +30,9 @@
> #include <WebCore/LengthBox.h>
> #include <wtf/text/TextStream.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const
> {
>     encoder << m_exposedContentRect;
>Index: Source/WebKit/Shared/WebBackForwardListItem.cpp
>===================================================================
>--- Source/WebKit/Shared/WebBackForwardListItem.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebBackForwardListItem.cpp	(working copy)
>@@ -32,10 +32,9 @@
> #include <wtf/DebugUtilities.h>
> #include <wtf/URL.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)
> {
>     return adoptRef(*new WebBackForwardListItem(WTFMove(backForwardListItemState), pageID));
>Index: Source/WebKit/Shared/WebContextMenuItemData.cpp
>===================================================================
>--- Source/WebKit/Shared/WebContextMenuItemData.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebContextMenuItemData.cpp	(working copy)
>@@ -34,10 +34,9 @@
> #include <wtf/text/CString.h>
> #include <WebCore/ContextMenu.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebContextMenuItemData::WebContextMenuItemData()
>     : m_type(WebCore::ActionType)
>     , m_action(WebCore::ContextMenuItemTagNoAction)
>Index: Source/WebKit/Shared/WebCoreArgumentCoders.cpp
>===================================================================
>--- Source/WebKit/Shared/WebCoreArgumentCoders.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebCoreArgumentCoders.cpp	(working copy)
>@@ -112,11 +112,10 @@
> #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: Source/WebKit/Shared/WebHitTestResultData.cpp
>===================================================================
>--- Source/WebKit/Shared/WebHitTestResultData.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebHitTestResultData.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include <wtf/URL.h>
> #include <wtf/text/WTFString.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebHitTestResultData::WebHitTestResultData()
> {
> }
>Index: Source/WebKit/Shared/WebImage.cpp
>===================================================================
>--- Source/WebKit/Shared/WebImage.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebImage.cpp	(working copy)
>@@ -26,10 +26,9 @@
> #include "config.h"
> #include "WebImage.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
> {
>     return WebImage::create(size, options, { });
>Index: Source/WebKit/Shared/WebMediaSessionMetadata.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMediaSessionMetadata.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebMediaSessionMetadata.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #if ENABLE(MEDIA_SESSION)
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata)
> {
>     return adoptRef(*new WebMediaSessionMetadata(metadata));
>Index: Source/WebKit/Shared/WebMemorySampler.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMemorySampler.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebMemorySampler.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static const char separator = '\t';
> 
> static void appendSpaces(StringBuilder& string, int count)
>Index: Source/WebKit/Shared/WebMouseEvent.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMouseEvent.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebMouseEvent.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebMouseEvent::WebMouseEvent()
>     : WebEvent()
>     , m_button(static_cast<uint32_t>(NoButton))
>Index: Source/WebKit/Shared/WebRenderObject.cpp
>===================================================================
>--- Source/WebKit/Shared/WebRenderObject.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebRenderObject.cpp	(working copy)
>@@ -37,10 +37,9 @@
> #include <WebCore/RenderView.h>
> #include <WebCore/RenderWidget.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> RefPtr<WebRenderObject> WebRenderObject::create(WebPage* page)
> {
>     Frame* mainFrame = page->mainFrame();
>Index: Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp
>===================================================================
>--- Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <WebCore/SQLiteDatabaseTracker.h>
> #include <wtf/MainThread.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)
>     : m_process(process)
>     , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
>Index: Source/WebKit/Shared/WebWheelEvent.cpp
>===================================================================
>--- Source/WebKit/Shared/WebWheelEvent.cpp	(revision 239075)
>+++ Source/WebKit/Shared/WebWheelEvent.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {    
> using namespace WebCore;
> 
>-namespace WebKit {    
>-
> 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)
>     , m_position(position)
>Index: Source/WebKit/Shared/cf/ArgumentCodersCF.cpp
>===================================================================
>--- Source/WebKit/Shared/cf/ArgumentCodersCF.cpp	(revision 239075)
>+++ Source/WebKit/Shared/cf/ArgumentCodersCF.cpp	(working copy)
>@@ -63,10 +63,9 @@
> extern "C" CFDataRef SecAccessControlCopyData(SecAccessControlRef access_control);
> #endif
> 
>+namespace IPC {
> using namespace WebCore;
> 
>-namespace IPC {
>-
> CFTypeRef tokenNullTypeRef()
> {
>     static CFStringRef tokenNullType = CFSTR("WKNull");
>Index: Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp
>===================================================================
>--- Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp	(revision 239075)
>+++ Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp	(working copy)
>@@ -30,10 +30,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const
> {
>     encoder << m_identifier;

Actions: View | Formatted Diff | Diff

Attachments on bug 192449: 356865 | 356866 | 356867 | 356868 | 356869 | 356870 | 356871 | 356872 | 356908 | 356926 | 356929 | 356950 | 356951 | 356989 | 356993 | 356995 | 357000 | 357014 | 357021 | 357109 | 357112 | 357115 | 357136 | 357139 | 357145 | 357152 | 357189 | 357191 | 357195 | 357211 | 357214 | 357218 | 357232 | 357237 | 357278 | 357318 | 357329