diff options
Diffstat (limited to 'Source/WebCore/page/NavigatorBase.cpp')
| -rw-r--r-- | Source/WebCore/page/NavigatorBase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/page/NavigatorBase.cpp b/Source/WebCore/page/NavigatorBase.cpp index 0be2e1fb8..eb2f8f7cc 100644 --- a/Source/WebCore/page/NavigatorBase.cpp +++ b/Source/WebCore/page/NavigatorBase.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -28,7 +28,6 @@ #include "NavigatorBase.h" #include "NetworkStateNotifier.h" -#include <wtf/NeverDestroyed.h> #include <wtf/text/WTFString.h> #if OS(LINUX) @@ -37,12 +36,12 @@ #endif #if PLATFORM(IOS) -#include "Device.h" +#include "WebCoreSystemInterface.h" #endif #ifndef WEBCORE_NAVIGATOR_PLATFORM #if PLATFORM(IOS) -#define WEBCORE_NAVIGATOR_PLATFORM deviceName() +#define WEBCORE_NAVIGATOR_PLATFORM "" #elif OS(MAC_OS_X) && (CPU(PPC) || CPU(PPC64)) #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" #elif OS(MAC_OS_X) && (CPU(X86) || CPU(X86_64)) @@ -70,6 +69,7 @@ #define WEBCORE_NAVIGATOR_VENDOR_SUB "" #endif // ifndef WEBCORE_NAVIGATOR_VENDOR_SUB + namespace WebCore { NavigatorBase::~NavigatorBase() @@ -94,7 +94,7 @@ String NavigatorBase::platform() const if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty()) return WEBCORE_NAVIGATOR_PLATFORM; struct utsname osname; - static NeverDestroyed<String> platformName(uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString()); + DEFINE_STATIC_LOCAL(String, platformName, (uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString())); return platformName; #else return WEBCORE_NAVIGATOR_PLATFORM; |