Changeset 206513 in webkit

Timestamp:

Sep 28, 2016 5:54:50 AM (8 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Simplify platformForUAString
​https://bugs.webkit.org/show_bug.cgi?id=162614

Reviewed by Carlos Garcia Campos.

Note in particular that the previous PLATFORM(MAC) check was wrong here, as that is never
true for GTK; this patch risks changing it to OS(MAC_OS_X), on the hope that advertising Mac
when running on Mac might not break anything. If it does, then we should remove it and just
always pretend to be on X11.

• platform/gtk/UserAgentGtk.cpp:

(WebCore::platformForUAString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/UserAgentGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-28  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Simplify platformForUAString
+        https://bugs.webkit.org/show_bug.cgi?id=162614
+
+        Reviewed by Carlos Garcia Campos.
+
+        Note in particular that the previous PLATFORM(MAC) check was wrong here, as that is never
+        true for GTK; this patch risks changing it to OS(MAC_OS_X), on the hope that advertising Mac
+        when running on Mac might not break anything. If it does, then we should remove it and just
+        always pretend to be on X11.
+
+        * platform/gtk/UserAgentGtk.cpp:
+        (WebCore::platformForUAString):
+
 2016-09-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp

@@ -91 +91 @@
 static const char* platformForUAString()
 {
-#if PLATFORM(X11)
+#if OS(MAC_OS_X)
+    return "Macintosh";
+#else
     return "X11";
-#elif OS(WINDOWS)
-    return "";
-#elif PLATFORM(MAC)
-    return "Macintosh";
-#elif defined(GDK_WINDOWING_DIRECTFB)
-    return "DirectFB";
-#else
-    return "Unknown";
 #endif
 }