- Revision
- 127419
- Author
- [email protected]
- Date
- 2012-09-03 07:01:17 -0700 (Mon, 03 Sep 2012)
Log Message
[EFL] Use WebKitVersion.h to get version information
https://bugs.webkit.org/show_bug.cgi?id=95669
Patch by Jinwoo Song <[email protected]> on 2012-09-03
Reviewed by Gyuyoung Kim.
.:
WEBKIT_USER_AGENT_MAJOR_VERSION and WEBKIT_USER_AGENT_MINOR_VERSION
are defined as constant in the OptionsEfl.cmake. But we do not need
to define these here but can use the defined constant in WebKitVersion.h.
WebKitVersion.h is already generated with the version information
from the Source/WebCore/Configurations/Version.xcconfig.
* Source/cmake/OptionsEfl.cmake: Do not set WEBKIT_USER_AGENT_* variables.
* Source/cmakeconfig.h.cmake: Remove WEBKIT_USER_AGENT_* definitions
as no more port uses.
Source/WebKit/efl:
Use WEBKIT_MAJOR_VERSION and WEBKIT_MINOR_VERSION
in the WebKitVersion.h
Relocate the StorageTracker.h to keep the sorted order.
* ewk/ewk_settings.cpp:
(ewk_settings_default_user_agent_get):
Source/WebKit2:
Use WEBKIT_MAJOR_VERSION and WEBKIT_MINOR_VERSION
in the WebKitVersion.h
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::standardUserAgent):
Modified Paths
Diff
Modified: trunk/ChangeLog (127418 => 127419)
--- trunk/ChangeLog 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/ChangeLog 2012-09-03 14:01:17 UTC (rev 127419)
@@ -1,3 +1,21 @@
+2012-09-03 Jinwoo Song <[email protected]>
+
+ [EFL] Use WebKitVersion.h to get version information
+ https://bugs.webkit.org/show_bug.cgi?id=95669
+
+ Reviewed by Gyuyoung Kim.
+
+ WEBKIT_USER_AGENT_MAJOR_VERSION and WEBKIT_USER_AGENT_MINOR_VERSION
+ are defined as constant in the OptionsEfl.cmake. But we do not need
+ to define these here but can use the defined constant in WebKitVersion.h.
+
+ WebKitVersion.h is already generated with the version information
+ from the Source/WebCore/Configurations/Version.xcconfig.
+
+ * Source/cmake/OptionsEfl.cmake: Do not set WEBKIT_USER_AGENT_* variables.
+ * Source/cmakeconfig.h.cmake: Remove WEBKIT_USER_AGENT_* definitions
+ as no more port uses.
+
2012-08-31 Tony Chang <[email protected]>
Remove ENABLE_CSS3_FLEXBOX compile time flag
Modified: trunk/Source/WebKit/efl/ChangeLog (127418 => 127419)
--- trunk/Source/WebKit/efl/ChangeLog 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-09-03 14:01:17 UTC (rev 127419)
@@ -1,3 +1,18 @@
+2012-09-03 Jinwoo Song <[email protected]>
+
+ [EFL] Use WebKitVersion.h to get version information
+ https://bugs.webkit.org/show_bug.cgi?id=95669
+
+ Reviewed by Gyuyoung Kim.
+
+ Use WEBKIT_MAJOR_VERSION and WEBKIT_MINOR_VERSION
+ in the WebKitVersion.h
+
+ Relocate the StorageTracker.h to keep the sorted order.
+
+ * ewk/ewk_settings.cpp:
+ (ewk_settings_default_user_agent_get):
+
2012-09-01 Jinwoo Song <[email protected]>
[EFL] Refactoring the DumpRenderTreeSupportEfl
Modified: trunk/Source/WebKit/efl/ewk/ewk_settings.cpp (127418 => 127419)
--- trunk/Source/WebKit/efl/ewk/ewk_settings.cpp 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/WebKit/efl/ewk/ewk_settings.cpp 2012-09-03 14:01:17 UTC (rev 127419)
@@ -25,7 +25,6 @@
#include "ApplicationCacheStorage.h"
#include "CrossOriginPreflightResultCache.h"
#include "DatabaseTracker.h"
-#include "StorageTracker.h"
#include "FontCache.h"
#include "FrameView.h"
#include "IconDatabase.h"
@@ -36,6 +35,8 @@
#include "PageCache.h"
#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
+#include "StorageTracker.h"
+#include "WebKitVersion.h"
#include "ewk_private.h"
#include "ewk_util_private.h"
#include <Eina.h>
@@ -316,8 +317,8 @@
*/
const char* ewk_settings_default_user_agent_get()
{
- WTF::String uaVersion = makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
- WTF::String staticUa = makeString("Mozilla/5.0 (", _ewk_settings_webkit_platform_get(), "; ", _ewk_settings_webkit_os_version_get(), ") AppleWebKit/", uaVersion) + makeString(" (KHTML, like Gecko) Version/5.0 Safari/", uaVersion);
+ WTF::String uaVersion = String::number(WEBKIT_MAJOR_VERSION) + '.' + String::number(WEBKIT_MINOR_VERSION) + '+';
+ WTF::String staticUa = "Mozilla/5.0 (" + _ewk_settings_webkit_platform_get() + "; " + _ewk_settings_webkit_os_version_get() + ") AppleWebKit/" + uaVersion + " (KHTML, like Gecko) Version/5.0 Safari/" + uaVersion;
return eina_stringshare_add(staticUa.utf8().data());
}
Modified: trunk/Source/WebKit2/ChangeLog (127418 => 127419)
--- trunk/Source/WebKit2/ChangeLog 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-03 14:01:17 UTC (rev 127419)
@@ -1,3 +1,16 @@
+2012-09-03 Jinwoo Song <[email protected]>
+
+ [EFL] Use WebKitVersion.h to get version information
+ https://bugs.webkit.org/show_bug.cgi?id=95669
+
+ Reviewed by Gyuyoung Kim.
+
+ Use WEBKIT_MAJOR_VERSION and WEBKIT_MINOR_VERSION
+ in the WebKitVersion.h
+
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ (WebKit::WebPageProxy::standardUserAgent):
+
2012-09-03 Christophe Dumez <[email protected]>
[EFL][WK2] Skip EWK2UnitTestBase.ewk_cookie_manager_permanent_storage API test
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (127418 => 127419)
--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2012-09-03 14:01:17 UTC (rev 127419)
@@ -28,6 +28,7 @@
#include "NotImplemented.h"
#include "PageClientImpl.h"
+#include "WebKitVersion.h"
#include "WebPageMessages.h"
#include "WebProcessProxy.h"
@@ -51,16 +52,15 @@
#else
platform = "Unknown";
#endif
- version = makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.',
- String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
+ 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";
- return makeString("Mozilla/5.0 (", platform, "; ", osVersion, ") AppleWebKit/", version)
- + makeString(" (KHTML, like Gecko) Version/5.0 Safari/", version);
+ return "Mozilla/5.0 (" + platform + "; " + osVersion + ") AppleWebKit/" + version
+ + " (KHTML, like Gecko) Version/5.0 Safari/" + version;
}
void WebPageProxy::getEditorCommandsForKeyEvent(Vector<WTF::String>& commandsList)
Modified: trunk/Source/cmake/OptionsEfl.cmake (127418 => 127419)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-09-03 14:01:17 UTC (rev 127419)
@@ -3,14 +3,6 @@
SET(PROJECT_VERSION_PATCH 0)
SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-# -----------------------------------------------------------------------------
-# We mention Safari version because many sites check for it.
-# Sync with Source/WebCore/Configurations/Version.xcconfig whenever Safari is
-# version up.
-# -----------------------------------------------------------------------------
-SET(WEBKIT_USER_AGENT_MAJOR_VERSION 534)
-SET(WEBKIT_USER_AGENT_MINOR_VERSION 16)
-
ADD_DEFINITIONS(-DBUILDING_EFL__=1)
ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
SET(WTF_PLATFORM_EFL 1)
Modified: trunk/Source/cmakeconfig.h.cmake (127418 => 127419)
--- trunk/Source/cmakeconfig.h.cmake 2012-09-03 13:22:42 UTC (rev 127418)
+++ trunk/Source/cmakeconfig.h.cmake 2012-09-03 14:01:17 UTC (rev 127419)
@@ -1,9 +1,6 @@
#ifndef CMAKECONFIG_H
#define CMAKECONFIG_H
-#cmakedefine WEBKIT_USER_AGENT_MAJOR_VERSION @WEBKIT_USER_AGENT_MAJOR_VERSION@
-#cmakedefine WEBKIT_USER_AGENT_MINOR_VERSION @WEBKIT_USER_AGENT_MINOR_VERSION@
-
#cmakedefine01 ENABLE_ANIMATION_API
#cmakedefine01 ENABLE_API_TESTS
#cmakedefine01 ENABLE_3D_RENDERING
