Title: [159430] trunk/Source
- Revision
- 159430
- Author
- [email protected]
- Date
- 2013-11-18 10:25:31 -0800 (Mon, 18 Nov 2013)
Log Message
[Win] WebKit version in user agent string is incorrect.
https://bugs.webkit.org/show_bug.cgi?id=124454
Patch by [email protected] <[email protected]> on 2013-11-18
Reviewed by Brent Fulgham.
Source/WebCore:
* DerivedSources.make: Generate WebKitVersion.h
Source/WebKit/win:
* WebView.cpp:
(webKitVersionString): Create WebKit version string from WebKitVersion.h.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159429 => 159430)
--- trunk/Source/WebCore/ChangeLog 2013-11-18 18:22:39 UTC (rev 159429)
+++ trunk/Source/WebCore/ChangeLog 2013-11-18 18:25:31 UTC (rev 159430)
@@ -1,3 +1,12 @@
+2013-11-18 [email protected] <[email protected]>
+
+ [Win] WebKit version in user agent string is incorrect.
+ https://bugs.webkit.org/show_bug.cgi?id=124454
+
+ Reviewed by Brent Fulgham.
+
+ * DerivedSources.make: Generate WebKitVersion.h
+
2013-11-18 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: trunk/Source/WebCore/DerivedSources.make (159429 => 159430)
--- trunk/Source/WebCore/DerivedSources.make 2013-11-18 18:22:39 UTC (rev 159429)
+++ trunk/Source/WebCore/DerivedSources.make 2013-11-18 18:25:31 UTC (rev 159430)
@@ -723,6 +723,7 @@
MathMLElementFactory.cpp \
MathMLNames.cpp \
XPathGrammar.cpp \
+ WebKitVersion.h \
#
# --------
@@ -845,6 +846,12 @@
# --------
+# WebKitVersion
+WebKitVersion.h : $(WebCore)/../WebKit/mac/Configurations/Version.xcconfig
+ perl $(WebCore)/../WebKit/scripts/generate-webkitversion.pl --config $(WebCore)/../WebKit/mac/Configurations/Version.xcconfig --outputDir .
+
+# --------
+
# user agent style sheets
USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css $(WebCore)/css/plugIns.css
Modified: trunk/Source/WebKit/win/ChangeLog (159429 => 159430)
--- trunk/Source/WebKit/win/ChangeLog 2013-11-18 18:22:39 UTC (rev 159429)
+++ trunk/Source/WebKit/win/ChangeLog 2013-11-18 18:25:31 UTC (rev 159430)
@@ -1,3 +1,13 @@
+2013-11-18 [email protected] <[email protected]>
+
+ [Win] WebKit version in user agent string is incorrect.
+ https://bugs.webkit.org/show_bug.cgi?id=124454
+
+ Reviewed by Brent Fulgham.
+
+ * WebView.cpp:
+ (webKitVersionString): Create WebKit version string from WebKitVersion.h.
+
2013-11-15 Jer Noble <[email protected]>
Unreviewed Win build fix; setCurrentTime() no longer takes an exception parameter.
Modified: trunk/Source/WebKit/win/WebView.cpp (159429 => 159430)
--- trunk/Source/WebKit/win/WebView.cpp 2013-11-18 18:22:39 UTC (rev 159429)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-11-18 18:25:31 UTC (rev 159430)
@@ -144,6 +144,7 @@
#include <WebCore/Settings.h>
#include <WebCore/SimpleFontData.h>
#include <WebCore/SystemInfo.h>
+#include <WebCore/WebKitVersion.h>
#include <WebCore/WindowMessageBroadcaster.h>
#include <WebCore/WindowsTouch.h>
#include <wtf/MainThread.h>
@@ -2491,8 +2492,10 @@
static String webKitVersionString()
{
LPWSTR buildNumberStringPtr;
- if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr)
- return "534+";
+ if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr) {
+ String webKitVersion = String::format("%d.%d", WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION);
+ return webKitVersion;
+ }
return buildNumberStringPtr;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
