summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp')
-rw-r--r--src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp b/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp
index 5138b0fb5..5b0c5d42e 100644
--- a/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp
+++ b/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp
@@ -29,6 +29,10 @@
#include "NetworkStateNotifier.h"
#include "PlatformString.h"
+#if PLATFORM(LINUX)
+#include "sys/utsname.h"
+#include <wtf/StdLibExtras.h>
+#endif
#ifndef WEBCORE_NAVIGATOR_PLATFORM
#if PLATFORM(MAC) && (PLATFORM(PPC) || PLATFORM(PPC64))
@@ -37,6 +41,8 @@
#define WEBCORE_NAVIGATOR_PLATFORM "MacIntel"
#elif PLATFORM(WIN_OS)
#define WEBCORE_NAVIGATOR_PLATFORM "Win32"
+#elif PLATFORM(SYMBIAN)
+#define WEBCORE_NAVIGATOR_PLATFORM "Symbian"
#else
#define WEBCORE_NAVIGATOR_PLATFORM ""
#endif
@@ -79,7 +85,15 @@ String NavigatorBase::appVersion() const
String NavigatorBase::platform() const
{
+#if PLATFORM(LINUX)
+ if (String("") != WEBCORE_NAVIGATOR_PLATFORM)
+ return WEBCORE_NAVIGATOR_PLATFORM;
+ struct utsname osname;
+ DEFINE_STATIC_LOCAL(String, platformName, (uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : ""));
+ return platformName;
+#else
return WEBCORE_NAVIGATOR_PLATFORM;
+#endif
}
String NavigatorBase::appCodeName() const