Changeset 239124 in webkit
- Timestamp:
- Dec 12, 2018 11:15:58 AM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r239115 r239124 1 2018-12-12 Chris Fleizach <cfleizach@apple.com> 2 3 [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds 4 https://bugs.webkit.org/show_bug.cgi?id=192449 5 <rdar://problem/46595508> 6 7 Reviewed by Darin Adler. 8 9 Part 1: Files in Shared folder. 10 11 * Shared/API/c/WKRenderLayer.cpp: 12 (WKRenderLayerGetFrameContentsLayer): 13 * Shared/API/c/cf/WKErrorCF.cpp: 14 (WKErrorCreateWithCFError): 15 (WKErrorCopyCFError): 16 * Shared/API/c/cg/WKImageCG.cpp: 17 (WKImageCreateCGImage): 18 (WKImageCreateFromCGImage): 19 * Shared/API/c/mac/WKWebArchive.cpp: 20 (WKWebArchiveGetTypeID): 21 (WKWebArchiveCreate): 22 (WKWebArchiveCreateWithData): 23 (WKWebArchiveCreateFromRange): 24 (WKWebArchiveCopyMainResource): 25 (WKWebArchiveCopySubresources): 26 (WKWebArchiveCopySubframeArchives): 27 (WKWebArchiveCopyData): 28 * Shared/API/c/mac/WKWebArchiveResource.cpp: 29 (WKWebArchiveResourceGetTypeID): 30 (WKWebArchiveResourceCreate): 31 (WKWebArchiveResourceCopyData): 32 (WKWebArchiveResourceCopyURL): 33 (WKWebArchiveResourceCopyMIMEType): 34 (WKWebArchiveResourceCopyTextEncoding): 35 * Shared/ChildProcess.cpp: 36 * Shared/ContextMenuContextData.cpp: 37 * Shared/EditorState.cpp: 38 * Shared/Plugins/NPIdentifierData.cpp: 39 * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm: 40 * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp: 41 * Shared/SessionState.cpp: 42 * Shared/SessionTracker.cpp: 43 * Shared/ShareableBitmap.cpp: 44 * Shared/ShareableResource.cpp: 45 * Shared/VisibleContentRectUpdateInfo.cpp: 46 * Shared/WebBackForwardListItem.cpp: 47 * Shared/WebContextMenuItemData.cpp: 48 * Shared/WebCoreArgumentCoders.cpp: 49 * Shared/WebHitTestResultData.cpp: 50 * Shared/WebImage.cpp: 51 * Shared/WebMediaSessionMetadata.cpp: 52 * Shared/WebMemorySampler.cpp: 53 * Shared/WebMouseEvent.cpp: 54 * Shared/WebRenderObject.cpp: 55 * Shared/WebSQLiteDatabaseTracker.cpp: 56 * Shared/WebWheelEvent.cpp: 57 * Shared/cf/ArgumentCodersCF.cpp: 58 * Shared/ios/WebPlatformTouchPointIOS.cpp: 59 60 2018-12-12 Chris Fleizach <cfleizach@apple.com> 61 62 [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds 63 https://bugs.webkit.org/show_bug.cgi?id=192449 64 <rdar://problem/46595508> 65 66 Reviewed by Darin Adler. 67 68 Part 1: Files in NetworkProcess. 69 70 * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm: 71 * NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp: 72 * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp: 73 * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp: 74 * NetworkProcess/ios/NetworkProcessIOS.mm: 75 * NetworkProcess/mac/NetworkProcessMac.mm: 76 * NetworkProcess/mac/RemoteNetworkingContext.mm: 77 1 78 2018-12-12 Chris Dumez <cdumez@apple.com> 2 79 -
trunk/Source/WebKit/Shared/API/c/WKRenderLayer.cpp
r238887 r239124 131 131 WKRenderLayerRef WKRenderLayerGetFrameContentsLayer(WKRenderLayerRef renderLayerRef) 132 132 { 133 return toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer());133 return WebKit::toAPI(WebKit::toImpl(renderLayerRef)->frameContentsLayer()); 134 134 } -
trunk/Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp
r239072 r239124 30 30 #include "WKAPICast.h" 31 31 32 using namespace WebCore;33 using namespace WebKit;34 35 32 WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError) 36 33 { 37 return toAPI(&API::Error::create(ResourceError(cfError)).leakRef());34 return WebKit::toAPI(&API::Error::create(WebCore::ResourceError(cfError)).leakRef()); 38 35 } 39 36 40 37 CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error) 41 38 { 42 RetainPtr<CFErrorRef> cfError =toImpl(error)->platformError().cfError();39 WTF::RetainPtr<CFErrorRef> cfError = WebKit::toImpl(error)->platformError().cfError(); 43 40 return cfError.leakRef(); 44 41 } 42 -
trunk/Source/WebKit/Shared/API/c/cg/WKImageCG.cpp
r239072 r239124 33 33 #include <WebCore/GraphicsContext.h> 34 34 35 using namespace WebKit;36 using namespace WebCore;37 38 35 CGImageRef WKImageCreateCGImage(WKImageRef imageRef) 39 36 { 40 Web Image* webImage =toImpl(imageRef);37 WebKit::WebImage* webImage = WebKit::toImpl(imageRef); 41 38 if (!webImage) 42 39 return nullptr; … … 50 47 return nullptr; 51 48 52 IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));53 auto webImage = Web Image::create(imageSize,toImageOptions(options));49 WebCore::IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)); 50 auto webImage = WebKit::WebImage::create(imageSize, WebKit::toImageOptions(options)); 54 51 55 52 auto graphicsContext = webImage->bitmap().createGraphicsContext(); 56 FloatRect rect(FloatPoint(0, 0), imageSize);53 WebCore::FloatRect rect(WebCore::FloatPoint(0, 0), imageSize); 57 54 graphicsContext->clearRect(rect); 58 55 graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect); 59 56 return toAPI(webImage.leakRef()); 60 57 } 58 -
trunk/Source/WebKit/Shared/API/c/mac/WKWebArchive.cpp
r202242 r239124 35 35 #include "WKSharedAPICast.h" 36 36 37 using namespace WebKit;38 39 37 WKTypeID WKWebArchiveGetTypeID() 40 38 { 41 return toAPI(API::WebArchive::APIType);39 return WebKit::toAPI(API::WebArchive::APIType); 42 40 } 43 41 44 42 WKWebArchiveRef WKWebArchiveCreate(WKWebArchiveResourceRef mainResourceRef, WKArrayRef subresourcesRef, WKArrayRef subframeArchivesRef) 45 43 { 46 auto webArchive = API::WebArchive::create( toImpl(mainResourceRef), toImpl(subresourcesRef),toImpl(subframeArchivesRef));47 return toAPI(&webArchive.leakRef());44 auto webArchive = API::WebArchive::create(WebKit::toImpl(mainResourceRef), WebKit::toImpl(subresourcesRef), WebKit::toImpl(subframeArchivesRef)); 45 return WebKit::toAPI(&webArchive.leakRef()); 48 46 } 49 47 50 48 WKWebArchiveRef WKWebArchiveCreateWithData(WKDataRef dataRef) 51 49 { 52 auto webArchive = API::WebArchive::create( toImpl(dataRef));53 return toAPI(&webArchive.leakRef());50 auto webArchive = API::WebArchive::create(WebKit::toImpl(dataRef)); 51 return WebKit::toAPI(&webArchive.leakRef()); 54 52 } 55 53 56 54 WKWebArchiveRef WKWebArchiveCreateFromRange(WKBundleRangeHandleRef rangeHandleRef) 57 55 { 58 auto webArchive = API::WebArchive::create( toImpl(rangeHandleRef)->coreRange());59 return toAPI(&webArchive.leakRef());56 auto webArchive = API::WebArchive::create(WebKit::toImpl(rangeHandleRef)->coreRange()); 57 return WebKit::toAPI(&webArchive.leakRef()); 60 58 } 61 59 62 60 WKWebArchiveResourceRef WKWebArchiveCopyMainResource(WKWebArchiveRef webArchiveRef) 63 61 { 64 RefPtr<API::WebArchiveResource> mainResource = toImpl(webArchiveRef)->mainResource();65 return toAPI(mainResource.leakRef());62 RefPtr<API::WebArchiveResource> mainResource = WebKit::toImpl(webArchiveRef)->mainResource(); 63 return WebKit::toAPI(mainResource.leakRef()); 66 64 } 67 65 68 66 WKArrayRef WKWebArchiveCopySubresources(WKWebArchiveRef webArchiveRef) 69 67 { 70 RefPtr<API::Array> subresources = toImpl(webArchiveRef)->subresources();71 return toAPI(subresources.leakRef());68 RefPtr<API::Array> subresources = WebKit::toImpl(webArchiveRef)->subresources(); 69 return WebKit::toAPI(subresources.leakRef()); 72 70 } 73 71 74 72 WKArrayRef WKWebArchiveCopySubframeArchives(WKWebArchiveRef webArchiveRef) 75 73 { 76 RefPtr<API::Array> subframeArchives = toImpl(webArchiveRef)->subframeArchives();77 return toAPI(subframeArchives.leakRef());74 RefPtr<API::Array> subframeArchives = WebKit::toImpl(webArchiveRef)->subframeArchives(); 75 return WebKit::toAPI(subframeArchives.leakRef()); 78 76 } 79 77 80 78 WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef) 81 79 { 82 return toAPI(&toImpl(webArchiveRef)->data().leakRef());80 return WebKit::toAPI(&WebKit::toImpl(webArchiveRef)->data().leakRef()); 83 81 } -
trunk/Source/WebKit/Shared/API/c/mac/WKWebArchiveResource.cpp
r202242 r239124 31 31 #include "WKSharedAPICast.h" 32 32 33 using namespace WebKit;34 35 33 WKTypeID WKWebArchiveResourceGetTypeID() 36 34 { 37 return toAPI(API::WebArchiveResource::APIType);35 return WebKit::toAPI(API::WebArchiveResource::APIType); 38 36 } 39 37 40 38 WKWebArchiveResourceRef WKWebArchiveResourceCreate(WKDataRef dataRef, WKURLRef URLRef, WKStringRef MIMETypeRef, WKStringRef textEncodingRef) 41 39 { 42 auto webArchiveResource = API::WebArchiveResource::create( toImpl(dataRef), toWTFString(URLRef), toWTFString(MIMETypeRef),toWTFString(textEncodingRef));43 return toAPI(&webArchiveResource.leakRef());40 auto webArchiveResource = API::WebArchiveResource::create(WebKit::toImpl(dataRef), WebKit::toWTFString(URLRef), WebKit::toWTFString(MIMETypeRef), WebKit::toWTFString(textEncodingRef)); 41 return WebKit::toAPI(&webArchiveResource.leakRef()); 44 42 } 45 43 46 44 WKDataRef WKWebArchiveResourceCopyData(WKWebArchiveResourceRef webArchiveResourceRef) 47 45 { 48 return toAPI(&toImpl(webArchiveResourceRef)->data().leakRef());46 return WebKit::toAPI(&WebKit::toImpl(webArchiveResourceRef)->data().leakRef()); 49 47 } 50 48 51 49 WKURLRef WKWebArchiveResourceCopyURL(WKWebArchiveResourceRef webArchiveResourceRef) 52 50 { 53 return toCopiedURLAPI(toImpl(webArchiveResourceRef)->URL());51 return WebKit::toCopiedURLAPI(WebKit::toImpl(webArchiveResourceRef)->URL()); 54 52 } 55 53 56 54 WKStringRef WKWebArchiveResourceCopyMIMEType(WKWebArchiveResourceRef webArchiveResourceRef) 57 55 { 58 return toCopiedAPI(toImpl(webArchiveResourceRef)->MIMEType());56 return WebKit::toCopiedAPI(WebKit::toImpl(webArchiveResourceRef)->MIMEType()); 59 57 } 60 58 61 59 WKStringRef WKWebArchiveResourceCopyTextEncoding(WKWebArchiveResourceRef webArchiveResourceRef) 62 60 { 63 return toCopiedAPI(toImpl(webArchiveResourceRef)->textEncoding());61 return WebKit::toCopiedAPI(WebKit::toImpl(webArchiveResourceRef)->textEncoding()); 64 62 } -
trunk/Source/WebKit/Shared/ChildProcess.cpp
r239072 r239124 40 40 #endif 41 41 42 namespace WebKit { 42 43 using namespace WebCore; 43 44 namespace WebKit {45 44 46 45 ChildProcess::ChildProcess() -
trunk/Source/WebKit/Shared/ContextMenuContextData.cpp
r239072 r239124 34 34 #include <WebCore/GraphicsContext.h> 35 35 36 namespace WebKit { 36 37 using namespace WebCore; 37 38 namespace WebKit {39 38 40 39 ContextMenuContextData::ContextMenuContextData() -
trunk/Source/WebKit/Shared/EditorState.cpp
r239072 r239124 30 30 #include <wtf/text/TextStream.h> 31 31 32 namespace WebKit { 32 33 using namespace WebCore; 33 34 namespace WebKit {35 34 36 35 void EditorState::encode(IPC::Encoder& encoder) const -
trunk/Source/WebKit/Shared/Plugins/NPIdentifierData.cpp
r239072 r239124 34 34 #include <WebCore/IdentifierRep.h> 35 35 36 namespace WebKit { 36 37 using namespace WebCore; 37 38 namespace WebKit {39 38 40 39 NPIdentifierData::NPIdentifierData() -
trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
r239072 r239124 78 78 #endif 79 79 80 namespace WebKit { 80 81 using namespace WebCore; 81 82 namespace WebKit {83 82 84 83 static CGColorRef cgColorFromColor(const Color& color) -
trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
r239072 r239124 39 39 #include <wtf/text/TextStream.h> 40 40 41 #if ENABLE(ASYNC_SCROLLING) 42 43 namespace IPC { 41 44 using namespace WebCore; 42 43 #if ENABLE(ASYNC_SCROLLING)44 45 namespace IPC {46 45 47 46 template<> struct ArgumentCoder<ScrollingStateNode> { -
trunk/Source/WebKit/Shared/SessionState.cpp
r239072 r239124 30 30 #include <WebCore/BackForwardItemIdentifier.h> 31 31 32 namespace WebKit { 32 33 using namespace WebCore; 33 34 namespace WebKit {35 34 36 35 bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy policy) -
trunk/Source/WebKit/Shared/SessionTracker.cpp
r239072 r239124 32 32 #include <wtf/RunLoop.h> 33 33 34 namespace WebKit { 34 35 using namespace WebCore; 35 36 namespace WebKit {37 36 38 37 static String& identifierBase() -
trunk/Source/WebKit/Shared/ShareableBitmap.cpp
r239072 r239124 31 31 #include <WebCore/GraphicsContext.h> 32 32 33 namespace WebKit { 33 34 using namespace WebCore; 34 35 namespace WebKit { 36 35 37 36 ShareableBitmap::Handle::Handle() 38 37 { -
trunk/Source/WebKit/Shared/ShareableResource.cpp
r239072 r239124 32 32 #include <WebCore/SharedBuffer.h> 33 33 34 namespace WebKit { 34 35 using namespace WebCore; 35 36 namespace WebKit {37 36 38 37 ShareableResource::Handle::Handle() -
trunk/Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp
r239072 r239124 31 31 #include <wtf/text/TextStream.h> 32 32 33 namespace WebKit { 33 34 using namespace WebCore; 34 35 namespace WebKit {36 35 37 36 void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const -
trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp
r239072 r239124 33 33 #include <wtf/URL.h> 34 34 35 namespace WebKit { 35 36 using namespace WebCore; 36 37 namespace WebKit {38 37 39 38 Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID) -
trunk/Source/WebKit/Shared/WebContextMenuItemData.cpp
r239072 r239124 35 35 #include <WebCore/ContextMenu.h> 36 36 37 namespace WebKit { 37 38 using namespace WebCore; 38 39 namespace WebKit {40 39 41 40 WebContextMenuItemData::WebContextMenuItemData() -
trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
r239072 r239124 113 113 #endif 114 114 115 namespace IPC { 115 116 using namespace WebCore; 116 117 using namespace WebKit; 117 118 namespace IPC {119 118 120 119 static void encodeSharedBuffer(Encoder& encoder, const SharedBuffer* buffer) -
trunk/Source/WebKit/Shared/WebHitTestResultData.cpp
r239072 r239124 32 32 #include <wtf/text/WTFString.h> 33 33 34 namespace WebKit { 34 35 using namespace WebCore; 35 36 namespace WebKit {37 36 38 37 WebHitTestResultData::WebHitTestResultData() -
trunk/Source/WebKit/Shared/WebImage.cpp
r239072 r239124 27 27 #include "WebImage.h" 28 28 29 namespace WebKit { 29 30 using namespace WebCore; 30 31 namespace WebKit {32 31 33 32 RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options) -
trunk/Source/WebKit/Shared/WebMediaSessionMetadata.cpp
r239072 r239124 29 29 #if ENABLE(MEDIA_SESSION) 30 30 31 namespace WebKit { 31 32 using namespace WebCore; 32 33 namespace WebKit {34 33 35 34 Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata) -
trunk/Source/WebKit/Shared/WebMemorySampler.cpp
r239072 r239124 34 34 #include <wtf/text/StringBuilder.h> 35 35 36 namespace WebKit { 36 37 using namespace WebCore; 37 38 namespace WebKit {39 38 40 39 static const char separator = '\t'; -
trunk/Source/WebKit/Shared/WebMouseEvent.cpp
r239072 r239124 29 29 #include "WebCoreArgumentCoders.h" 30 30 31 namespace WebKit { 31 32 using namespace WebCore; 32 33 namespace WebKit {34 33 35 34 WebMouseEvent::WebMouseEvent() -
trunk/Source/WebKit/Shared/WebRenderObject.cpp
r239072 r239124 38 38 #include <WebCore/RenderWidget.h> 39 39 40 namespace WebKit { 40 41 using namespace WebCore; 41 42 namespace WebKit {43 42 44 43 RefPtr<WebRenderObject> WebRenderObject::create(WebPage* page) -
trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp
r239072 r239124 34 34 #include <wtf/MainThread.h> 35 35 36 namespace WebKit { 36 37 using namespace WebCore; 37 38 namespace WebKit {39 38 40 39 WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process) -
trunk/Source/WebKit/Shared/WebWheelEvent.cpp
r239072 r239124 29 29 #include "WebCoreArgumentCoders.h" 30 30 31 namespace WebKit { 31 32 using namespace WebCore; 32 33 namespace WebKit {34 33 35 34 WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Modifiers modifiers, WallTime timestamp) -
trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp
r239072 r239124 64 64 #endif 65 65 66 namespace IPC { 66 67 using namespace WebCore; 67 68 namespace IPC {69 68 70 69 CFTypeRef tokenNullTypeRef() -
trunk/Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp
r239072 r239124 31 31 #include "WebCoreArgumentCoders.h" 32 32 33 namespace WebKit { 33 34 using namespace WebCore; 34 35 namespace WebKit {36 35 37 36 void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const
Note: See TracChangeset
for help on using the changeset viewer.