<!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>[192148] trunk/Source</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/192148">192148</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-08 23:03:18 -0800 (Sun, 08 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Add UserAgentEFl.cpp|h
https://bugs.webkit.org/show_bug.cgi?id=151007
Reviewed by Darin Adler.
As other ports EFL port starts to have UserAgentEfl class in order to support more detailed
UA.
Source/WebCore:
No new tests, no behavior change.
* PlatformEfl.cmake:
* platform/efl/UserAgentEfl.cpp: Added.
(WebCore::platformForUAString):
(WebCore::platformVersionForUAString):
(WebCore::versionForUAString):
(WebCore::standardUserAgent):
* platform/efl/UserAgentEfl.h: Added.
Source/WebKit2:
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::standardUserAgent): Call WebCore::standardUserAgent().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebPageProxyEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformeflUserAgentEflcpp">trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflUserAgentEflh">trunk/Source/WebCore/platform/efl/UserAgentEfl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192147 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-09 01:34:09 UTC (rev 192147)
+++ trunk/Source/WebCore/ChangeLog 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-08 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Add UserAgentEFl.cpp|h
+ https://bugs.webkit.org/show_bug.cgi?id=151007
+
+ Reviewed by Darin Adler.
+
+ As other ports EFL port starts to have UserAgentEfl class in order to support more detailed
+ UA.
+
+ No new tests, no behavior change.
+
+ * PlatformEfl.cmake:
+ * platform/efl/UserAgentEfl.cpp: Added.
+ (WebCore::platformForUAString):
+ (WebCore::platformVersionForUAString):
+ (WebCore::versionForUAString):
+ (WebCore::standardUserAgent):
+ * platform/efl/UserAgentEfl.h: Added.
+
</ins><span class="cx"> 2015-11-08 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r192140): Windows build broke after removing ColorSpace argument to all drawing calls
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (192147 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-11-09 01:34:09 UTC (rev 192147)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> platform/efl/ScrollbarThemeEfl.cpp
</span><span class="cx"> platform/efl/SoundEfl.cpp
</span><span class="cx"> platform/efl/TemporaryLinkStubs.cpp
</span><ins>+ platform/efl/UserAgentEfl.cpp
</ins><span class="cx"> platform/efl/WidgetEfl.cpp
</span><span class="cx">
</span><span class="cx"> platform/geoclue/GeolocationProviderGeoclue1.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflUserAgentEflcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp (0 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * 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.
+ */
+
+#include "config.h"
+#include "UserAgentEfl.h"
+
+#include "WebKitVersion.h"
+#include <wtf/NeverDestroyed.h>
+
+#if OS(UNIX)
+#include <sys/utsname.h>
+#endif
+
+namespace WebCore {
+
+static const char* platformForUAString()
+{
+#if PLATFORM(X11)
+ return "X11";
+#else
+ return "Unknown";
+#endif
+}
+
+static String platformVersionForUAString()
+{
+ String version;
+ struct utsname name;
+ if (uname(&name) != -1)
+ version = makeString(name.sysname, ' ', name.machine);
+ else
+ version = "Unknown";
+ return version;
+}
+
+static const String versionForUAString()
+{
+ static NeverDestroyed<String> version(String::format("%i.%i", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION));
+ return version;
+}
+
+String standardUserAgent(const String& applicationName, const String&)
+{
+ String version = versionForUAString();
+ static NeverDestroyed<String> standardUserAgentString = makeString("Mozilla/5.0 (", platformForUAString(), "; ", platformVersionForUAString(),
+ ") AppleWebKit/", version, " (KHTML, like Gecko) Version/8.0 Safari/601.2.7");
+
+ return applicationName.isEmpty() ? standardUserAgentString : standardUserAgentString + ' ' + applicationName;
+}
+
+} // namespace WebCore
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformeflUserAgentEflh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/efl/UserAgentEfl.h (0 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/UserAgentEfl.h (rev 0)
+++ trunk/Source/WebCore/platform/efl/UserAgentEfl.h 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * 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
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192147 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-09 01:34:09 UTC (rev 192147)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-08 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Add UserAgentEFl.cpp|h
+ https://bugs.webkit.org/show_bug.cgi?id=151007
+
+ Reviewed by Darin Adler.
+
+ As other ports EFL port starts to have UserAgentEfl class in order to support more detailed
+ UA.
+
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ (WebKit::WebPageProxy::standardUserAgent): Call WebCore::standardUserAgent().
+
</ins><span class="cx"> 2015-11-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ColorSpace argument to all the drawing calls
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebPageProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (192147 => 192148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2015-11-09 01:34:09 UTC (rev 192147)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2015-11-09 07:03:18 UTC (rev 192148)
</span><span class="lines">@@ -29,14 +29,12 @@
</span><span class="cx"> #include "EwkView.h"
</span><span class="cx"> #include "NativeWebKeyboardEvent.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><del>-#include "WebKitVersion.h"
</del><ins>+#include "UserAgentEfl.h"
</ins><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebView.h"
</span><span class="cx"> #include "WebsiteDataStore.h"
</span><span class="cx">
</span><del>-#include <sys/utsname.h>
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::platformInitialize()
</span><span class="lines">@@ -45,28 +43,7 @@
</span><span class="cx">
</span><span class="cx"> String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)
</span><span class="cx"> {
</span><del>- String platform;
- String version;
- String osVersion;
- String standardUserAgentString;
-
-#if PLATFORM(X11)
- platform = "X11";
-#else
- platform = "Unknown";
-#endif
-
- version = String::number(WEBKIT_MAJOR_VERSION) + '.' + String::number(WEBKIT_MINOR_VERSION) + '+';
- struct utsname name;
- if (uname(&name) != -1)
- osVersion = WTF::String(name.sysname) + " " + WTF::String(name.machine);
- else
- osVersion = "Unknown";
-
- standardUserAgentString = "Mozilla/5.0 (" + platform + "; " + osVersion + ") AppleWebKit/" + version
- + " (KHTML, like Gecko) Version/8.0 Safari/" + version;
-
- return applicationNameForUserAgent.isEmpty() ? standardUserAgentString : standardUserAgentString + ' ' + applicationNameForUserAgent;
</del><ins>+ return WebCore::standardUserAgent(applicationNameForUserAgent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getEditorCommandsForKeyEvent(Vector<WTF::String>& /*commandsList*/)
</span></span></pre>
</div>
</div>
</body>
</html>