[BlackBerry] Enable Web Timing for performance profiling and improvement.

https://bugs.webkit.org/show_bug.cgi?id=81085

Reviewed by Rob Buis.

.:

* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmakeconfig.h.cmake:

Source/WebKit/blackberry:

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):

Tools:

* Scripts/build-webkit:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ff6e2ba0c162a247a1c96646c00e45a774d17e8a..7ed7d448418954f8ef67cc60976ae89832ca8e4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-17  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry] Enable Web Timing for performance profiling and improvement.
+        https://bugs.webkit.org/show_bug.cgi?id=81085
+
+        Reviewed by Rob Buis.
+
+        * Source/cmake/OptionsBlackBerry.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
 
         Support for Battery Status API.

diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp
index b5da38b8d1938c2dab3da8593fe9dced15511ec5..7e7fdb0b31fa3ad2b42d3552cf0f8f9d9f6935e2 100644 (file)
--- a/Source/WebKit/blackberry/Api/WebPage.cpp
+++ b/Source/WebKit/blackberry/Api/WebPage.cpp
@@ -491,6 +491,10 @@ void WebPagePrivate::init(const WebString& pageGroupName)
 #if ENABLE(REQUEST_ANIMATION_FRAME)
     m_page->windowScreenDidChange((PlatformDisplayID)0);
 #endif
+
+#if ENABLE(WEB_TIMING)
+    m_page->settings()->setMemoryInfoEnabled(true);
+#endif
 }
 
 void WebPagePrivate::load(const char* url, const char* networkToken, const char* method, Platform::NetworkRequest::CachePolicy cachePolicy, const char* data, size_t dataLength, const char* const* headers, size_t headersLength, bool isInitial, bool mustHandleInternally, bool forceDownload, const char* overrideContentType)

diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
index f8e8d4f843bab515cf9e7a422df1f6f099f06fea..c07a8f3d64e46eee74ee5991df38ffcefb66ac01 100644 (file)
--- a/Source/WebKit/blackberry/ChangeLog
+++ b/Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-17  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry] Enable Web Timing for performance profiling and improvement.
+        https://bugs.webkit.org/show_bug.cgi?id=81085
+
+        Reviewed by Rob Buis.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):
+
 2012-03-16  Arvid Nilsson  <anilsson@rim.com>
 
         [BlackBerry] Rename the existing WebPageCompositor class to WebPageCompositorPrivate

diff --git a/Source/cmake/OptionsBlackBerry.cmake b/Source/cmake/OptionsBlackBerry.cmake
index fe2524f675106b5cdbc2f3ff417347e5f25fa238..cd51c198ff6b5d6b19fe8b9c2bbc87137616e7ac 100644 (file)
--- a/Source/cmake/OptionsBlackBerry.cmake
+++ b/Source/cmake/OptionsBlackBerry.cmake
@@ -177,6 +177,7 @@ WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable touch events " DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_VIEWPORT_REFLOW "Enable viewport reflow" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_WEB_TIMING "Enable web timing" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WML "Enable WML" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)

diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
index 82caf6f55f3e09f6d925dac49a2860adbc13b2fa..213d6ec76fb0eb141ea2c1b1e0ea82a52d146d9c 100644 (file)
--- a/Source/cmakeconfig.h.cmake
+++ b/Source/cmakeconfig.h.cmake
@@ -46,6 +46,7 @@
 #cmakedefine01 ENABLE_VIDEO
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_WEB_SOCKETS
+#cmakedefine01 ENABLE_WEB_TIMING
 #cmakedefine01 ENABLE_WORKERS
 #cmakedefine01 ENABLE_XSLT
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 637e1b3ae0420f04b97dceac1929c1a5f18620ba..7e0f3558e3869e738639f5e76d3f6a5454686c7b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-17  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry] Enable Web Timing for performance profiling and improvement.
+        https://bugs.webkit.org/show_bug.cgi?id=81085
+
+        Reviewed by Rob Buis.
+
+        * Scripts/build-webkit:
+
 2012-03-17  Dominik Röttsches  <dominik.rottsches@linux.intel.com>
 
         Add a dependencies installation step for EFL to buildbot master.cfg

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 0bdf8766ba4983a12b1bb7487189a4f1a0444785..8a749ad4ba798409eccd6db5ae68e6fc114b7372 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -354,7 +354,7 @@ my @features = (
       define => "ENABLE_WEB_SOCKETS", default => 1, value=> \$webSocketsSupport },
 
     { option => "web-timing", desc => "Toggle Web Timing support",
-      define => "ENABLE_WEB_TIMING", default => 0, value=> \$webTimingSupport },
+      define => "ENABLE_WEB_TIMING", default => isBlackBerry(), value=> \$webTimingSupport },
 
     { option => "workers", desc => "Toggle Web Workers support",
       define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$workersSupport },