<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159916] releases/WebKitGTK/webkit-2.2/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159916">159916</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 01:15:10 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/159572">r159572</a> - [GTK] Remove Chromium as user agent and claim to be Safari in OS X
https://bugs.webkit.org/show_bug.cgi?id=124229
Reviewed by Martin Robinson.
http://www.duolingo.com/ doesn't get render correctly because it uses
Chrome/Chromium specific variables, added after it was forked. Because
of this, it is necessary to remove the Chrome/Chromium identification
in the user agent. Also, from now on, by default, The GTK+ port will
claim to be Safari in OS X to avoid loading wrong resources.
* platform/gtk/UserAgentGtk.cpp:
(WebCore::standardUserAgent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreplatformgtkUserAgentGtkcpp">releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/UserAgentGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (159915 => 159916)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-02 09:08:31 UTC (rev 159915)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-02 09:15:10 UTC (rev 159916)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-11-20 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+ [GTK] Remove Chromium as user agent and claim to be Safari in OS X
+ https://bugs.webkit.org/show_bug.cgi?id=124229
+
+ Reviewed by Martin Robinson.
+
+ http://www.duolingo.com/ doesn't get render correctly because it uses
+ Chrome/Chromium specific variables, added after it was forked. Because
+ of this, it is necessary to remove the Chrome/Chromium identification
+ in the user agent. Also, from now on, by default, The GTK+ port will
+ claim to be Safari in OS X to avoid loading wrong resources.
+
+ * platform/gtk/UserAgentGtk.cpp:
+ (WebCore::standardUserAgent):
+
</ins><span class="cx"> 2013-09-24 Lorenzo Tilve <ltilve@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreplatformgtkUserAgentGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/UserAgentGtk.cpp (159915 => 159916)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2013-12-02 09:08:31 UTC (rev 159915)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2013-12-02 09:15:10 UTC (rev 159916)
</span><span class="lines">@@ -36,6 +36,21 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+#if OS(DARWIN) || OS(UNIX)
+static const char* cpuDescriptionForUAString()
+{
+#if CPU(PPC) || CPU(PPC64)
+ return "PPC";
+#elif CPU(X86) || CPU(X86_64)
+ return "Intel";
+#elif CPU(ARM) || CPU(ARM64)
+ return "ARM";
+#else
+ return "Unknown";
+#endif
+}
+#endif
+
</ins><span class="cx"> static const char* platformForUAString()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(X11)
</span><span class="lines">@@ -59,19 +74,11 @@
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> uaOSVersion = windowsVersionForUAString();
</span><del>-#elif OS(DARWIN)
-#if CPU(X86) || CPU(X86_64)
- uaOSVersion = "Intel Mac OS X";
</del><ins>+#elif OS(DARWIN) || OS(UNIX)
+ // We will always claim to be Safari in Mac OS X, since Safari in Linux triggers the iOS path on
+ // some websites.
+ uaOSVersion = String::format("%s Mac OS X", cpuDescriptionForUAString());
</ins><span class="cx"> #else
</span><del>- uaOSVersion = "PPC Mac OS X";
-#endif
-#elif OS(UNIX)
- struct utsname name;
- if (uname(&name) != -1)
- uaOSVersion = String::format("%s %s", name.sysname, name.machine);
- else
- uaOSVersion = String("Unknown");
-#else
</del><span class="cx"> uaOSVersion = String("Unknown");
</span><span class="cx"> #endif
</span><span class="cx"> return uaOSVersion;
</span><span class="lines">@@ -79,17 +86,16 @@
</span><span class="cx">
</span><span class="cx"> String standardUserAgent(const String& applicationName, const String& applicationVersion)
</span><span class="cx"> {
</span><del>- // Create a default user agent string with a liberal interpretation of
</del><ins>+ // Create a default user agent string with a liberal interpretation of
</ins><span class="cx"> // https://developer.mozilla.org/en-US/docs/User_Agent_Strings_Reference
</span><span class="cx"> //
</span><span class="cx"> // Forming a functional user agent is really difficult. We must mention Safari, because some
</span><span class="cx"> // sites check for that when detecting WebKit browsers. Additionally some sites assume that
</span><del>- // browsers that are "Safari" but not running on OS X are the Safari iOS browser, so we
- // also claim to be Chromium. Getting this wrong can cause sites to load the wrong JavaScript,
- // CSS, or custom fonts. In some cases sites won't load resources at all.
</del><ins>+ // browsers that are "Safari" but not running on OS X are the Safari iOS browse. Getting this
+ // wrong can cause sites to load the wrong JavaScript, CSS, or custom fonts. In some cases
+ // sites won't load resources at all.
</ins><span class="cx"> DEFINE_STATIC_LOCAL(const CString, uaVersion, (String::format("%i.%i", USER_AGENT_GTK_MAJOR_VERSION, USER_AGENT_GTK_MINOR_VERSION).utf8()));
</span><del>- DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (%s; %s) AppleWebKit/%s (KHTML, like Gecko) "
- "Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/%s",
</del><ins>+ DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (%s; %s) AppleWebKit/%s (KHTML, like Gecko) Safari/%s",
</ins><span class="cx"> platformForUAString(), platformVersionForUAString().utf8().data(),
</span><span class="cx"> uaVersion.data(), uaVersion.data())));
</span><span class="cx"> if (applicationName.isEmpty())
</span></span></pre>
</div>
</div>
</body>
</html>