<!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>[207120] releases/WebKitGTK/webkit-2.14</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/207120">207120</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 06:24:09 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206519">r206519</a> - [GTK] Add Chrome UA quirk
https://bugs.webkit.org/show_bug.cgi?id=162617
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Add Chrome UA quirk and use it on typekit.net, typekit.com, youtube.com, slack.com, and
any domain that begins with "google".
* platform/gtk/UserAgentGtk.cpp:
(WebCore::buildUserAgentString):
(WebCore::urlRequiresChromeBrowser):
(WebCore::standardUserAgentForURL):
Tools:
Update test. This portion of the commit was actually unreviewed.
* TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgtkUserAgentGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214ToolsChangeLog">releases/WebKitGTK/webkit-2.14/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214ToolsTestWebKitAPITestsWebCoregtkUserAgentQuirkscpp">releases/WebKitGTK/webkit-2.14/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207119 => 207120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:24:01 UTC (rev 207119)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:24:09 UTC (rev 207120)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-09-28 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Add Chrome UA quirk
+ https://bugs.webkit.org/show_bug.cgi?id=162617
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add Chrome UA quirk and use it on typekit.net, typekit.com, youtube.com, slack.com, and
+ any domain that begins with "google".
+
+ * platform/gtk/UserAgentGtk.cpp:
+ (WebCore::buildUserAgentString):
+ (WebCore::urlRequiresChromeBrowser):
+ (WebCore::standardUserAgentForURL):
+
+2016-09-28 Michael Catanzaro <mcatanzaro@igalia.com>
+
</ins><span class="cx"> [GTK] User agent should always claim to be Intel
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162610
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgtkUserAgentGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp (207119 => 207120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-11 13:24:01 UTC (rev 207119)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-11 13:24:09 UTC (rev 207120)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class UserAgentQuirks {
</span><span class="cx"> public:
</span><span class="cx"> enum UserAgentQuirk {
</span><ins>+ NeedsChromeBrowser,
</ins><span class="cx"> NeedsMacintoshPlatform,
</span><span class="cx">
</span><span class="cx"> NumUserAgentQuirks
</span><span class="lines">@@ -125,9 +126,15 @@
</span><span class="cx">
</span><span class="cx"> uaString.appendLiteral(") AppleWebKit/");
</span><span class="cx"> uaString.append(versionForUAString());
</span><ins>+ uaString.appendLiteral(" (KHTML, like Gecko) ");
+
+ // Note that Chrome UAs advertise *both* Chrome and Safari.
+ if (quirks.contains(UserAgentQuirks::NeedsChromeBrowser))
+ uaString.append("Chrome/51.0.2704.106 ");
+
</ins><span class="cx"> // Version/X is mandatory *before* Safari/X to be a valid Safari UA. See
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=133403 for details.
</span><del>- uaString.appendLiteral(" (KHTML, like Gecko) Version/10.0 Safari/");
</del><ins>+ uaString.appendLiteral(" Version/10.0 Safari/");
</ins><span class="cx"> uaString.append(versionForUAString());
</span><span class="cx">
</span><span class="cx"> return uaString.toString();
</span><span class="lines">@@ -159,6 +166,30 @@
</span><span class="cx"> return standardUserAgentStatic() + ' ' + applicationName + '/' + finalApplicationVersion;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Be careful with this quirk: it's an invitation for sites to use JavaScript we can't handle.
+static bool urlRequiresChromeBrowser(const URL& url)
+{
+ String baseDomain = topPrivatelyControlledDomain(url.host());
+
+ // Needed for fonts on many sites, https://bugs.webkit.org/show_bug.cgi?id=147296
+ if (baseDomain == "typekit.net" || baseDomain == "typekit.com")
+ return true;
+
+ // Shut off Chrome ads. Avoid missing features on maps.google.com.
+ if (baseDomain.startsWith("google"))
+ return true;
+
+ // Needed for YouTube 360 (requires ENABLE_MEDIA_SOURCE).
+ if (baseDomain == "youtube.com")
+ return true;
+
+ // Slack completely blocks users with our standard user agent.
+ if (baseDomain == "slack.com")
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> static bool urlRequiresMacintoshPlatform(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> String baseDomain = topPrivatelyControlledDomain(url.host());
</span><span class="lines">@@ -178,9 +209,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!url.isNull());
</span><span class="cx"> UserAgentQuirks quirks;
</span><del>- if (urlRequiresMacintoshPlatform(url)) {
</del><ins>+ if (urlRequiresChromeBrowser(url))
+ quirks.add(UserAgentQuirks::NeedsChromeBrowser);
+ if (urlRequiresMacintoshPlatform(url))
</ins><span class="cx"> quirks.add(UserAgentQuirks::NeedsMacintoshPlatform);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // The null string means we don't need a specific UA for the given URL.
</span><span class="cx"> return quirks.isEmpty() ? String() : buildUserAgentString(quirks);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Tools/ChangeLog (207119 => 207120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Tools/ChangeLog 2016-10-11 13:24:01 UTC (rev 207119)
+++ releases/WebKitGTK/webkit-2.14/Tools/ChangeLog 2016-10-11 13:24:09 UTC (rev 207120)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-28 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Add Chrome UA quirk
+ https://bugs.webkit.org/show_bug.cgi?id=162617
+
+ Reviewed by Carlos Garcia Campos.
+
+ Update test. This portion of the commit was actually unreviewed.
+
+ * TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Install binaries to pkglibexecdir rather than bindir
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214ToolsTestWebKitAPITestsWebCoregtkUserAgentQuirkscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp (207119 => 207120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp 2016-10-11 13:24:01 UTC (rev 207119)
+++ releases/WebKitGTK/webkit-2.14/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp 2016-10-11 13:24:09 UTC (rev 207120)
</span><span class="lines">@@ -43,6 +43,27 @@
</span><span class="cx"> EXPECT_TRUE(uaString.contains("Macintosh"));
</span><span class="cx"> EXPECT_TRUE(uaString.contains("Mac OS X"));
</span><span class="cx"> EXPECT_FALSE(uaString.contains("Linux"));
</span><ins>+ EXPECT_FALSE(uaString.contains("Chrome"));
+
+ // google domains require Chrome in the UA
+ uaString = standardUserAgentForURL(URL(ParsedURLString, "http://www.google.es/"));
+ EXPECT_FALSE(uaString.contains("Macintosh"));
+ EXPECT_FALSE(uaString.contains("Mac OS X"));
+ EXPECT_TRUE(uaString.contains("Linux"));
+ EXPECT_TRUE(uaString.contains("Chrome"));
+
+ uaString = standardUserAgentForURL(URL(ParsedURLString, "http://maps.google.com/"));
+ EXPECT_FALSE(uaString.contains("Macintosh"));
+ EXPECT_FALSE(uaString.contains("Mac OS X"));
+ EXPECT_TRUE(uaString.contains("Linux"));
+ EXPECT_TRUE(uaString.contains("Chrome"));
+
+ // Slack requires Chrome in the UA
+ uaString = standardUserAgentForURL(URL(ParsedURLString, "http://www.slack.com/"));
+ EXPECT_FALSE(uaString.contains("Macintosh"));
+ EXPECT_FALSE(uaString.contains("Mac OS X"));
+ EXPECT_TRUE(uaString.contains("Linux"));
+ EXPECT_TRUE(uaString.contains("Chrome"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>