summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-03-01 17:32:35 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2012-03-05 10:10:32 -0800
commit3e2930d97c8473fa6152c97822241c223536b336 (patch)
treeb95b741c097ecafdef2c378a47369c045e6e695a /Source/WebCore/platform/graphics/android/GLWebViewState.cpp
parent00e488ce021bfdc927c43c9e88d971eef60c10c3 (diff)
downloadexternal_webkit-3e2930d97c8473fa6152c97822241c223536b336.zip
external_webkit-3e2930d97c8473fa6152c97822241c223536b336.tar.gz
external_webkit-3e2930d97c8473fa6152c97822241c223536b336.tar.bz2
add more logs and format correction
Change-Id: I63bda1a03b3e634b8ee92a0379ab46af8a7af6b5
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 1b554c7..cfd8937 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -39,11 +39,9 @@
#include "TilesTracker.h"
#include "SurfaceCollection.h"
#include "SurfaceCollectionManager.h"
-#include <wtf/CurrentTime.h>
-
-#include <pthread.h>
-
#include <cutils/log.h>
+#include <pthread.h>
+#include <wtf/CurrentTime.h>
#include <wtf/text/CString.h>
#undef XLOGC
@@ -173,7 +171,7 @@ void GLWebViewState::invalRegion(const SkRegion& region)
{
if (m_layersRenderingMode == kSingleSurfaceRendering) {
// TODO: do the union of both layer trees to compute
- //the minimum inval instead of doing a fullInval()
+ // the minimum inval instead of doing a fullInval()
fullInval();
return;
}
@@ -262,8 +260,8 @@ void GLWebViewState::setViewport(const SkRect& viewport, float scale)
m_tiledPageA->updateBaseTileSize();
m_tiledPageB->updateBaseTileSize();
- if ((m_viewport == viewport) &&
- (zoomManager()->futureScale() == scale)) {
+ if ((m_viewport == viewport)
+ && (zoomManager()->futureScale() == scale)) {
// everything below will stay the same, early return.
m_isViewportScrolling = false;
return;
@@ -472,11 +470,9 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect,
{
TilesManager* tilesManager = TilesManager::instance();
m_scale = scale;
- tilesManager->getProfiler()->nextFrame(viewport.fLeft,
- viewport.fTop,
- viewport.fRight,
- viewport.fBottom,
- scale);
+ tilesManager->getProfiler()->nextFrame(viewport.fLeft, viewport.fTop,
+ viewport.fRight, viewport.fBottom,
+ scale);
tilesManager->incDrawGLCount();
#ifdef DEBUG
@@ -495,6 +491,12 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect,
rect.x(), rect.y(), rect.width(), rect.height(),
viewport.fLeft, viewport.fTop, viewport.fRight, viewport.fBottom);
+ XLOG("drawGL, invalRect(%d, %d, %d, %d), webViewRect(%d, %d, %d, %d)"
+ "clip (%d, %d, %d, %d), scale %f",
+ invalRect->x(), invalRect->y(), invalRect->width(), invalRect->height(),
+ webViewRect.x(), webViewRect.y(), webViewRect.width(), webViewRect.height(),
+ clip.x(), clip.y(), clip.width(), clip.height(), scale);
+
resetLayersDirtyArea();
if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING)