Title: [159473] trunk/Source
- Revision
- 159473
- Author
- [email protected]
- Date
- 2013-11-18 16:56:12 -0800 (Mon, 18 Nov 2013)
Log Message
Unreviewed, rolling out r159430.
http://trac.webkit.org/changeset/159430
https://bugs.webkit.org/show_bug.cgi?id=124548
WebCore can know nothing about nor use files from WebKit/
(Requested by thorton on #webkit).
Source/WebCore:
* DerivedSources.make:
Source/WebKit/win:
* WebView.cpp:
(webKitVersionString):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159472 => 159473)
--- trunk/Source/WebCore/ChangeLog 2013-11-19 00:50:21 UTC (rev 159472)
+++ trunk/Source/WebCore/ChangeLog 2013-11-19 00:56:12 UTC (rev 159473)
@@ -1,3 +1,14 @@
+2013-11-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r159430.
+ http://trac.webkit.org/changeset/159430
+ https://bugs.webkit.org/show_bug.cgi?id=124548
+
+ WebCore can know nothing about nor use files from WebKit/
+ (Requested by thorton on #webkit).
+
+ * DerivedSources.make:
+
2013-11-18 Brady Eidson <[email protected]>
Remove IDBServerConnection's deprecatedBackingStore()
Modified: trunk/Source/WebCore/DerivedSources.make (159472 => 159473)
--- trunk/Source/WebCore/DerivedSources.make 2013-11-19 00:50:21 UTC (rev 159472)
+++ trunk/Source/WebCore/DerivedSources.make 2013-11-19 00:56:12 UTC (rev 159473)
@@ -723,7 +723,6 @@
MathMLElementFactory.cpp \
MathMLNames.cpp \
XPathGrammar.cpp \
- WebKitVersion.h \
#
# --------
@@ -846,12 +845,6 @@
# --------
-# 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 (159472 => 159473)
--- trunk/Source/WebKit/win/ChangeLog 2013-11-19 00:50:21 UTC (rev 159472)
+++ trunk/Source/WebKit/win/ChangeLog 2013-11-19 00:56:12 UTC (rev 159473)
@@ -1,3 +1,15 @@
+2013-11-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r159430.
+ http://trac.webkit.org/changeset/159430
+ https://bugs.webkit.org/show_bug.cgi?id=124548
+
+ WebCore can know nothing about nor use files from WebKit/
+ (Requested by thorton on #webkit).
+
+ * WebView.cpp:
+ (webKitVersionString):
+
2013-11-18 Brian J. Burg <[email protected]>
Consolidate various frame snapshot capabilities.
Modified: trunk/Source/WebKit/win/WebView.cpp (159472 => 159473)
--- trunk/Source/WebKit/win/WebView.cpp 2013-11-19 00:50:21 UTC (rev 159472)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-11-19 00:56:12 UTC (rev 159473)
@@ -144,7 +144,6 @@
#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>
@@ -2490,10 +2489,8 @@
static String webKitVersionString()
{
LPWSTR buildNumberStringPtr;
- 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;
- }
+ if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr)
+ return "534+";
return buildNumberStringPtr;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
