Diff
Modified: trunk/Source/WebKit/ChangeLog (239123 => 239124)
--- trunk/Source/WebKit/ChangeLog 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/ChangeLog 2018-12-12 19:15:58 UTC (rev 239124)
@@ -1,3 +1,80 @@
+2018-12-12 Chris Fleizach <[email protected]>
+
+ [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 <[email protected]>
+
+ [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 <[email protected]>
Unreviewed build with with recent macOS SDKs.
Modified: trunk/Source/WebKit/Shared/API/c/WKRenderLayer.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/API/c/WKRenderLayer.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/API/c/WKRenderLayer.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -130,5 +130,5 @@
WKRenderLayerRef WKRenderLayerGetFrameContentsLayer(WKRenderLayerRef renderLayerRef)
{
- return toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
+ return WebKit::toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());
}
Modified: trunk/Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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();
}
+
Modified: trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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());
}
+
Modified: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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());
}
Modified: trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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());
}
Modified: trunk/Source/WebKit/Shared/ChildProcess.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/ChildProcess.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/ChildProcess.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/ContextMenuContextData.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/ContextMenuContextData.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/ContextMenuContextData.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/EditorState.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/EditorState.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/EditorState.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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;
Modified: trunk/Source/WebKit/Shared/Plugins/NPIdentifierData.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/Plugins/NPIdentifierData.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/Plugins/NPIdentifierData.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm (239123 => 239124)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm 2018-12-12 19:15:58 UTC (rev 239124)
@@ -77,10 +77,9 @@
@end
#endif
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
static CGColorRef cgColorFromColor(const Color& color)
{
if (!color.isValid())
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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&);
Modified: trunk/Source/WebKit/Shared/SessionState.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/SessionState.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/SessionState.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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) {
Modified: trunk/Source/WebKit/Shared/SessionTracker.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/SessionTracker.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/SessionTracker.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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());
Modified: trunk/Source/WebKit/Shared/ShareableBitmap.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/ShareableBitmap.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/ShareableBitmap.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -30,10 +30,9 @@
#include "WebCoreArgumentCoders.h"
#include <WebCore/GraphicsContext.h>
+namespace WebKit {
using namespace WebCore;
-
-namespace WebKit {
-
+
ShareableBitmap::Handle::Handle()
{
}
Modified: trunk/Source/WebKit/Shared/ShareableResource.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/ShareableResource.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/ShareableResource.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -31,10 +31,9 @@
#include "ArgumentCoders.h"
#include <WebCore/SharedBuffer.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
ShareableResource::Handle::Handle()
{
}
Modified: trunk/Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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;
Modified: trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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));
Modified: trunk/Source/WebKit/Shared/WebContextMenuItemData.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebContextMenuItemData.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebContextMenuItemData.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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;
Modified: trunk/Source/WebKit/Shared/WebHitTestResultData.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebHitTestResultData.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebHitTestResultData.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -31,10 +31,9 @@
#include <wtf/URL.h>
#include <wtf/text/WTFString.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
WebHitTestResultData::WebHitTestResultData()
{
}
Modified: trunk/Source/WebKit/Shared/WebImage.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebImage.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebImage.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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, { });
Modified: trunk/Source/WebKit/Shared/WebMediaSessionMetadata.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebMediaSessionMetadata.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebMediaSessionMetadata.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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));
Modified: trunk/Source/WebKit/Shared/WebMemorySampler.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebMemorySampler.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebMemorySampler.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/WebMouseEvent.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebMouseEvent.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebMouseEvent.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -28,10 +28,9 @@
#include "WebCoreArgumentCoders.h"
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
WebMouseEvent::WebMouseEvent()
: WebEvent()
, m_button(static_cast<uint32_t>(NoButton))
Modified: trunk/Source/WebKit/Shared/WebRenderObject.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebRenderObject.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebRenderObject.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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();
Modified: trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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); })
Modified: trunk/Source/WebKit/Shared/WebWheelEvent.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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)
Modified: trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -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");
Modified: trunk/Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp (239123 => 239124)
--- trunk/Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp 2018-12-12 19:10:43 UTC (rev 239123)
+++ trunk/Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp 2018-12-12 19:15:58 UTC (rev 239124)
@@ -30,10 +30,9 @@
#include "WebCoreArgumentCoders.h"
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const
{
encoder << m_identifier;
