[Win] Add UserAgentWin.cpp
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Apr 2018 01:52:40 +0000 (01:52 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Apr 2018 01:52:40 +0000 (01:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184438

Reviewed by Michael Catanzaro.

Source/WebCore:

No new tests (No behavior change).

* PlatformWin.cmake:
* platform/win/UserAgentWin.cpp: Added.
(WebCore::standardUserAgent):
(WebCore::standardUserAgentForURL):

Source/WebKit:

* WebProcess/WebPage/win/WebPageWin.cpp:
(WebKit::WebPage::platformUserAgent const):
Use WebCore::standardUserAgentForURL.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230509 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebCore/platform/win/UserAgentWin.cpp [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp

index f77cde7..9be34c6 100644 (file)
@@ -1,3 +1,17 @@
+2018-04-10  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Add UserAgentWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=184438
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests (No behavior change).
+
+        * PlatformWin.cmake:
+        * platform/win/UserAgentWin.cpp: Added.
+        (WebCore::standardUserAgent):
+        (WebCore::standardUserAgentForURL):
+
 2018-04-10  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [Extra zoom mode] Add a mechanism to zoom to fixed scales when double tapping in extra zoom mode
index 443ddd7..50b9331 100644 (file)
@@ -105,6 +105,7 @@ list(APPEND WebCore_SOURCES
     platform/win/SharedBufferWin.cpp
     platform/win/StructuredExceptionHandlerSuppressor.cpp
     platform/win/SystemInfo.cpp
+    platform/win/UserAgentWin.cpp
     platform/win/WCDataObject.cpp
     platform/win/WebCoreBundleWin.cpp
     platform/win/WebCoreInstanceHandle.cpp
diff --git a/Source/WebCore/platform/win/UserAgentWin.cpp b/Source/WebCore/platform/win/UserAgentWin.cpp
new file mode 100644 (file)
index 0000000..8201f4e
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2018 Sony Interactive Entertainment 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.
+ */
+
+#include "config.h"
+#include "UserAgent.h"
+
+#include "SystemInfo.h"
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+String standardUserAgent(const String& applicationName, const String& applicationVersion)
+{
+    StringBuilder uaString;
+    uaString.appendLiteral("Mozilla/5.0 (");
+    uaString.append(windowsVersionForUAString());
+    // https://bugs.webkit.org/show_bug.cgi?id=180365
+    uaString.appendLiteral(") AppleWebKit/605.1.15 (KHTML, like Gecko)");
+    if (!applicationName.isEmpty()) {
+        uaString.appendLiteral(" ");
+        uaString.append(applicationName);
+        if (!applicationVersion.isEmpty()) {
+            uaString.appendLiteral("/");
+            uaString.append(applicationVersion);
+        }
+    }
+    return uaString.toString();
+}
+
+String standardUserAgentForURL(const URL& url)
+{
+    // The null string means we don't need a specific UA for the given URL.
+    return { };
+}
+
+} // namespace WebCore
index 801ea4b..d96febd 100644 (file)
@@ -1,3 +1,14 @@
+2018-04-10  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Add UserAgentWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=184438
+
+        Reviewed by Michael Catanzaro.
+
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::platformUserAgent const):
+        Use WebCore::standardUserAgentForURL.
+
 2018-04-10  Megan Gardner  <megan_gardner@apple.com>
 
         Remove block selection code
index 13982dd..ee8e8df 100644 (file)
@@ -138,7 +138,7 @@ String WebPage::platformUserAgent(const URL& url) const
     if (url.isNull() || !m_page->settings().needsSiteSpecificQuirks())
         return String();
 
-    return String();
+    return WebCore::standardUserAgentForURL(url);
 }
 
 static const unsigned CtrlKey = 1 << 0;