Diff
Modified: trunk/Source/WebCore/ChangeLog (207405 => 207406)
--- trunk/Source/WebCore/ChangeLog 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/ChangeLog 2016-10-17 11:30:17 UTC (rev 207406)
@@ -1,3 +1,40 @@
+2016-10-17 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Move user agent quirks to cross-platform location
+ https://bugs.webkit.org/show_bug.cgi?id=163508
+
+ Reviewed by Carlos Garcia Campos.
+
+ Tested by Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp.
+
+ * PlatformGTK.cmake:
+ * platform/UserAgent.h: Renamed from Source/WebCore/platform/gtk/UserAgentGtk.h.
+ * platform/UserAgentQuirks.cpp: Added. Moved from UserAgentGtk.cpp.
+ (WebCore::urlRequiresChromeBrowser): Sneakily tighten up Google domain detection, it should
+ only apply to sites if the base domain matches google.*, not any base domain that starts
+ with google.
+ (WebCore::urlRequiresMacintoshPlatform):
+ (WebCore::UserAgentQuirks::quirksForURL):
+ (WebCore::UserAgentQuirks::stringForQuirk):
+ * platform/UserAgentQuirks.h: Moved from UserAgentGtk.cpp. prepare-ChangeLog thinks it was
+ renamed from Source/WebCore/platform/efl/UserAgentEfl.h, but prepare-ChangeLog is dumb.
+ (WebCore::UserAgentQuirks::UserAgentQuirks):
+ (WebCore::UserAgentQuirks::add):
+ (WebCore::UserAgentQuirks::contains):
+ (WebCore::UserAgentQuirks::isEmpty):
+ * platform/efl/UserAgentEfl.cpp:
+ (WebCore::standardUserAgentForURL):
+ * platform/gtk/UserAgentGtk.cpp:
+ (WebCore::buildUserAgentString):
+ (WebCore::standardUserAgentForURL):
+ (): Deleted.
+ (WebCore::UserAgentQuirks::UserAgentQuirks): Deleted.
+ (WebCore::UserAgentQuirks::add): Deleted.
+ (WebCore::UserAgentQuirks::contains): Deleted.
+ (WebCore::UserAgentQuirks::isEmpty): Deleted.
+ (WebCore::urlRequiresChromeBrowser): Deleted.
+ (WebCore::urlRequiresMacintoshPlatform): Deleted.
+
2016-10-17 Alberto Garcia <be...@igalia.com>
[GTK] gobject-introspection on package build with webkit2gtk fails without active X session
Modified: trunk/Source/WebCore/PlatformGTK.cmake (207405 => 207406)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-10-17 11:30:17 UTC (rev 207406)
@@ -84,6 +84,7 @@
loader/soup/SubresourceLoaderSoup.cpp
platform/KillRingNone.cpp
+ platform/UserAgentQuirks.cpp
platform/audio/glib/AudioBusGLib.cpp
Copied: trunk/Source/WebCore/platform/UserAgent.h (from rev 207405, trunk/Source/WebCore/platform/gtk/UserAgentGtk.h) (0 => 207406)
--- trunk/Source/WebCore/platform/UserAgent.h (rev 0)
+++ trunk/Source/WebCore/platform/UserAgent.h 2016-10-17 11:30:17 UTC (rev 207406)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2012, 2014, 2016 Igalia S.L.
+ * Copyright (C) 2014 Apple Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if PLATFORM(COCOA)
+// FIXME: Remove Source/WebCore/page/cocoa/UserAgent.h
+#include_next "UserAgent.h"
+#else
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+class URL;
+
+String standardUserAgent(const String& applicationName = emptyString(), const String& applicationVersion = emptyString());
+String standardUserAgentForURL(const URL&);
+
+}
+
+#endif
Added: trunk/Source/WebCore/platform/UserAgentQuirks.cpp (0 => 207406)
--- trunk/Source/WebCore/platform/UserAgentQuirks.cpp (rev 0)
+++ trunk/Source/WebCore/platform/UserAgentQuirks.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2012, 2014, 2016 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "UserAgentQuirks.h"
+
+#include "PublicSuffix.h"
+#include "URL.h"
+
+namespace WebCore {
+
+// When editing the quirks in this file, be sure to update
+// Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp.
+
+// Be careful with this quirk: it's an invitation for sites to use _javascript_
+// that works in Chrome that WebKit cannot handle. Prefer other quirks instead.
+static bool urlRequiresChromeBrowser(const URL& url)
+{
+ String baseDomain = topPrivatelyControlledDomain(url.host());
+
+ // Needed for fonts on many sites to work with WebKit.
+ // 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. Avoid
+ // receiving a terrible fallback version of calendar.google.com. Receive a
+ // fancier plus.google.com.
+ if (baseDomain.startsWith("google."))
+ return true;
+
+ // Needed for YouTube 360 with WebKitGTK+ and WPE (requires ENABLE_MEDIA_SOURCE).
+ if (baseDomain == "youtube.com")
+ return true;
+
+ // Slack completely blocks users with WebKitGTK+'s standard user agent.
+ if (baseDomain == "slack.com")
+ return true;
+
+ return false;
+}
+
+static bool urlRequiresMacintoshPlatform(const URL& url)
+{
+ String baseDomain = topPrivatelyControlledDomain(url.host());
+
+ // At least finance.yahoo.com displays a mobile version with WebKitGTK+'s standard user agent.
+ if (baseDomain == "yahoo.com")
+ return true;
+
+ // taobao.com displays a mobile version with WebKitGTK+'s standard user agent.
+ if (baseDomain == "taobao.com")
+ return true;
+
+ // web.whatsapp.com completely blocks users with WebKitGTK+'s standard user agent.
+ if (baseDomain == "whatsapp.com")
+ return true;
+
+ return false;
+}
+
+UserAgentQuirks UserAgentQuirks::quirksForURL(const URL& url)
+{
+ ASSERT(!url.isNull());
+ UserAgentQuirks quirks;
+ if (urlRequiresChromeBrowser(url))
+ quirks.add(UserAgentQuirks::NeedsChromeBrowser);
+ if (urlRequiresMacintoshPlatform(url))
+ quirks.add(UserAgentQuirks::NeedsMacintoshPlatform);
+ return quirks;
+}
+
+String UserAgentQuirks::stringForQuirk(UserAgentQuirk quirk)
+{
+ switch (quirk) {
+ case NeedsChromeBrowser:
+ // Get versions from https://chromium.googlesource.com/chromium/src.git
+ return ASCIILiteral("Chrome/56.0.2891.4");
+ case NeedsMacintoshPlatform:
+ return ASCIILiteral("Macintosh; Intel Mac OS X 10_12");
+ case NumUserAgentQuirks:
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ return ASCIILiteral("");
+}
+
+}
Copied: trunk/Source/WebCore/platform/UserAgentQuirks.h (from rev 207405, trunk/Source/WebCore/platform/efl/UserAgentEfl.h) (0 => 207406)
--- trunk/Source/WebCore/platform/UserAgentQuirks.h (rev 0)
+++ trunk/Source/WebCore/platform/UserAgentQuirks.h 2016-10-17 11:30:17 UTC (rev 207406)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012, 2014, 2016 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/Assertions.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class URL;
+
+class UserAgentQuirks {
+public:
+ enum UserAgentQuirk {
+ NeedsChromeBrowser,
+ NeedsMacintoshPlatform,
+
+ NumUserAgentQuirks
+ };
+
+ UserAgentQuirks()
+ : m_quirks(0)
+ {
+ COMPILE_ASSERT(sizeof(m_quirks) * 8 >= NumUserAgentQuirks, not_enough_room_for_quirks);
+ }
+
+ void add(UserAgentQuirk quirk)
+ {
+ ASSERT(quirk >= 0);
+ ASSERT_WITH_SECURITY_IMPLICATION(quirk < NumUserAgentQuirks);
+
+ m_quirks |= (1 << quirk);
+ }
+
+ bool contains(UserAgentQuirk quirk) const
+ {
+ return m_quirks & (1 << quirk);
+ }
+
+ bool isEmpty() const { return !m_quirks; }
+
+ static UserAgentQuirks quirksForURL(const URL&);
+
+ static String stringForQuirk(UserAgentQuirk);
+
+private:
+ uint32_t m_quirks;
+};
+
+}
Modified: trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp (207405 => 207406)
--- trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "UserAgentEfl.h"
+#include "UserAgent.h"
#include <wtf/NeverDestroyed.h>
@@ -75,5 +75,11 @@
return standardUserAgentString + ' ' + applicationName + '/' + finalApplicationVersion;
}
+String standardUserAgentForURL(const URL&)
+{
+ // Disable user agent quirks for now.
+ return String();
+}
+
} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/efl/UserAgentEfl.h (207405 => 207406)
--- trunk/Source/WebCore/platform/efl/UserAgentEfl.h 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/platform/efl/UserAgentEfl.h 2016-10-17 11:30:17 UTC (rev 207406)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 Naver Corp. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UserAgentEfl_h
-#define UserAgentEfl_h
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-String standardUserAgent(const String& applicationName = emptyString(), const String& applicationVersion = emptyString());
-
-}
-
-#endif // UserAgentEfl_h
-
Modified: trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp (207405 => 207406)
--- trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -24,10 +24,10 @@
*/
#include "config.h"
-#include "UserAgentGtk.h"
+#include "UserAgent.h"
-#include "PublicSuffix.h"
#include "URL.h"
+#include "UserAgentQuirks.h"
#include <wtf/NeverDestroyed.h>
#include <wtf/text/StringBuilder.h>
@@ -43,40 +43,6 @@
namespace WebCore {
-class UserAgentQuirks {
-public:
- enum UserAgentQuirk {
- NeedsChromeBrowser,
- NeedsMacintoshPlatform,
-
- NumUserAgentQuirks
- };
-
- UserAgentQuirks()
- : m_quirks(0)
- {
- COMPILE_ASSERT(sizeof(m_quirks) * 8 >= NumUserAgentQuirks, not_enough_room_for_quirks);
- }
-
- void add(UserAgentQuirk quirk)
- {
- ASSERT(quirk >= 0);
- ASSERT_WITH_SECURITY_IMPLICATION(quirk < NumUserAgentQuirks);
-
- m_quirks |= (1 << quirk);
- }
-
- bool contains(UserAgentQuirk quirk) const
- {
- return m_quirks & (1 << quirk);
- }
-
- bool isEmpty() const { return !m_quirks; }
-
-private:
- uint32_t m_quirks;
-};
-
static const char* platformForUAString()
{
#if OS(MAC_OS_X)
@@ -115,16 +81,12 @@
uaString.append('(');
if (quirks.contains(UserAgentQuirks::NeedsMacintoshPlatform))
- uaString.appendLiteral("Macintosh");
- else
+ uaString.append(UserAgentQuirks::stringForQuirk(UserAgentQuirks::NeedsMacintoshPlatform));
+ else {
uaString.append(platformForUAString());
-
- uaString.appendLiteral("; ");
-
- if (quirks.contains(UserAgentQuirks::NeedsMacintoshPlatform))
- uaString.appendLiteral("Intel Mac OS X 10_12");
- else
+ uaString.appendLiteral("; ");
uaString.append(platformVersionForUAString());
+ }
uaString.appendLiteral(") AppleWebKit/");
uaString.append(versionForUAString());
@@ -131,9 +93,10 @@
uaString.appendLiteral(" (KHTML, like Gecko) ");
// Note that Chrome UAs advertise *both* Chrome and Safari.
- // We set a meaningful value only for the first two digits here.
- if (quirks.contains(UserAgentQuirks::NeedsChromeBrowser))
- uaString.append("Chrome/54.0.2704.106 ");
+ if (quirks.contains(UserAgentQuirks::NeedsChromeBrowser)) {
+ uaString.append(UserAgentQuirks::stringForQuirk(UserAgentQuirks::NeedsChromeBrowser));
+ uaString.appendLiteral(" ");
+ }
// Version/X is mandatory *before* Safari/X to be a valid Safari UA. See
// https://bugs.webkit.org/show_bug.cgi?id=133403 for details.
@@ -169,58 +132,9 @@
return standardUserAgentStatic() + ' ' + applicationName + '/' + finalApplicationVersion;
}
-// 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;
-}
-
-static bool urlRequiresMacintoshPlatform(const URL& url)
-{
- String baseDomain = topPrivatelyControlledDomain(url.host());
-
- // At least finance.yahoo.com displays a mobile version with our standard user agent.
- if (baseDomain == "yahoo.com")
- return true;
-
- // taobao.com displays a mobile version with our standard user agent.
- if (baseDomain == "taobao.com")
- return true;
-
- // web.whatsapp.com completely blocks users with our standard user agent.
- if (baseDomain == "whatsapp.com")
- return true;
-
- return false;
-}
-
String standardUserAgentForURL(const URL& url)
{
- ASSERT(!url.isNull());
- UserAgentQuirks quirks;
- if (urlRequiresChromeBrowser(url))
- quirks.add(UserAgentQuirks::NeedsChromeBrowser);
- if (urlRequiresMacintoshPlatform(url))
- quirks.add(UserAgentQuirks::NeedsMacintoshPlatform);
-
+ auto quirks = UserAgentQuirks::quirksForURL(url);
// The null string means we don't need a specific UA for the given URL.
return quirks.isEmpty() ? String() : buildUserAgentString(quirks);
}
Deleted: trunk/Source/WebCore/platform/gtk/UserAgentGtk.h (207405 => 207406)
--- trunk/Source/WebCore/platform/gtk/UserAgentGtk.h 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebCore/platform/gtk/UserAgentGtk.h 2016-10-17 11:30:17 UTC (rev 207406)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2012, 2014 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UserAgentGtk_h
-#define UserAgentGtk_h
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-class URL;
-
-String standardUserAgent(const String& applicationName = emptyString(), const String& applicationVersion = emptyString());
-String standardUserAgentForURL(const URL&);
-
-}
-
-#endif // UserAgentGtk_h
-
Modified: trunk/Source/WebKit2/ChangeLog (207405 => 207406)
--- trunk/Source/WebKit2/ChangeLog 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-17 11:30:17 UTC (rev 207406)
@@ -1,3 +1,17 @@
+2016-10-17 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Move user agent quirks to cross-platform location
+ https://bugs.webkit.org/show_bug.cgi?id=163508
+
+ Reviewed by Carlos Garcia Campos.
+
+ #include <WebCore/UserAgent.h> instead of <WebCore/UserAgentGtk.h>.
+
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+
2016-10-17 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Downloads should always sniff contents
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (207405 => 207406)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -36,7 +36,7 @@
#include "WebKitSettingsPrivate.h"
#include "WebPageProxy.h"
#include "WebPreferences.h"
-#include <WebCore/UserAgentGtk.h>
+#include <WebCore/UserAgent.h>
#include <glib/gi18n-lib.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (207405 => 207406)
--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -29,7 +29,7 @@
#include "EwkView.h"
#include "NativeWebKeyboardEvent.h"
#include "NotImplemented.h"
-#include "UserAgentEfl.h"
+#include "UserAgent.h"
#include "WebPageMessages.h"
#include "WebProcessProxy.h"
#include "WebView.h"
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (207405 => 207406)
--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -34,7 +34,7 @@
#include "WebPasteboardProxy.h"
#include "WebProcessProxy.h"
#include "WebsiteDataStore.h"
-#include <WebCore/UserAgentGtk.h>
+#include <WebCore/UserAgent.h>
#include <gtk/gtkx.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (207405 => 207406)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -46,7 +46,7 @@
#include <WebCore/PasteboardHelper.h>
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/Settings.h>
-#include <WebCore/UserAgentGtk.h>
+#include <WebCore/UserAgent.h>
#include <wtf/glib/GUniquePtr.h>
using namespace WebCore;
Modified: trunk/Tools/ChangeLog (207405 => 207406)
--- trunk/Tools/ChangeLog 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Tools/ChangeLog 2016-10-17 11:30:17 UTC (rev 207406)
@@ -1,3 +1,19 @@
+2016-10-17 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Move user agent quirks to cross-platform location
+ https://bugs.webkit.org/show_bug.cgi?id=163508
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move the test to a cross-platform location and improve it to better check the full list of
+ sites we have defined quirks for.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp: Renamed from Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp.
+ (TestWebKitAPI::assertUserAgentForURLHasChromeBrowserQuirk):
+ (TestWebKitAPI::assertUserAgentForURLHasMacPlatformQuirk):
+ (TestWebKitAPI::TEST):
+
2016-10-17 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Downloads should always sniff contents
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (207405 => 207406)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2016-10-17 10:52:02 UTC (rev 207405)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2016-10-17 11:30:17 UTC (rev 207406)
@@ -125,21 +125,17 @@
set_tests_properties(TestWebKit2 PROPERTIES TIMEOUT 60)
set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
-set(TestWebCoreGtk_SOURCES
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/UserAgentQuirks.cpp
-)
-
add_executable(TestWebCore
${test_main_SOURCES}
- ${TestWebCoreGtk_SOURCES}
${TESTWEBKITAPI_DIR}/TestsController.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileSystem.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBuffer.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/URLParser.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBuffer.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileSystem.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/UserAgentQuirks.cpp
)
target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
Copied: trunk/Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp (from rev 207405, trunk/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp) (0 => 207406)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp 2016-10-17 11:30:17 UTC (rev 207406)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <WebCore/URL.h>
+#include <WebCore/UserAgent.h>
+
+using namespace WebCore;
+
+namespace TestWebKitAPI {
+
+static void assertUserAgentForURLHasChromeBrowserQuirk(const char* url)
+{
+ String uaString = standardUserAgentForURL(URL(ParsedURLString, url));
+
+#if !OS(MAC_OS_X)
+ EXPECT_FALSE(uaString.contains("Macintosh"));
+ EXPECT_FALSE(uaString.contains("Mac OS X"));
+#endif
+#if OS(LINUX)
+ EXPECT_TRUE(uaString.contains("Linux"));
+#endif
+#if OS(WINDOWS)
+ EXPECT_TRUE(uaString.contains("Windows"));
+#endif
+
+ EXPECT_TRUE(uaString.contains("Chrome"));
+ EXPECT_TRUE(uaString.contains("Safari"));
+ EXPECT_FALSE(uaString.contains("Chromium"));
+}
+
+static void assertUserAgentForURLHasMacPlatformQuirk(const char* url)
+{
+ String uaString = standardUserAgentForURL(URL(ParsedURLString, url));
+
+ EXPECT_TRUE(uaString.contains("Macintosh"));
+ EXPECT_TRUE(uaString.contains("Mac OS X"));
+ EXPECT_FALSE(uaString.contains("Linux"));
+ EXPECT_FALSE(uaString.contains("Windows"));
+ EXPECT_FALSE(uaString.contains("Chrome"));
+}
+
+TEST(UserAgentTest, Quirks)
+{
+ // A site with not quirks should return a null String.
+ String uaString = standardUserAgentForURL(URL(ParsedURLString, "http://www.webkit.org/"));
+ EXPECT_TRUE(uaString.isNull());
+
+ // Google quirk should not affect sites with similar domains.
+ uaString = standardUserAgentForURL(URL(ParsedURLString, "http://www.googleblog.com/"));
+ EXPECT_FALSE(uaString.contains("Chrome"));
+
+ assertUserAgentForURLHasChromeBrowserQuirk("http://typekit.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://typekit.net/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://www.google.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://www.google.es/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://calendar.google.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://maps.google.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://plus.google.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://www.youtube.com/");
+ assertUserAgentForURLHasChromeBrowserQuirk("http://www.slack.com/");
+
+ assertUserAgentForURLHasMacPlatformQuirk("http://www.yahoo.com/");
+ assertUserAgentForURLHasMacPlatformQuirk("http://finance.yahoo.com/");
+ assertUserAgentForURLHasMacPlatformQuirk("http://intl.taobao.com/");
+ assertUserAgentForURLHasMacPlatformQuirk("http://www.whatsapp.com/");
+ assertUserAgentForURLHasMacPlatformQuirk("http://web.whatsapp.com/");
+}
+
+} // namespace TestWebKitAPI
