<!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>[159768] trunk/Source/WebKit</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/159768">159768</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 15:08:46 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] WebKit version in user agent string is incorrect.
https://bugs.webkit.org/show_bug.cgi?id=124454
Patch by peavo@outlook.com <peavo@outlook.com> on 2013-11-25
Reviewed by Brent Fulgham.
Source/WebKit:
Generate WebKitVersion.h file from mac's Version.xcconfig file.
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
* WebKit.vcxproj/WebKit/WebKitVersion.cmd: Added.
Source/WebKit/win:
* WebView.cpp: Use WebKit version from WebKitVersion.h in user agent.
(webKitVersionString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitVersioncmd">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (159767 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2013-11-25 22:55:39 UTC (rev 159767)
+++ trunk/Source/WebKit/ChangeLog 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-11-25 peavo@outlook.com <peavo@outlook.com>
+
+ [Win] WebKit version in user agent string is incorrect.
+ https://bugs.webkit.org/show_bug.cgi?id=124454
+
+ Reviewed by Brent Fulgham.
+
+ Generate WebKitVersion.h file from mac's Version.xcconfig file.
+
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
+ * WebKit.vcxproj/WebKit/WebKitVersion.cmd: Added.
+
</ins><span class="cx"> 2013-11-23 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Remove 0.10 codepath
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (159767 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-11-25 22:55:39 UTC (rev 159767)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -505,6 +505,33 @@
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKitExportGenerator\WebKitExports.def" />
</span><ins>+ <CustomBuild Include="..\..\mac\Configurations\Version.xcconfig">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">WebKitVersion.cmd</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">WebKitVersion.h</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WebKitVersion.cmd</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WebKitVersion.h</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WebKitVersion.cmd</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">WebKitVersion.h</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Production|x64'">WebKitVersion.h</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">WebKitVersion.cmd</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Production|x64'">WebKitVersion.cmd</Command>
+ </CustomBuild>
</ins><span class="cx"> <None Include="..\..\win\WebKit.resources\deleteButton.png" />
</span><span class="cx"> <None Include="..\..\win\WebKit.resources\deleteButtonPressed.png" />
</span><span class="cx"> <None Include="..\..\win\WebKit.resources\fsVideoAudioVolumeHigh.png" />
</span><span class="lines">@@ -534,6 +561,7 @@
</span><span class="cx"> <None Include="WebKitPostBuild.cmd" />
</span><span class="cx"> <None Include="WebKitPreBuild.cmd" />
</span><span class="cx"> <None Include="WebKitPreLink.cmd" />
</span><ins>+ <None Include="WebKitVersion.cmd" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ResourceCompile Include="..\..\win\WebKit.resources\WebKit.rc" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (159767 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2013-11-25 22:55:39 UTC (rev 159767)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -622,10 +622,14 @@
</span><span class="cx"> <None Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKitExportGenerator\WebKitExports.def">
</span><span class="cx"> <Filter>Generated</Filter>
</span><span class="cx"> </None>
</span><ins>+ <None Include="WebKitVersion.cmd" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ResourceCompile Include="..\..\win\WebKit.resources\WebKit.rc">
</span><span class="cx"> <Filter>Resources</Filter>
</span><span class="cx"> </ResourceCompile>
</span><span class="cx"> </ItemGroup>
</span><ins>+ <ItemGroup>
+ <CustomBuild Include="..\..\mac\Configurations\Version.xcconfig" />
+ </ItemGroup>
</ins><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitVersioncmd"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd (0 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd (rev 0)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitVersion.cmd 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+set WEBKITVERSIONSCRIPT=%PROJECTDIR%..\..\scripts\generate-webkitversion.pl
+set WEBKITVERSIONCONFIG=%PROJECTDIR%..\..\mac\Configurations\Version.xcconfig
+set WEBKITVERSIONDIR=%CONFIGURATIONBUILDDIR%\include\WebKit
+set WEBKITVERSIONFILE=%WEBKITVERSIONDIR%\WebKitVersion.h
+
+bash -c 'perl "%WEBKITVERSIONSCRIPT%" --config "%WEBKITVERSIONCONFIG%" --outputDir "%WEBKITVERSIONDIR%"'
</ins></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (159767 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2013-11-25 22:55:39 UTC (rev 159767)
+++ trunk/Source/WebKit/win/ChangeLog 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-25 peavo@outlook.com <peavo@outlook.com>
+
+ [Win] WebKit version in user agent string is incorrect.
+ https://bugs.webkit.org/show_bug.cgi?id=124454
+
+ Reviewed by Brent Fulgham.
+
+ * WebView.cpp: Use WebKit version from WebKitVersion.h in user agent.
+ (webKitVersionString):
+
</ins><span class="cx"> 2013-11-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_WORKERS
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (159767 => 159768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2013-11-25 22:55:39 UTC (rev 159767)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-11-25 23:08:46 UTC (rev 159768)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include "WebKitLogging.h"
</span><span class="cx"> #include "WebKitStatisticsPrivate.h"
</span><span class="cx"> #include "WebKitSystemBits.h"
</span><ins>+#include "WebKitVersion.h"
</ins><span class="cx"> #include "WebMutableURLRequest.h"
</span><span class="cx"> #include "WebNotificationCenter.h"
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><span class="lines">@@ -2488,11 +2489,12 @@
</span><span class="cx">
</span><span class="cx"> static String webKitVersionString()
</span><span class="cx"> {
</span><ins>+#if !USE(CAIRO)
</ins><span class="cx"> LPWSTR buildNumberStringPtr;
</span><del>- if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr)
- return "534+";
-
- return buildNumberStringPtr;
</del><ins>+ if (::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) && buildNumberStringPtr)
+ return buildNumberStringPtr;
+#endif
+ return String::format("%d.%d", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& WebView::userAgentForKURL(const URL&)
</span></span></pre>
</div>
</div>
</body>
</html>