From d71bb71a2be8c0f7eff98c981a5410aa49e04843 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Fri, 13 Apr 2012 15:31:06 -0700
Subject: add basic webview tracing

Change-Id: Id97ce1efab5918802cff5b90c0122b4cc2d7e73d
---
 .../WebCore/platform/graphics/android/rendering/PaintTileOperation.cpp | 2 ++
 Source/WebKit/android/AndroidLog.h                                     | 3 +++
 Source/WebKit/android/jni/WebViewCore.cpp                              | 2 ++
 Source/WebKit/android/nav/WebView.cpp                                  | 2 ++
 4 files changed, 9 insertions(+)

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;
-- 
cgit v1.1