Title: [207117] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207117
- Author
- [email protected]
- Date
- 2016-10-11 06:23:44 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r206513 - [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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207116 => 207117)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:23:37 UTC (rev 207116)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:23:44 UTC (rev 207117)
@@ -1,5 +1,20 @@
2016-09-28 Michael Catanzaro <[email protected]>
+ [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 <[email protected]>
+
[GTK] Bump fake Safari version in UA
https://bugs.webkit.org/show_bug.cgi?id=162615
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp (207116 => 207117)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-11 13:23:37 UTC (rev 207116)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-11 13:23:44 UTC (rev 207117)
@@ -90,16 +90,10 @@
static const char* platformForUAString()
{
-#if PLATFORM(X11)
- return "X11";
-#elif OS(WINDOWS)
- return "";
-#elif PLATFORM(MAC)
+#if OS(MAC_OS_X)
return "Macintosh";
-#elif defined(GDK_WINDOWING_DIRECTFB)
- return "DirectFB";
#else
- return "Unknown";
+ return "X11";
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
