Attachment 360409 Details for Bug 193941 – Patch

[patch] Patch

bug-193941-20190128175424.patch (text/plain), 44.15 KB, created by Ross Kirsling on 2019-01-28 17:54:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-01-28 17:54:25 PST

Size: 44.15 KB

patch

obsolete

>Subversion Revision: 240607
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d5f663d409442a4e8aa0a8a98aeefe49cf9e4f7a..1ef10cddc7684b9f68a768870655e666bea0f4b4 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,33 @@
>+2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>+        https://bugs.webkit.org/show_bug.cgi?id=193941
>+
>+        Reviewed by Alex Christensen.
>+
>+        * API/JSWeakObjectMapRefPrivate.cpp:
>+        * bytecompiler/NodesCodegen.cpp:
>+        * heap/MachineStackMarker.cpp:
>+        * jit/ExecutableAllocator.cpp:
>+        * jsc.cpp:
>+        * parser/Nodes.cpp:
>+        * runtime/DateConstructor.cpp:
>+        * runtime/DateConversion.cpp:
>+        * runtime/DateInstance.cpp:
>+        * runtime/DatePrototype.cpp:
>+        * runtime/InitializeThreading.cpp:
>+        * runtime/IteratorOperations.cpp:
>+        * runtime/JSDateMath.cpp:
>+        * runtime/JSGlobalObjectFunctions.cpp:
>+        * runtime/StringPrototype.cpp:
>+        * runtime/VM.cpp:
>+        * testRegExp.cpp:
>+        * tools/JSDollarVM.cpp:
>+        * yarr/YarrInterpreter.cpp:
>+        * yarr/YarrJIT.cpp:
>+        * yarr/YarrPattern.cpp:
>+        * yarr/YarrUnicodeProperties.cpp:
>+
> 2019-01-28  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] RegExpConstructor should not have own IsoSubspace
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 30e27c3b87dbb11d54f84aa1981dd79bfc43a136..48eafcbcc7bb91a36740cbbe89c5309436a8c73a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,45 @@
>+2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>+        https://bugs.webkit.org/show_bug.cgi?id=193941
>+
>+        Reviewed by Alex Christensen.
>+
>+        * css/CSSBasicShapes.cpp:
>+        * css/CSSPrimitiveValue.cpp:
>+        * css/parser/CSSParser.cpp:
>+        * css/parser/CSSParserSelector.cpp:
>+        * css/parser/CSSPropertyParser.cpp:
>+        * dom/Document.cpp:
>+        * dom/EventListenerMap.cpp:
>+        * dom/EventTarget.cpp:
>+        * editing/Editor.cpp:
>+        * html/HTMLElement.cpp:
>+        * html/HTMLFontElement.cpp:
>+        * html/parser/HTMLTokenizer.cpp:
>+        * html/track/TrackBase.cpp:
>+        * loader/FTPDirectoryParser.cpp:
>+        * loader/TextResourceDecoder.cpp:
>+        * loader/cache/CachedResource.cpp:
>+        * page/ContextMenuController.cpp:
>+        * page/Navigator.cpp:
>+        * platform/Length.cpp:
>+        * platform/cocoa/KeyEventCocoa.mm:
>+        * platform/graphics/FontCascade.cpp:
>+        * platform/graphics/WidthIterator.cpp:
>+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
>+        * platform/ios/KeyEventIOS.mm:
>+        * platform/mac/KeyEventMac.mm:
>+        * platform/network/HTTPParsers.cpp:
>+        * platform/text/TextCodecUTF8.cpp:
>+        * platform/text/TextEncodingRegistry.cpp:
>+        * platform/win/KeyEventWin.cpp:
>+        * rendering/BidiRun.cpp:
>+        * rendering/FloatingObjects.cpp:
>+        * rendering/RenderBlock.cpp:
>+        * rendering/RenderListMarker.cpp:
>+        * rendering/RenderText.cpp:
>+
> 2019-01-28  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Make Window virtual key code computation match Mac
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 779b645b41cbc39a30ada85409e10833e665fd7f..073265b6c7edc8d8874c63b58d6904c7f50e207f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>+        https://bugs.webkit.org/show_bug.cgi?id=193941
>+
>+        Reviewed by Alex Christensen.
>+
>+        * Shared/linux/WebMemorySamplerLinux.cpp:
>+
> 2019-01-28  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         [iOS] Attempting to open a Keynote document to iCloud.com from iCloud Files causes crash
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 5acadf1858eec93fe259700d6cbcdeb90b92e616..bdc4fe171e4b70cb4345f5d38cb8a532aad44e9f 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>+        https://bugs.webkit.org/show_bug.cgi?id=193941
>+
>+        Reviewed by Alex Christensen.
>+
>+        * Plugins/PluginMessageThrottlerWin.cpp:
>+        * Plugins/PluginView.cpp:
>+        * Plugins/PluginViewWin.cpp:
>+
> 2019-01-24  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         Move FileSystem to WTF
>diff --git a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
>index d128836bb0ff69d63762b818fcdbdeaae96e81f6..c6b396d7c28dd3e216ffac35fd88fc005393acda 100644
>--- a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
>+++ b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
>@@ -34,7 +34,6 @@
> #include "Weak.h"
> #include "WeakGCMapInlines.h"
> 
>-using namespace WTF;
> using namespace JSC;
> 
> #ifdef __cplusplus
>diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>index 90b6d49bb9954d2e6b8c75f531b6eeddb958bf9f..6d5045b831b9ee87e0f28b8eea706a945c52423f 100644
>--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>@@ -45,8 +45,6 @@
> #include <wtf/Threading.h>
> #include <wtf/text/StringBuilder.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> /*
>diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
>index 0bc0b8e8d9209e58936357c3804832135ab0abba..ab19c0e989937103ca41f39e87e30fca635fee71 100644
>--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
>+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
>@@ -30,8 +30,6 @@
> #include <wtf/PageBlock.h>
> #include <wtf/StdLibExtras.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> MachineThreads::MachineThreads()
>diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>index 901764f3e93e3144cd6afda4476dc76644003b6e..2a544d630c47942906508528aafb97afa60846e8 100644
>--- a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>+++ b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
>@@ -82,10 +82,10 @@ extern "C" {
> 
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
>+using WTF::MetaAllocator;
>+
> #if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0
> static const size_t fixedExecutableMemoryPoolSize = FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB * 1024 * 1024;
> #elif CPU(ARM)
>diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
>index 78840132dbf1b68c9fc7f9ad3463e4cfcb9b7eaf..be0180605e6e8abf48ab711b86c9d4fc98c05f1a 100644
>--- a/Source/JavaScriptCore/jsc.cpp
>+++ b/Source/JavaScriptCore/jsc.cpp
>@@ -157,7 +157,6 @@ struct MemoryFootprint {
> #endif
> 
> using namespace JSC;
>-using namespace WTF;
> 
> namespace {
> 
>diff --git a/Source/JavaScriptCore/parser/Nodes.cpp b/Source/JavaScriptCore/parser/Nodes.cpp
>index 95774d91c94230284b4baa8697fd77291928a760..6143efd6233ae25d453d6149a1ce26d6d0bd68da 100644
>--- a/Source/JavaScriptCore/parser/Nodes.cpp
>+++ b/Source/JavaScriptCore/parser/Nodes.cpp
>@@ -31,8 +31,6 @@
> #include "ModuleScopeData.h"
> #include <wtf/Assertions.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> // ------------------------------ StatementNode --------------------------------
>diff --git a/Source/JavaScriptCore/runtime/DateConstructor.cpp b/Source/JavaScriptCore/runtime/DateConstructor.cpp
>index dbaf636d706e91a6bdeb1e788ea579d079d61c3f..25f9f0216d2c5fddd83bc76c6f8a38dbb45d4e84 100644
>--- a/Source/JavaScriptCore/runtime/DateConstructor.cpp
>+++ b/Source/JavaScriptCore/runtime/DateConstructor.cpp
>@@ -43,8 +43,6 @@
> #include <sys/timeb.h>
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> EncodedJSValue JSC_HOST_CALL dateParse(ExecState*);
>@@ -56,6 +54,8 @@ EncodedJSValue JSC_HOST_CALL dateUTC(ExecState*);
> 
> namespace JSC {
> 
>+using namespace WTF;
>+
> const ClassInfo DateConstructor::s_info = { "Function", &InternalFunction::s_info, &dateConstructorTable, nullptr, CREATE_METHOD_TABLE(DateConstructor) };
> 
> /* Source for DateConstructor.lut.h
>diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
>index 8a87cc62ad5ac2e518444b08358acf17e667b802..fa0fb42e07ef436a5cc08006e6dd32db70c3ec47 100644
>--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
>+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
>@@ -35,10 +35,10 @@
> #include <wtf/text/win/WCharStringExtras.h>
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
>+using namespace WTF;
>+
> template<int width>
> static inline void appendNumber(StringBuilder& builder, int value)
> {
>diff --git a/Source/JavaScriptCore/runtime/DateInstance.cpp b/Source/JavaScriptCore/runtime/DateInstance.cpp
>index d76937add2be8d2b764442b8127e70edbec192a4..4dd8603c72418c7a42c9771c5b79b81aa39a49d8 100644
>--- a/Source/JavaScriptCore/runtime/DateInstance.cpp
>+++ b/Source/JavaScriptCore/runtime/DateInstance.cpp
>@@ -28,10 +28,10 @@
> #include <math.h>
> #include <wtf/MathExtras.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
>+using namespace WTF;
>+
> const ClassInfo DateInstance::s_info = {"Date", &JSWrapperObject::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(DateInstance)};
> 
> DateInstance::DateInstance(VM& vm, Structure* structure)
>diff --git a/Source/JavaScriptCore/runtime/DatePrototype.cpp b/Source/JavaScriptCore/runtime/DatePrototype.cpp
>index c2d42a092fc72316560265889c65137297bfdd29..71edba95c1d0718de743d86de192af3b139a2ed1 100644
>--- a/Source/JavaScriptCore/runtime/DatePrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/DatePrototype.cpp
>@@ -67,10 +67,10 @@
> #include <CoreFoundation/CoreFoundation.h>
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
>+using namespace WTF;
>+
> EncodedJSValue JSC_HOST_CALL dateProtoFuncGetDate(ExecState*);
> EncodedJSValue JSC_HOST_CALL dateProtoFuncGetDay(ExecState*);
> EncodedJSValue JSC_HOST_CALL dateProtoFuncGetFullYear(ExecState*);
>diff --git a/Source/JavaScriptCore/runtime/InitializeThreading.cpp b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
>index 1136d6e064deb328306f11798714a4c420b5d945..50a8052e8f461855ffd56564343ca7e1d465c455 100644
>--- a/Source/JavaScriptCore/runtime/InitializeThreading.cpp
>+++ b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
>@@ -49,8 +49,6 @@
> #include <wtf/dtoa.h>
> #include <wtf/dtoa/cached-powers.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> static_assert(sizeof(bool) == 1, "LLInt and JIT assume sizeof(bool) is always 1 when touching it directly from assembly code.");
>diff --git a/Source/JavaScriptCore/runtime/IteratorOperations.cpp b/Source/JavaScriptCore/runtime/IteratorOperations.cpp
>index 9ebef787d937e3b144cad5333bcf134a9b75b6aa..141a1473ef99d9790d2678904cb59d02faad4c0f 100644
>--- a/Source/JavaScriptCore/runtime/IteratorOperations.cpp
>+++ b/Source/JavaScriptCore/runtime/IteratorOperations.cpp
>@@ -32,8 +32,6 @@
> #include "JSCInlines.h"
> #include "ObjectConstructor.h"
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> JSValue iteratorNext(ExecState* exec, IterationRecord iterationRecord, JSValue argument)
>diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp
>index c13b3de814428a6a89e2eebecc014bc60d819f21..0715d4e1ed645a02f72971eea7f51121463e9ddf 100644
>--- a/Source/JavaScriptCore/runtime/JSDateMath.cpp
>+++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp
>@@ -98,10 +98,10 @@
> #include <sys/timeb.h>
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
>+using namespace WTF;
>+
> static inline double timeToMS(double hour, double min, double sec, double ms)
> {
>     return (((hour * minutesPerHour + min) * secondsPerMinute + sec) * msPerSecond + ms);
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
>index 61fe0760f1b3729c3606e720f757af2b7b7f426b..68a82c23a43b9712452936f226c9d5f838d05bb9 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
>@@ -57,11 +57,10 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/unicode/UTF8Conversion.h>
> 
>-using namespace WTF;
>-using namespace Unicode;
>-
> namespace JSC {
> 
>+using namespace WTF::Unicode;
>+
> const ASCIILiteral ObjectProtoCalledOnNullOrUndefinedError { "Object.prototype.__proto__ called on null or undefined"_s };
> 
> template<unsigned charactersCount>
>diff --git a/Source/JavaScriptCore/runtime/StringPrototype.cpp b/Source/JavaScriptCore/runtime/StringPrototype.cpp
>index 16b3e97ca9df2dd893b5f2822ea5029990d54930..28b862d52138bba90a65c5011ecedef91f148696 100644
>--- a/Source/JavaScriptCore/runtime/StringPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/StringPrototype.cpp
>@@ -55,8 +55,6 @@
> #include <wtf/text/StringView.h>
> #include <wtf/unicode/Collator.h>
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StringPrototype);
>diff --git a/Source/JavaScriptCore/runtime/VM.cpp b/Source/JavaScriptCore/runtime/VM.cpp
>index 0a640b2ef41d855eb7277b18e4fca854150face6..4e16b6d86a1c4c9458dd55b945e93348ed3676d7 100644
>--- a/Source/JavaScriptCore/runtime/VM.cpp
>+++ b/Source/JavaScriptCore/runtime/VM.cpp
>@@ -170,8 +170,6 @@
> #include "RegExp.h"
> #endif
> 
>-using namespace WTF;
>-
> namespace JSC {
> 
> #if ENABLE(JIT)
>diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp
>index e6cdd50a52e2fddf2ce356658c55199b41c6946c..5091b714969e5338e2cf4a257d8ee74d38d2d49d 100644
>--- a/Source/JavaScriptCore/testRegExp.cpp
>+++ b/Source/JavaScriptCore/testRegExp.cpp
>@@ -48,7 +48,6 @@
> const int MaxLineLength = 100 * 1024;
> 
> using namespace JSC;
>-using namespace WTF;
> 
> struct CommandLine {
>     CommandLine()
>diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp
>index 53c5c46fee0f47fabeadd859eed2d131ca31fd5e..d03cb27213d60429926e9e76193da5c3649c065f 100644
>--- a/Source/JavaScriptCore/tools/JSDollarVM.cpp
>+++ b/Source/JavaScriptCore/tools/JSDollarVM.cpp
>@@ -57,7 +57,6 @@
> #endif
> 
> using namespace JSC;
>-using namespace WTF;
> 
> namespace {
> 
>diff --git a/Source/JavaScriptCore/yarr/YarrInterpreter.cpp b/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
>index 910bd7b0d4266640a0a81bc21e779038442fecf5..6b9664d26c5afba2b229b725fbe152d1a1bba8aa 100644
>--- a/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
>+++ b/Source/JavaScriptCore/yarr/YarrInterpreter.cpp
>@@ -37,8 +37,6 @@
> #include <wtf/text/CString.h>
> #include <wtf/text/WTFString.h>
> 
>-using namespace WTF;
>-
> namespace JSC { namespace Yarr {
> 
> template<typename CharType>
>@@ -1655,7 +1653,7 @@ private:
>     bool unicode;
>     unsigned* output;
>     InputStream input;
>-    BumpPointerPool* allocatorPool { nullptr };
>+    WTF::BumpPointerPool* allocatorPool { nullptr };
>     unsigned startOffset;
>     unsigned remainingMatchCount;
> };
>diff --git a/Source/JavaScriptCore/yarr/YarrJIT.cpp b/Source/JavaScriptCore/yarr/YarrJIT.cpp
>index be71e4ce38560756bc36bb3b33927bb9507b65d1..851fe6f8f79b3d160a35228817efaf6b182efe02 100644
>--- a/Source/JavaScriptCore/yarr/YarrJIT.cpp
>+++ b/Source/JavaScriptCore/yarr/YarrJIT.cpp
>@@ -36,8 +36,6 @@
> 
> #if ENABLE(YARR_JIT)
> 
>-using namespace WTF;
>-
> namespace JSC { namespace Yarr {
> 
> template<YarrJITCompileMode compileMode>
>diff --git a/Source/JavaScriptCore/yarr/YarrPattern.cpp b/Source/JavaScriptCore/yarr/YarrPattern.cpp
>index 733fb2c39316bbdab73ef86754ad0a87e0e9b483..36fc4d21094b5e01f8b72c914544a34d8c73ab40 100644
>--- a/Source/JavaScriptCore/yarr/YarrPattern.cpp
>+++ b/Source/JavaScriptCore/yarr/YarrPattern.cpp
>@@ -38,8 +38,6 @@
> #include <wtf/Vector.h>
> #include <wtf/text/WTFString.h>
> 
>-using namespace WTF;
>-
> namespace JSC { namespace Yarr {
> 
> #include "RegExpJitTables.h"
>diff --git a/Source/JavaScriptCore/yarr/YarrUnicodeProperties.cpp b/Source/JavaScriptCore/yarr/YarrUnicodeProperties.cpp
>index b50ba039781d4f23c0a42404e260de84ce7419d0..e6a086603774748c1aa4e14acc050f8a8ed67704 100644
>--- a/Source/JavaScriptCore/yarr/YarrUnicodeProperties.cpp
>+++ b/Source/JavaScriptCore/yarr/YarrUnicodeProperties.cpp
>@@ -29,8 +29,6 @@
> #include "Yarr.h"
> #include "YarrPattern.h"
> 
>-using namespace WTF;
>-
> namespace JSC { namespace Yarr {
> 
> struct HashIndex {
>diff --git a/Source/WebCore/css/CSSBasicShapes.cpp b/Source/WebCore/css/CSSBasicShapes.cpp
>index e1eaf94f9517339fce879e140245f52659fd37eb..35fcef274ebd8307a709d9e20b8e1a2b5f799064 100644
>--- a/Source/WebCore/css/CSSBasicShapes.cpp
>+++ b/Source/WebCore/css/CSSBasicShapes.cpp
>@@ -28,7 +28,6 @@
>  */
> 
> #include "config.h"
>-
> #include "CSSBasicShapes.h"
> 
> #include "CSSMarkup.h"
>@@ -39,9 +38,7 @@
> #include "SVGPathUtilities.h"
> #include <wtf/text/StringBuilder.h>
> 
>-
> namespace WebCore {
>-using namespace WTF;
> 
> static String serializePositionOffset(const Pair& offset, const Pair& other)
> {
>@@ -365,7 +362,7 @@ static String buildInsetString(const String& top, const String& right, const Str
>             }
> 
>             if (verticalRadii.size() != horizontalRadii.size()
>-                || !VectorComparer<false, String>::compare(verticalRadii.data(), horizontalRadii.data(), verticalRadii.size())) {
>+                || !WTF::VectorComparer<false, String>::compare(verticalRadii.data(), horizontalRadii.data(), verticalRadii.size())) {
>                 result.appendLiteral(separator);
>                 result.appendLiteral("/");
> 
>diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp
>index 06ffb60ea46ed118f32f464f64c95fc44a35732d..26eed35b014bc1f518dab58c075ca70ab617bdca 100644
>--- a/Source/WebCore/css/CSSPrimitiveValue.cpp
>+++ b/Source/WebCore/css/CSSPrimitiveValue.cpp
>@@ -52,7 +52,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::UnitType unitType)
> {
>diff --git a/Source/WebCore/css/parser/CSSParser.cpp b/Source/WebCore/css/parser/CSSParser.cpp
>index 0d6aef08f924f07889d2ca14108ce57a1845bdd5..b4fa697c967a19145c3de332e357c6232d4a9ab2 100644
>--- a/Source/WebCore/css/parser/CSSParser.cpp
>+++ b/Source/WebCore/css/parser/CSSParser.cpp
>@@ -54,7 +54,6 @@
> #include <wtf/text/StringBuilder.h>
> 
> namespace WebCore {
>-using namespace WTF;
> 
> CSSParser::CSSParser(const CSSParserContext& context)
>     : m_context(context)
>diff --git a/Source/WebCore/css/parser/CSSParserSelector.cpp b/Source/WebCore/css/parser/CSSParserSelector.cpp
>index 26a18acb5fd2048928c484e19f4ddc2e604d6dd5..1af424eac9ff3b70f52fe5e6b32417419c11b7a3 100644
>--- a/Source/WebCore/css/parser/CSSParserSelector.cpp
>+++ b/Source/WebCore/css/parser/CSSParserSelector.cpp
>@@ -32,8 +32,6 @@
> 
> namespace WebCore {
> 
>-using namespace WTF;
>-
> CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const AtomicString& pseudoTypeString)
> {
>     CSSSelector::PagePseudoClassType pseudoType;
>diff --git a/Source/WebCore/css/parser/CSSPropertyParser.cpp b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>index 1ddaabdf370fdedaf627a69e09e0afa25cdf4d87..2f536e97f3388ed484d2c94b3f4664fdcd81a3f3 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParser.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>@@ -82,11 +82,8 @@
> #include <memory>
> #include <wtf/text/StringBuilder.h>
> 
>-
> namespace WebCore {
>-using namespace WTF;
> 
>-    
> bool isCustomPropertyName(const String& propertyName)
> {
>     return propertyName.length() > 2 && propertyName.characterAt(0) == '-' && propertyName.characterAt(1) == '-';
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 612c35fd454b8e17308938f45037125dbb550656..03254121014e5cdc55a3f1dae25df329be75b13b 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -321,16 +321,13 @@
> #include "WebMetalRenderingContext.h"
> #endif
> 
>-
> namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(Document);
> 
>-using namespace PAL;
>-using namespace WTF;
>-using namespace Unicode;
>-
> using namespace HTMLNames;
>+using namespace PAL;
>+using namespace WTF::Unicode;
> 
> static const unsigned cMaxWriteRecursionDepth = 21;
> bool Document::hasEverCreatedAnAXObjectCache = false;
>diff --git a/Source/WebCore/dom/EventListenerMap.cpp b/Source/WebCore/dom/EventListenerMap.cpp
>index bf922a942f687be255eca9c08de056d3227f4ab6..bdd2d56ab5b2aa9cee80fc06d928b8e8a20b27bd 100644
>--- a/Source/WebCore/dom/EventListenerMap.cpp
>+++ b/Source/WebCore/dom/EventListenerMap.cpp
>@@ -41,7 +41,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> #ifndef NDEBUG
> void EventListenerMap::assertNoActiveIterators() const
>diff --git a/Source/WebCore/dom/EventTarget.cpp b/Source/WebCore/dom/EventTarget.cpp
>index c37910e66fe833497b2e6a0375d0de01bc242b60..7ae53449fd00ee679e77427d7f66350c872e7f92 100644
>--- a/Source/WebCore/dom/EventTarget.cpp
>+++ b/Source/WebCore/dom/EventTarget.cpp
>@@ -51,8 +51,6 @@
> 
> namespace WebCore {
> 
>-using namespace WTF;
>-
> bool EventTarget::isNode() const
> {
>     return false;
>diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
>index 8fd53ba98acb8a2e4791153fc84440640bc357a5..df190e5d396cb9677c9c4d3087aacc3827ea32bb 100644
>--- a/Source/WebCore/editing/Editor.cpp
>+++ b/Source/WebCore/editing/Editor.cpp
>@@ -200,8 +200,7 @@ void ClearTextCommand::CreateAndApply(const RefPtr<Frame> frame)
> }
> 
> using namespace HTMLNames;
>-using namespace WTF;
>-using namespace Unicode;
>+using namespace WTF::Unicode;
> 
> TemporarySelectionChange::TemporarySelectionChange(Frame& frame, Optional<VisibleSelection> temporarySelection, OptionSet<TemporarySelectionOption> options)
>     : m_frame(frame)
>diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
>index 796e42d66778005f6380666954be521cd0fccde2..7627e2138a992d9d4f6b1b3c7a9f71cc2c371195 100644
>--- a/Source/WebCore/html/HTMLElement.cpp
>+++ b/Source/WebCore/html/HTMLElement.cpp
>@@ -76,7 +76,6 @@ namespace WebCore {
> WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLElement);
> 
> using namespace HTMLNames;
>-using namespace WTF;
> 
> Ref<HTMLElement> HTMLElement::create(const QualifiedName& tagName, Document& document)
> {
>diff --git a/Source/WebCore/html/HTMLFontElement.cpp b/Source/WebCore/html/HTMLFontElement.cpp
>index 8d6c347e9c8c38d789e06ef2ff979a665cfa260b..3cab734e1393a0e4c662b2f4861e25d3ae9ddfe4 100644
>--- a/Source/WebCore/html/HTMLFontElement.cpp
>+++ b/Source/WebCore/html/HTMLFontElement.cpp
>@@ -39,7 +39,6 @@ namespace WebCore {
> WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLFontElement);
> 
> using namespace HTMLNames;
>-using namespace WTF;
> 
> HTMLFontElement::HTMLFontElement(const QualifiedName& tagName, Document& document)
>     : HTMLElement(tagName, document)
>diff --git a/Source/WebCore/html/parser/HTMLTokenizer.cpp b/Source/WebCore/html/parser/HTMLTokenizer.cpp
>index 8ac2f852b41590e15fac18e960a574e583323fc4..154dece154c1bc00b49d9a2f0e1d2a09001118f4 100644
>--- a/Source/WebCore/html/parser/HTMLTokenizer.cpp
>+++ b/Source/WebCore/html/parser/HTMLTokenizer.cpp
>@@ -35,7 +35,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> using namespace HTMLNames;
> 
>diff --git a/Source/WebCore/html/track/TrackBase.cpp b/Source/WebCore/html/track/TrackBase.cpp
>index 746ac2ebc7fa4268643d4845a987f4a921dd5229..ff5f41afc32373aabfe5b8986fe07911483529be 100644
>--- a/Source/WebCore/html/track/TrackBase.cpp
>+++ b/Source/WebCore/html/track/TrackBase.cpp
>@@ -35,7 +35,6 @@
> #include "HTMLMediaElement.h"
> 
> namespace WebCore {
>-using namespace WTF;
> 
> static int s_uniqueId = 0;
> 
>diff --git a/Source/WebCore/loader/FTPDirectoryParser.cpp b/Source/WebCore/loader/FTPDirectoryParser.cpp
>index 7775389b517e383e6b68fc93043a7f618fed273c..482d9bcad4bc7bcbc34868b5edc7563b02fd6af4 100644
>--- a/Source/WebCore/loader/FTPDirectoryParser.cpp
>+++ b/Source/WebCore/loader/FTPDirectoryParser.cpp
>@@ -34,7 +34,7 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
>+
> #if OS(WINDOWS) && !defined(gmtime_r)
> #define gmtime_r(x, y) gmtime_s((y), (x))
> #endif
>diff --git a/Source/WebCore/loader/TextResourceDecoder.cpp b/Source/WebCore/loader/TextResourceDecoder.cpp
>index 0a112358eea6229749818ef1a5dbcf9666135807..ea5dbfbaab20bfd43deacf1e77611c3433abab83 100644
>--- a/Source/WebCore/loader/TextResourceDecoder.cpp
>+++ b/Source/WebCore/loader/TextResourceDecoder.cpp
>@@ -34,7 +34,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> using namespace HTMLNames;
> 
>diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp
>index 366c5830f8095acb0dcb493c815ee4e6608b8271..025e555272e0ec48d6b4fee1eaba6b10a25ecb39 100644
>--- a/Source/WebCore/loader/cache/CachedResource.cpp
>+++ b/Source/WebCore/loader/cache/CachedResource.cpp
>@@ -60,11 +60,9 @@
> #include "QuickLook.h"
> #endif
> 
>-
> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(cachedResourceLoader.isAlwaysOnLoggingAllowed(), Network, "%p - CachedResource::" fmt, this, ##__VA_ARGS__)
> 
> namespace WebCore {
>-using namespace WTF;
> 
> ResourceLoadPriority CachedResource::defaultPriorityForResourceType(Type type)
> {
>@@ -115,7 +113,7 @@ static Seconds deadDecodedDataDeletionIntervalForResourceType(CachedResource::Ty
>     return MemoryCache::singleton().deadDecodedDataDeletionInterval();
> }
> 
>-DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, cachedResourceLeakCounter, ("CachedResource"));
>+DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedResourceLeakCounter, ("CachedResource"));
> 
> CachedResource::CachedResource(CachedResourceRequest&& request, Type type, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
>     : m_options(request.options())
>diff --git a/Source/WebCore/page/ContextMenuController.cpp b/Source/WebCore/page/ContextMenuController.cpp
>index c775deeae0a9f3b6a89b1d503d04ec896bf52ba0..c2cf0c24900b60992be61212ae478a0b69131148 100644
>--- a/Source/WebCore/page/ContextMenuController.cpp
>+++ b/Source/WebCore/page/ContextMenuController.cpp
>@@ -73,8 +73,8 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
>+
>+using namespace WTF::Unicode;
> 
> ContextMenuController::ContextMenuController(Page& page, ContextMenuClient& client)
>     : m_page(page)
>diff --git a/Source/WebCore/page/Navigator.cpp b/Source/WebCore/page/Navigator.cpp
>index 91e3f4d0d72d615cc93e0d6768b7d11834875dd8..6e2faec55a0c66cc8a7f5d94b4f0eea0fcbdb503 100644
>--- a/Source/WebCore/page/Navigator.cpp
>+++ b/Source/WebCore/page/Navigator.cpp
>@@ -47,7 +47,6 @@
> #include <wtf/WeakPtr.h>
> 
> namespace WebCore {
>-using namespace WTF;
> 
> Navigator::Navigator(ScriptExecutionContext* context, DOMWindow& window)
>     : NavigatorBase(context)
>diff --git a/Source/WebCore/platform/Length.cpp b/Source/WebCore/platform/Length.cpp
>index 2982852824b583415f6ccc63880e86e19523c4da..1d048f5a6a221274e94aa61166425c0e36071da1 100644
>--- a/Source/WebCore/platform/Length.cpp
>+++ b/Source/WebCore/platform/Length.cpp
>@@ -37,7 +37,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> static Length parseLength(const UChar* data, unsigned length)
> {
>diff --git a/Source/WebCore/platform/cocoa/KeyEventCocoa.mm b/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>index 05c0a8ce708227c3f54b08c8761865382322c67d..b8f5854fe145ad2a96bca78d1891e609b6ea43bb 100644
>--- a/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>+++ b/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>@@ -37,8 +37,6 @@
> #import "KeyEventCodesIOS.h"
> #endif
> 
>-using namespace WTF;
>-
> namespace WebCore {
> 
> bool PlatformKeyboardEvent::currentCapsLockState()
>diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp
>index b3b64681fc466ba69dcc63d4e96c450414e310bc..b99179a4f598e57d1bf03194e623fb559d58ff9c 100644
>--- a/Source/WebCore/platform/graphics/FontCascade.cpp
>+++ b/Source/WebCore/platform/graphics/FontCascade.cpp
>@@ -46,8 +46,8 @@
> #endif
> 
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
>+
>+using namespace WTF::Unicode;
> 
> static bool useBackslashAsYenSignForFamily(const AtomicString& family)
> {
>diff --git a/Source/WebCore/platform/graphics/WidthIterator.cpp b/Source/WebCore/platform/graphics/WidthIterator.cpp
>index 2c6d95144363f18197ead473814afa792eac8079..2d0972a3b0a58a5c02cbe72c270b541411c84f31 100644
>--- a/Source/WebCore/platform/graphics/WidthIterator.cpp
>+++ b/Source/WebCore/platform/graphics/WidthIterator.cpp
>@@ -32,8 +32,8 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
>+
>+using namespace WTF::Unicode;
> 
> WidthIterator::WidthIterator(const FontCascade* font, const TextRun& run, HashSet<const Font*>* fallbackFonts, bool accountForGlyphBounds, bool forTextEmphasis)
>     : m_font(font)
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>index 86e0825187abc5d2887d74c8351af903a34ecda4..de253338bcac6bb90fce5aadec301e1fea26e608 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>@@ -88,7 +88,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> static ThreadSpecific<ShaderNameHash*>& getCurrentNameHashMapForShader()
> {
>diff --git a/Source/WebCore/platform/ios/KeyEventIOS.mm b/Source/WebCore/platform/ios/KeyEventIOS.mm
>index 9bd57e74ac882b543745582094372c7caf7d9305..33c95f3bd131f5838f0c00dd2d1122b1d049f645 100644
>--- a/Source/WebCore/platform/ios/KeyEventIOS.mm
>+++ b/Source/WebCore/platform/ios/KeyEventIOS.mm
>@@ -36,8 +36,6 @@
> #import <pal/spi/cocoa/IOKitSPI.h>
> #import <wtf/MainThread.h>
> 
>-using namespace WTF;
>-
> namespace WebCore {
> 
> int windowsKeyCodeForKeyCode(uint16_t keyCode)
>diff --git a/Source/WebCore/platform/mac/KeyEventMac.mm b/Source/WebCore/platform/mac/KeyEventMac.mm
>index 2bcb510c7a4c8524e68ba14a501fdc9e5f0b2a9f..c73f4ab13d7ed153985073d743ea14b7a05a78e4 100644
>--- a/Source/WebCore/platform/mac/KeyEventMac.mm
>+++ b/Source/WebCore/platform/mac/KeyEventMac.mm
>@@ -35,7 +35,6 @@
> #import <wtf/MainThread.h>
> 
> namespace WebCore {
>-using namespace WTF;
> 
> int windowsKeyCodeForKeyCode(uint16_t keyCode)
> {
>diff --git a/Source/WebCore/platform/network/HTTPParsers.cpp b/Source/WebCore/platform/network/HTTPParsers.cpp
>index 333631b6272b166313f0999b072c3292036bfa7f..7fa21694568cf16f5eaefef713e5af660b676e7c 100644
>--- a/Source/WebCore/platform/network/HTTPParsers.cpp
>+++ b/Source/WebCore/platform/network/HTTPParsers.cpp
>@@ -44,7 +44,6 @@
> 
> 
> namespace WebCore {
>-using namespace WTF;
> 
> // true if there is more to parse, after incrementing pos past whitespace.
> // Note: Might return pos == str.length()
>diff --git a/Source/WebCore/platform/text/TextCodecUTF8.cpp b/Source/WebCore/platform/text/TextCodecUTF8.cpp
>index 21f038bc6d45b468de2aef7467985b4d025dc796..a3dad4e9d16376863088b19710f839dbbffea8dd 100644
>--- a/Source/WebCore/platform/text/TextCodecUTF8.cpp
>+++ b/Source/WebCore/platform/text/TextCodecUTF8.cpp
>@@ -33,7 +33,7 @@
> #include <wtf/unicode/CharacterNames.h>
> 
> namespace WebCore {
>-using namespace WTF;
>+
> using namespace WTF::Unicode;
> 
> const int nonCharacter = -1;
>diff --git a/Source/WebCore/platform/text/TextEncodingRegistry.cpp b/Source/WebCore/platform/text/TextEncodingRegistry.cpp
>index 4f43f9b37f191e30f0e052cf8c6a08d8de4df367..5444f0217d26a05a5f89fc15ae8b231b2d15af4a 100644
>--- a/Source/WebCore/platform/text/TextEncodingRegistry.cpp
>+++ b/Source/WebCore/platform/text/TextEncodingRegistry.cpp
>@@ -45,7 +45,6 @@
> #include <wtf/text/CString.h>
> 
> namespace WebCore {
>-using namespace WTF;
> 
> const size_t maxEncodingNameLength = 63;
> 
>diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp
>index a5da18799cbe53860553de2cf4c96a037a40b1a9..da903a16d603e70ce3bfeafe2522323845384fad 100644
>--- a/Source/WebCore/platform/win/KeyEventWin.cpp
>+++ b/Source/WebCore/platform/win/KeyEventWin.cpp
>@@ -33,9 +33,7 @@
> #define MAPVK_VSC_TO_VK_EX 3
> #endif
> 
>-
> namespace WebCore {
>-using namespace WTF;
> 
> static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000;
> 
>diff --git a/Source/WebCore/rendering/BidiRun.cpp b/Source/WebCore/rendering/BidiRun.cpp
>index 4aecd19981329020ec592ded16a685845f1cad3f..9343165bb541fb64c63472a9e3a28a4177059ef3 100644
>--- a/Source/WebCore/rendering/BidiRun.cpp
>+++ b/Source/WebCore/rendering/BidiRun.cpp
>@@ -27,9 +27,7 @@
> #include <wtf/RefCountedLeakCounter.h>
> #include <wtf/StdLibExtras.h>
> 
>-
> namespace WebCore {
>-using namespace WTF;
> 
> DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, bidiRunCounter, ("BidiRun"));
> 
>diff --git a/Source/WebCore/rendering/FloatingObjects.cpp b/Source/WebCore/rendering/FloatingObjects.cpp
>index 35ec17c18b900d573c97776f9720e46f654c90b3..1115d885d01d3f3eb117faa5de086c83db307374 100644
>--- a/Source/WebCore/rendering/FloatingObjects.cpp
>+++ b/Source/WebCore/rendering/FloatingObjects.cpp
>@@ -28,9 +28,7 @@
> #include "RenderBox.h"
> #include "RenderView.h"
> 
>-
> namespace WebCore {
>-using namespace WTF;
> 
> struct SameSizeAsFloatingObject {
>     void* pointers[2];
>diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
>index 3909c5a3697eacf289b289800b679f9c07d78f7e..5d35202cdbdf2afcc496eb6e8e000f14cbe119fe 100644
>--- a/Source/WebCore/rendering/RenderBlock.cpp
>+++ b/Source/WebCore/rendering/RenderBlock.cpp
>@@ -71,19 +71,16 @@
> #include "ShadowRoot.h"
> #include "ShapeOutsideInfo.h"
> #include "TransformState.h"
>-
> #include <wtf/IsoMallocInlines.h>
> #include <wtf/NeverDestroyed.h>
> #include <wtf/Optional.h>
> #include <wtf/SetForScope.h>
> #include <wtf/StackStats.h>
> 
>-
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
> 
> using namespace HTMLNames;
>+using namespace WTF::Unicode;
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(RenderBlock);
> 
>diff --git a/Source/WebCore/rendering/RenderListMarker.cpp b/Source/WebCore/rendering/RenderListMarker.cpp
>index 495e20fb7afa9ff65574010fafbf1c496b273734..32e1a86a4e0683349b1a26b7b46ca2b2b9a17908 100644
>--- a/Source/WebCore/rendering/RenderListMarker.cpp
>+++ b/Source/WebCore/rendering/RenderListMarker.cpp
>@@ -37,10 +37,9 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/unicode/CharacterNames.h>
> 
>-
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
>+
>+using namespace WTF::Unicode;
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(RenderListMarker);
> 
>diff --git a/Source/WebCore/rendering/RenderText.cpp b/Source/WebCore/rendering/RenderText.cpp
>index b675cc8a3bcc6cb3bdd54b106c9a847508db8e42..b2e07f22d27754f08abdb4f48f3559d82d8cdcd3 100644
>--- a/Source/WebCore/rendering/RenderText.cpp
>+++ b/Source/WebCore/rendering/RenderText.cpp
>@@ -64,10 +64,9 @@
> #include "SelectionRect.h"
> #endif
> 
>-
> namespace WebCore {
>-using namespace WTF;
>-using namespace Unicode;
>+
>+using namespace WTF::Unicode;
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(RenderText);
> 
>diff --git a/Source/WebKit/Shared/linux/WebMemorySamplerLinux.cpp b/Source/WebKit/Shared/linux/WebMemorySamplerLinux.cpp
>index aca0a0a9ba5d8499d23d80b1a71bf001f8d62955..7f00effded87ad85602867ad068cdfdfbfa94c58 100644
>--- a/Source/WebKit/Shared/linux/WebMemorySamplerLinux.cpp
>+++ b/Source/WebKit/Shared/linux/WebMemorySamplerLinux.cpp
>@@ -41,9 +41,9 @@
> #include <wtf/text/WTFString.h>
> 
> namespace WebKit {
>-using namespace WebCore;
>+
> using namespace JSC;
>-using namespace WTF;
>+using namespace WebCore;
> 
> static const unsigned int maxBuffer = 128;
> static const unsigned int maxProcessPath = 35;
>@@ -113,7 +113,7 @@ WebMemoryStatistics WebMemorySampler::sampleWebKit() const
>     size_t totalBytesInUse = 0;
>     size_t totalBytesCommitted = 0;
> 
>-    FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
>+    auto fastMallocStatistics = WTF::fastMallocStatistics();
>     size_t fastMallocBytesInUse = fastMallocStatistics.committedVMBytes - fastMallocStatistics.freeListBytes;
>     size_t fastMallocBytesCommitted = fastMallocStatistics.committedVMBytes;
>     totalBytesInUse += fastMallocBytesInUse;
>diff --git a/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
>index 8b5df5da277dc5c268867abf972204d8ff3fc96b..cdbe3a73ebf86c3fec5d6b9abc94ab8fb3abdd76 100644
>--- a/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
>+++ b/Source/WebKitLegacy/win/Plugins/PluginMessageThrottlerWin.cpp
>@@ -30,8 +30,6 @@
> #include <wtf/ASCIICType.h>
> #include <wtf/MonotonicTime.h>
> 
>-using namespace WTF;
>-
> namespace WebCore {
> 
> // Set a timer to make sure we process any queued messages at least every 16ms.
>diff --git a/Source/WebKitLegacy/win/Plugins/PluginView.cpp b/Source/WebKitLegacy/win/Plugins/PluginView.cpp
>index 3b21cf1d08a253420e7ed014a28435bb61f6e331..2136317f2999d5e13749df38e19a8f4d2f25bd60 100644
>--- a/Source/WebKitLegacy/win/Plugins/PluginView.cpp
>+++ b/Source/WebKitLegacy/win/Plugins/PluginView.cpp
>@@ -88,8 +88,6 @@ using JSC::JSValue;
> 
> #if ENABLE(NETSCAPE_PLUGIN_API)
> 
>-using namespace WTF;
>-
> namespace WebCore {
> 
> using namespace HTMLNames;
>diff --git a/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp b/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
>index 49b9ad237493984af7d8689f99c84a18f35cbd60..4a663e0648c53195ab09e005cae53e45497bd939 100644
>--- a/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
>+++ b/Source/WebKitLegacy/win/Plugins/PluginViewWin.cpp
>@@ -84,16 +84,10 @@ static inline HWND windowHandleForPageClient(PlatformPageClient client)
>     return client;
> }
> 
>-using JSC::ExecState;
>-using JSC::JSLock;
>-using JSC::JSObject;
>-
>-using std::min;
>-
>-using namespace WTF;
>-
> namespace WebCore {
> 
>+using JSC::JSLock;
>+
> using namespace HTMLNames;
> 
> const LPCWSTR kWebPluginViewClassName = L"WebPluginView";
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cabdf776621bb93d5ff87be626728858cbe8bee4..d8d52a9db9595868047231e4b6aae0e276f381fd 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>+        https://bugs.webkit.org/show_bug.cgi?id=193941
>+
>+        Reviewed by Alex Christensen.
>+
>+        * TestWebKitAPI/Tests/WTF/ConcurrentPtrHashSet.cpp:
>+        * TestWebKitAPI/Tests/WTF/Condition.cpp:
>+        * TestWebKitAPI/Tests/WTF/Lock.cpp:
>+        * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
>+        * TestWebKitAPI/Tests/WTF/ParkingLot.cpp:
>+        * TestWebKitAPI/Tests/WTF/RedBlackTree.cpp:
>+        * TestWebKitAPI/Tests/WTF/ScopedLambda.cpp:
>+        * TestWebKitAPI/Tests/WTF/Time.cpp:
>+        * TestWebKitAPI/Tests/WTF/UniqueArray.cpp:
>+        * TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp:
>+        * TestWebKitAPI/Tests/WebCore/Logging.cpp:
>+        * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
>+
> 2019-01-28  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-app] Add method to save Step data to database
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/ConcurrentPtrHashSet.cpp b/Tools/TestWebKitAPI/Tests/WTF/ConcurrentPtrHashSet.cpp
>index 679a15580fedb713c4e593a5934a17e44a0fb03b..489a07d72b24f9b5fc54e386d991acd93273177a 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/ConcurrentPtrHashSet.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/ConcurrentPtrHashSet.cpp
>@@ -26,8 +26,6 @@
> #include "config.h"
> #include <wtf/ConcurrentPtrHashSet.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> namespace {
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp b/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp
>index 0a329c283f72871f18ddfccc75b3a54a44ed21b6..26c8f99f429cd03db008b7570e3811d221884c0f 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/Condition.cpp
>@@ -34,8 +34,6 @@
> #include <wtf/Threading.h>
> #include <wtf/Vector.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> namespace {
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp b/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp
>index 6a4e538f56f46d177a3f62f1ddeb3a4d0af2af08..2dccedcadcc6c22273debc20f3ff677c87329027 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/Lock.cpp
>@@ -29,8 +29,6 @@
> #include <wtf/ThreadingPrimitives.h>
> #include <wtf/WordLock.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> struct LockInspector {
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp b/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp
>index 85304003106d475319f84acab786ed678bb49b08..ef01b3a055f7c642d555d7867011d2ae988215c8 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp
>@@ -35,10 +35,10 @@
> #undef small
> #endif
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
>+using namespace WTF;
>+
> class MetaAllocatorTest: public testing::Test {
> public:
>     enum SanityCheckMode { RunSanityCheck, DontRunSanityCheck };
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/ParkingLot.cpp b/Tools/TestWebKitAPI/Tests/WTF/ParkingLot.cpp
>index a47b20c74ee926ec87537e31e29e90bfe7a142aa..452e22771dc064adaafe620eb33e80130f79f197 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/ParkingLot.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/ParkingLot.cpp
>@@ -34,8 +34,6 @@
> #include <wtf/Threading.h>
> #include <wtf/ThreadingPrimitives.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> namespace {
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp b/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp
>index 5e5c8adc43ba20c3e423247c83d27ca3d470f21b..d833b2a99067747764e0835f2f2857380034149d 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp
>@@ -30,10 +30,10 @@
> #include <wtf/RedBlackTree.h>
> #include <wtf/Vector.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
>+using namespace WTF;
>+
> class TestNode : public RedBlackTree<TestNode, char>::Node {
> public:
>     TestNode(char key, unsigned value)
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/ScopedLambda.cpp b/Tools/TestWebKitAPI/Tests/WTF/ScopedLambda.cpp
>index 3dfee8671a32246d82c860faf6a0c0e4537fcba1..5b6d7465ca60dd91e2b1d6923aa30bcd068fb28a 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/ScopedLambda.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/ScopedLambda.cpp
>@@ -27,8 +27,6 @@
> #include <wtf/ScopedLambda.h>
> #include <wtf/Vector.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> // This test relies on this module being compiled with -fno-elide-constructors
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/Time.cpp b/Tools/TestWebKitAPI/Tests/WTF/Time.cpp
>index d7fdb6e77bf5f429ae6a5481845db1ffda55842a..189e902a91eefc45193562e6b24b0ca8e2c432cb 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/Time.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/Time.cpp
>@@ -59,8 +59,6 @@ std::basic_ostream<char>& operator<<(std::basic_ostream<char>& out, TimeWithDyna
> 
> } // namespace WTF
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> namespace {
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/UniqueArray.cpp b/Tools/TestWebKitAPI/Tests/WTF/UniqueArray.cpp
>index c1d0836f0cd38663e1f3187e5820e1c703ed7797..d1fde95917076e8f0dad322036ada05af5821d01 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/UniqueArray.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/UniqueArray.cpp
>@@ -26,8 +26,6 @@
> #include "config.h"
> #include <wtf/UniqueArray.h>
> 
>-using namespace WTF;
>-
> namespace TestWebKitAPI {
> 
> static unsigned numberOfConstructions { 0 };
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
>index e993ffbaae35eff9e94b87aeeaa33094a56de7b4..c83bb6f29678002641c91b99cd2de7583ba598c7 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
>@@ -31,7 +31,6 @@
> #include <WebCore/ApplicationManifestParser.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WTF;
> using namespace WebCore;
> 
> namespace WebCore {
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp b/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp
>index 1e4c342a59e284f0489819a5bb37df05873d3ff5..0c15a6d2ebde314610b854992fbfe19f168cc572 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp
>@@ -31,8 +31,6 @@
> 
> #define LOG_CHANNEL_PREFIX Test
> 
>-using namespace WTF;
>-
> const char* logTestingSubsystem = "com.webkit.testing";
> 
> DEFINE_LOG_CHANNEL(Channel1, logTestingSubsystem);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm b/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
>index 6e2edbc98263b2dfa1e6c3e0f78eabd2c17eadcb..81761827a881d06dfe70a9bd3224732ae19bcf28 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
>@@ -35,8 +35,6 @@
> 
> namespace WTR {
> 
>-using namespace WTF;
>-
> void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef frame)
> {
>     if (!WKBundleFrameIsMainFrame(frame))

Actions: View | Formatted Diff | Diff

Attachments on bug 193941: 360406 | 360409 | 360422