Merge "Add tracing to interesting/potentially costly functions" into jb-dev

3 files changed, 5 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index 283fa58..085a356 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -78,6 +78,7 @@ IFrameLayerAndroid* BaseLayerAndroid::updatePosition(SkRect viewport,
 
 void BaseLayerAndroid::updatePositionsRecursive(const SkRect& visibleContentRect)
 {
+    TRACE_METHOD();
     updateLayerPositions(visibleContentRect);
     TransformationMatrix ident;
     FloatRect clip(0, 0, getWidth(), getHeight());
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp b/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
index 8452503..316b7fd 100644
--- a/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/ImagesManager.cpp
@@ -52,6 +52,7 @@ ImageTexture* ImagesManager::setImage(SkBitmapRef* imgRef)
     if (!imgRef)
         return 0;
 
+    TRACE_METHOD();
     SkBitmap* bitmap = &imgRef->bitmap();
     ImageTexture* image = 0;
     SkBitmap* img = 0;
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp
index f577d46..83b81a1 100644
--- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp
@@ -84,6 +84,7 @@ SurfaceCollection::~SurfaceCollection()
 
 void SurfaceCollection::prepareGL(const SkRect& visibleContentRect, bool tryToFastBlit)
 {
+    TRACE_METHOD();
     updateLayerPositions(visibleContentRect);
     bool layerTilesDisabled = m_compositedRoot->state()->layersRenderingMode()
         > GLWebViewState::kClippedTextures;
@@ -106,6 +107,7 @@ static inline bool compareSurfaceZ(const Surface* a, const Surface* b)
 
 bool SurfaceCollection::drawGL(const SkRect& visibleContentRect)
 {
+    TRACE_METHOD();
 #ifdef DEBUG_COUNT
     ClassTracker::instance()->show();
 #endif
@@ -135,6 +137,7 @@ Color SurfaceCollection::getBackgroundColor()
 
 void SurfaceCollection::swapTiles()
 {
+    TRACE_METHOD();
     for (unsigned int i = 0; i < m_surfaces.size(); i++)
          m_surfaces[i]->swapTiles();
 }