summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-04-13 15:31:06 -0700
committerChris Craik <ccraik@google.com>2012-04-16 16:13:00 -0700
commitd71bb71a2be8c0f7eff98c981a5410aa49e04843 (patch)
tree5017a078fec981f5b6f8f2dc30175991e77a41af
parent2662ec568b9fe4333e7ad443b588aa0dfae579a8 (diff)
downloadexternal_webkit-d71bb71a2be8c0f7eff98c981a5410aa49e04843.zip
external_webkit-d71bb71a2be8c0f7eff98c981a5410aa49e04843.tar.gz
external_webkit-d71bb71a2be8c0f7eff98c981a5410aa49e04843.tar.bz2
add basic webview tracing
Change-Id: Id97ce1efab5918802cff5b90c0122b4cc2d7e73d
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp2
-rw-r--r--Source/WebKit/android/AndroidLog.h3
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp2
-rw-r--r--Source/WebKit/android/nav/WebView.cpp2
4 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp b/Source/WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp
index b5e435b..fcd9d3b 100644
--- a/Source/WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp
@@ -73,6 +73,8 @@ bool PaintTileOperation::operator==(const QueuedOperation* operation)
void PaintTileOperation::run()
{
+ TRACE_METHOD();
+
if (m_tile) {
m_tile->paintBitmap(m_painter);
m_tile->setRepaintPending(false);
diff --git a/Source/WebKit/android/AndroidLog.h b/Source/WebKit/android/AndroidLog.h
index 3ac210f..e483169 100644
--- a/Source/WebKit/android/AndroidLog.h
+++ b/Source/WebKit/android/AndroidLog.h
@@ -31,6 +31,7 @@
#endif
#include <cutils/log.h>
+#include <utils/Trace.h>
#include <wtf/CurrentTime.h>
#ifdef ANDROID_DOM_LOGGING
@@ -52,6 +53,8 @@ extern FILE* gRenderTreeFile;
#define DISPLAY_TREE_LOG_FILE "/sdcard/displayTree.txt"
#define LAYERS_TREE_LOG_FILE "/sdcard/layersTree.plist"
+#define TRACE_METHOD() ScopedTrace __st(ATRACE_TAG_WEBVIEW, __func__);
+
#define TIME_METHOD() MethodTimer __method_timer(__func__)
class MethodTimer {
public:
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 9f66d7e..497f5fd 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -630,6 +630,8 @@ WebCore::Node* WebViewCore::currentFocus()
void WebViewCore::recordPictureSet(PictureSet* content)
{
+ TRACE_METHOD();
+
// if there is no document yet, just return
if (!m_mainFrame->document()) {
DBG_SET_LOG("!m_mainFrame->document()");
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 215bf43..f444282 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -702,6 +702,8 @@ class GLDrawFunctor : Functor {
extras = _extras;
};
status_t operator()(int messageId, void* data) {
+ TRACE_METHOD();
+
if (viewRect.isEmpty()) {
// NOOP operation if viewport is empty
return 0;